From 7beac8cedbc0a871dd8745771d15349d0b39d373 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 30 Jul 2020 20:20:21 +0300 Subject: [PATCH 1/7] Parallel support for HDF5 please test Resolves: https://github.com/cms-sw/cmsdist/issues/6123 --- hdf5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5.spec b/hdf5.spec index 30303833bff..ed7cb4c06fd 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -10,7 +10,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-cxx --enable-parallel --with-zlib=${ZLIB_ROOT} --prefix %{i} make %{makeprocesses} VERBOSE=1 %install From 11c9752e48b2f848d22ef20ed721c4ba793bafc0 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 30 Jul 2020 23:36:04 +0200 Subject: [PATCH 2/7] Update hdf5.spec --- hdf5.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hdf5.spec b/hdf5.spec index ed7cb4c06fd..79190da7364 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -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} From 7f1ab873634956ff95150f7c27e2a068ab0454e7 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 31 Jul 2020 00:58:52 +0300 Subject: [PATCH 3/7] remove incompatible option --enable-parallel and --enable-cxx are incompatible , keep --enable-parallel --- hdf5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5.spec b/hdf5.spec index 79190da7364..73b7cc1b682 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -11,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 --enable-parallel --with-zlib=${ZLIB_ROOT} --prefix %{i} +./configure --enable-shared --enable-parallel --with-zlib=${ZLIB_ROOT} --prefix %{i} make %{makeprocesses} VERBOSE=1 %install From 368480f6bfea005327890fcbb5656de0c1f2f320 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Mon, 3 Aug 2020 16:54:04 +0300 Subject: [PATCH 4/7] add mpicc to build py2-h5py see https://stackoverflow.com/questions/26920083/fatal-error-mpi-h-no-such-file-or-directory-include-mpi-h/38421694 h5py is building (at least this one is) --- pip/h5py.file | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pip/h5py.file b/pip/h5py.file index 33d5e8e262d..3e1c39e10de 100644 --- a/pip/h5py.file +++ b/pip/h5py.file @@ -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" From 4dc8f0c1ae0ccbe56024d3e5acbe1f7de59fe2a1 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Mon, 3 Aug 2020 23:12:32 +0200 Subject: [PATCH 5/7] add py3-tables options same as for h5py --- pip/py3-tables.file | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pip/py3-tables.file b/pip/py3-tables.file index ad14a895f3c..cf33ad5ea74 100644 --- a/pip/py3-tables.file +++ b/pip/py3-tables.file @@ -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" %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done From 2d12bb144355915436296d95bf21f335c482f679 Mon Sep 17 00:00:00 2001 From: Mircho Nikolaev Rodozov Date: Tue, 4 Aug 2020 08:44:09 +0200 Subject: [PATCH 6/7] add also py2-tables fix --- pip/tables.file | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pip/tables.file b/pip/tables.file index 507e6d9bc69..f1cc873f888 100644 --- a/pip/tables.file +++ b/pip/tables.file @@ -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}" From 252b71e837ab4f5e5570af229e0c51a7c0453a21 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Tue, 4 Aug 2020 09:59:01 +0300 Subject: [PATCH 7/7] Update py3-tables.file --- pip/py3-tables.file | 2 -- 1 file changed, 2 deletions(-) diff --git a/pip/py3-tables.file b/pip/py3-tables.file index cf33ad5ea74..ad14a895f3c 100644 --- a/pip/py3-tables.file +++ b/pip/py3-tables.file @@ -1,4 +1,2 @@ Requires: py2-numexpr py2-six hdf5 bz2lib py2-mock py3-numpy -BuildRequires: openmpi -%define PipPreBuild export HDF5_DIR=${HDF5_ROOT} CC="mpicc" %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done