Skip to content

Commit

Permalink
Merge pull request #6128 from cms-sw/enable-parralel-hdf5
Browse files Browse the repository at this point in the history
Parallel support for HDF5
  • Loading branch information
smuzaffar committed Aug 4, 2020
2 parents c371bb7 + 252b71e commit 09940e1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions hdf5.spec
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
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"
4 changes: 2 additions & 2 deletions pip/tables.file
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}"

0 comments on commit 09940e1

Please sign in to comment.