From e26c71b8b1c761aab5cb54afe502724bb6633876 Mon Sep 17 00:00:00 2001 From: caubet_m Date: Thu, 5 May 2022 17:05:13 +0200 Subject: [PATCH 1/2] HDF5+NetCDF with openmpi 4.1.3 --- HDF5/netcdf/build | 3 ++- HDF5/netcdf/files/variants.merlin6 | 2 ++ HDF5/parallel-netcdf/build | 7 ++++++- HDF5/parallel-netcdf/files/variants.merlin6 | 2 ++ MPI/hdf5/build | 4 ++-- MPI/hdf5/files/variants.merlin6 | 6 +++--- 6 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 HDF5/netcdf/files/variants.merlin6 create mode 100644 HDF5/parallel-netcdf/files/variants.merlin6 diff --git a/HDF5/netcdf/build b/HDF5/netcdf/build index ecd1c15..71ac3ec 100755 --- a/HDF5/netcdf/build +++ b/HDF5/netcdf/build @@ -1,6 +1,7 @@ #!/usr/bin/env modbuild -pbuild::set_download_url "https://www.unidata.ucar.edu/downloads/$P/ftp/$P-$V.tar.gz" +# pbuild::set_download_url "https://www.unidata.ucar.edu/downloads/$P/ftp/$P-$V.tar.gz" +pbuild::set_download_url "https://github.com/Unidata/netcdf-c/archive/refs/tags/v${V_PKG}.tar.gz" "netcdf-${V_PKG}.tar.gz" pbuild::pre_configure() { pbuild::add_configure_args "CXX=${MPICXX}" diff --git a/HDF5/netcdf/files/variants.merlin6 b/HDF5/netcdf/files/variants.merlin6 new file mode 100644 index 0000000..fac785d --- /dev/null +++ b/HDF5/netcdf/files/variants.merlin6 @@ -0,0 +1,2 @@ +netcdf/4.8.1 unstable gcc/11.2.0 openmpi/4.1.3_slurm hdf5/1.13.1_slurm parallel-netcdf/1.12.3 + diff --git a/HDF5/parallel-netcdf/build b/HDF5/parallel-netcdf/build index f56e687..a7363fa 100755 --- a/HDF5/parallel-netcdf/build +++ b/HDF5/parallel-netcdf/build @@ -1,6 +1,11 @@ #!/usr/bin/env modbuild -pbuild::set_download_url "http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/$P-$V.tar.gz" +# pbuild::set_download_url "http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/$P-$V.tar.gz" +if (( V_MAJOR >= 1 && V_MINOR >= 11 )); then + pbuild::set_download_url "https://parallel-netcdf.github.io/Release/pnetcdf-${V_PKG}.tar.gz" +else + pbuild::set_download_url "https://parallel-netcdf.github.io/Release/parallel-netcdf-${V_PKG}.tar.gz" +fi pbuild::add_to_group 'HDF5' diff --git a/HDF5/parallel-netcdf/files/variants.merlin6 b/HDF5/parallel-netcdf/files/variants.merlin6 new file mode 100644 index 0000000..11367ae --- /dev/null +++ b/HDF5/parallel-netcdf/files/variants.merlin6 @@ -0,0 +1,2 @@ +parallel-netcdf/1.12.3 unstable gcc/11.2.0 openmpi/4.1.3_slurm hdf5/1.13.1_slurm +parallel-netcdf/1.10.0 unstable gcc/11.2.0 openmpi/4.1.3_slurm hdf5/1.13.1_slurm diff --git a/MPI/hdf5/build b/MPI/hdf5/build index b82cc29..aa2a33e 100755 --- a/MPI/hdf5/build +++ b/MPI/hdf5/build @@ -1,12 +1,12 @@ #!/usr/bin/env modbuild -pbuild::set_download_url "https://support.hdfgroup.org/ftp/HDF5/releases/$P-${V_MAJOR}.${V_MINOR}/$P-$V/src/hdf5-${V_PKG}.tar.bz2" +pbuild::set_download_url "https://support.hdfgroup.org/ftp/HDF5/releases/$P-${V_MAJOR}.${V_MINOR}/$P-${V_PKG}/src/hdf5-${V_PKG}.tar.bz2" pbuild::add_to_group 'MPI' pbuild::install_docfiles ACKNOWLEDGMENTS pbuild::install_docfiles COPYING pbuild::install_docfiles MANIFEST -pbuild::install_docfiles README.txt +pbuild::install_docfiles README.md pbuild::pre_configure() { pbuild::add_configure_args "CC=${MPICC}" diff --git a/MPI/hdf5/files/variants.merlin6 b/MPI/hdf5/files/variants.merlin6 index 5ac046f..87c0ffa 100644 --- a/MPI/hdf5/files/variants.merlin6 +++ b/MPI/hdf5/files/variants.merlin6 @@ -1,3 +1,3 @@ -hdf5/1.10.6_slurm stable gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm -hdf5/1.10.7_slurm stable gcc/10.3.0 openmpi/4.0.5-1_slurm - +hdf5/1.10.6_slurm stable gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm +hdf5/1.10.7_slurm stable gcc/10.3.0 openmpi/4.0.5-1_slurm +hdf5/1.13.1_slurm unstable gcc/11.2.0 openmpi/4.1.3_slurm From a7bc0c8599bc2de15934447419e8591b0af9325d Mon Sep 17 00:00:00 2001 From: caubet_m Date: Thu, 5 May 2022 17:07:30 +0200 Subject: [PATCH 2/2] remove pnetcdf 1.10.0 --- HDF5/parallel-netcdf/files/variants.merlin6 | 1 - 1 file changed, 1 deletion(-) diff --git a/HDF5/parallel-netcdf/files/variants.merlin6 b/HDF5/parallel-netcdf/files/variants.merlin6 index 11367ae..c9d4655 100644 --- a/HDF5/parallel-netcdf/files/variants.merlin6 +++ b/HDF5/parallel-netcdf/files/variants.merlin6 @@ -1,2 +1 @@ parallel-netcdf/1.12.3 unstable gcc/11.2.0 openmpi/4.1.3_slurm hdf5/1.13.1_slurm -parallel-netcdf/1.10.0 unstable gcc/11.2.0 openmpi/4.1.3_slurm hdf5/1.13.1_slurm