Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parallel support for HDF5 #6128

Merged
merged 7 commits into from
Aug 4, 2020
Merged

Parallel support for HDF5 #6128

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7beac8c
Parallel support for HDF5
mrodozov Jul 30, 2020
11c9752
Update hdf5.spec
smuzaffar Jul 30, 2020
7f1ab87
remove incompatible option
mrodozov Jul 30, 2020
368480f
add mpicc to build py2-h5py
mrodozov Aug 3, 2020
4dc8f0c
add py3-tables options
mrodozov Aug 3, 2020
2d12bb1
add also py2-tables fix
Aug 4, 2020
252b71e
Update py3-tables.file
mrodozov Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions hdf5.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### RPM external hdf5 1.10.6
Source: git+https://github.com/HDFGroup/%{n}.git?obj=master/5b9cf732caab9daa6ed1e00f2df4f5a792340196&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: zlib
BuildRequires: openmpi
Requires: zlib

%prep
%setup -n %{n}-%{realversion}
Expand All @@ -10,7 +11,7 @@ rm -f ./bin/config.{sub,guess}
%get_config_sub ./bin/config.sub
%get_config_guess ./bin/config.guess
chmod +x ./bin/config.{sub,guess}
./configure --enable-shared --enable-cxx --with-zlib=${ZLIB_ROOT} --prefix %{i}
./configure --enable-shared --enable-parallel --with-zlib=${ZLIB_ROOT} --prefix %{i}
make %{makeprocesses} VERBOSE=1

%install
Expand Down
4 changes: 2 additions & 2 deletions pip/h5py.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Requires: py2-numpy py3-numpy hdf5 py2-six
BuildRequires: py2-cython py2-pkgconfig
%define PipPreBuild export HDF5_DIR=${HDF5_ROOT}
BuildRequires: py2-cython py2-pkgconfig openmpi
%define PipPreBuild export HDF5_DIR=${HDF5_ROOT} CC="mpicc"
2 changes: 2 additions & 0 deletions pip/py3-tables.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
Requires: py2-numexpr py2-six hdf5 bz2lib py2-mock py3-numpy
BuildRequires: openmpi
%define PipPreBuild export HDF5_DIR=${HDF5_ROOT} CC="mpicc"
mrodozov marked this conversation as resolved.
Show resolved Hide resolved
%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
4 changes: 2 additions & 2 deletions pip/tables.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Requires: py2-numexpr py2-six py2-numpy hdf5 bz2lib py2-mock

%define PipPreBuild export HDF5_DIR=${HDF5_ROOT}; export DISABLE_AVX2=true
BuildRequires: openmpi
%define PipPreBuild export HDF5_DIR=${HDF5_ROOT} CC="mpicc"; export DISABLE_AVX2=true
%define PipBuildOptions --global-option="--hdf5=${HDF5_ROOT}" --global-option="--bzip2=${BZ2LIB_ROOT}"