From 059f1f611ef3d34da18cbd9fa57d8128764bf6ea Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 11:31:03 +0000 Subject: [PATCH 1/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- netcdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netcdf.spec b/netcdf.spec index 7d74a41..2ae0340 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,6 @@ Name: netcdf Version: 4.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering @@ -334,6 +334,9 @@ done %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 4.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 24 2014 Jakub Čajka - 4.3.2-4 - Enabled tests on s390 - Disabled parallel tests on s390(x) as they hang From fdd985ad2201623ad27b5accda15f6237e65c950 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 7 Jan 2015 11:42:18 -0700 Subject: [PATCH 2/8] Rebuild for hdf5 1.8.14 --- netcdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netcdf.spec b/netcdf.spec index 2ae0340..9b18276 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,6 @@ Name: netcdf Version: 4.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering @@ -334,6 +334,9 @@ done %changelog +* Wed Jan 07 2015 Orion Poplawski - 4.3.2-6 +- Rebuild for hdf5 1.8.14 + * Sun Aug 17 2014 Fedora Release Engineering - 4.3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 4a6e46edce82ef758a40ee1bde7eb56b8e3d5a88 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 27 Jan 2015 16:33:09 -0700 Subject: [PATCH 3/8] Fix up provides/requires for mpi packages, use %{?_isa}. --- netcdf.spec | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/netcdf.spec b/netcdf.spec index 9b18276..e61ceb2 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,6 @@ Name: netcdf Version: 4.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering @@ -28,7 +28,12 @@ BuildRequires: valgrind #mpiexec segfaults if ssh is not present #https://trac.mcs.anl.gov/projects/mpich2/ticket/1576 BuildRequires: openssh-clients -Requires: hdf5 = %{_hdf5_version} +Requires: hdf5%{?_isa} = %{_hdf5_version} + +# Don't let mpi versions provide libraries +%global __provides_exclude_from ^%{_libdir}/(mpich|openmpi) +# Don't require hdf5 library, might be mpi, use explicit requires +%global __requires_exclude ^libhdf5 %global with_mpich 1 %global with_openmpi 1 @@ -85,10 +90,10 @@ NetCDF data is: %package devel Summary: Development files for netcdf Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: hdf5-devel -Requires: libcurl-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig%{?_isa} +Requires: hdf5-devel%{?_isa} +Requires: libcurl-devel%{?_isa} %description devel This package contains the netCDF C header files, shared devel libs, and @@ -98,7 +103,7 @@ man pages. %package static Summary: Static libs for netcdf Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description static This package contains the netCDF C static libs. @@ -108,7 +113,8 @@ This package contains the netCDF C static libs. %package mpich Summary: NetCDF mpich libraries Group: Development/Libraries -Requires: mpich +Requires: mpich%{?_isa} +Requires: hdf5-mpich%{?_isa} = %{_hdf5_version} BuildRequires: mpich-devel BuildRequires: hdf5-mpich-devel >= 1.8.4 Provides: %{name}-mpich2 = %{version}-%{release} @@ -122,10 +128,10 @@ NetCDF parallel mpich libraries Summary: NetCDF mpich development files Group: Development/Libraries Requires: %{name}-mpich%{?_isa} = %{version}-%{release} -Requires: mpich -Requires: pkgconfig -Requires: hdf5-mpich-devel -Requires: libcurl-devel +Requires: mpich%{?_isa} +Requires: pkgconfig%{?_isa} +Requires: hdf5-mpich-devel%{?_isa} +Requires: libcurl-devel%{?_isa} Provides: %{name}-mpich2-devel = %{version}-%{release} Obsoletes: %{name}-mpich2-devel < 4.3.0-4 @@ -149,7 +155,8 @@ NetCDF parallel mpich static libraries %package openmpi Summary: NetCDF openmpi libraries Group: Development/Libraries -Requires: openmpi +Requires: openmpi%{?_isa} +Requires: hdf5-openmpi%{?_isa} = %{_hdf5_version} BuildRequires: openmpi-devel BuildRequires: hdf5-openmpi-devel >= 1.8.4 @@ -161,10 +168,10 @@ NetCDF parallel openmpi libraries Summary: NetCDF openmpi development files Group: Development/Libraries Requires: %{name}-openmpi%{_isa} = %{version}-%{release} -Requires: openmpi-devel -Requires: pkgconfig -Requires: hdf5-openmpi-devel -Requires: libcurl-devel +Requires: openmpi-devel%{?_isa} +Requires: pkgconfig%{?_isa} +Requires: hdf5-openmpi-devel%{?_isa} +Requires: libcurl-devel%{?_isa} %description openmpi-devel NetCDF parallel openmpi development files @@ -334,6 +341,9 @@ done %changelog +* Tue Jan 27 2015 Orion Poplawski - 4.3.2-7 +- Fix up provides/requires for mpi packages, use %%{?_isa}. + * Wed Jan 07 2015 Orion Poplawski - 4.3.2-6 - Rebuild for hdf5 1.8.14 From 597495de3d995daa8a7bb1ed92002d88804fde14 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 13 Feb 2015 22:09:28 -0700 Subject: [PATCH 4/8] Update to 4.3.3 --- .gitignore | 1 + netcdf-mpio.patch | 122 ---------------------------------------------- netcdf.spec | 20 +++++--- sources | 2 +- 4 files changed, 14 insertions(+), 131 deletions(-) delete mode 100644 netcdf-mpio.patch diff --git a/.gitignore b/.gitignore index 4393cee..4e00f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ netcdf-4.1.1.tar.gz /netcdf-4.3.0.tar.gz /v4.3.1.1.tar.gz /netcdf-4.3.2.tar.gz +/netcdf-4.3.3.tar.gz diff --git a/netcdf-mpio.patch b/netcdf-mpio.patch deleted file mode 100644 index 395b3be..0000000 --- a/netcdf-mpio.patch +++ /dev/null @@ -1,122 +0,0 @@ -commit 435d8a03ed28bb5ad63aff12cbc6ab91531b6bc8 -Author: Quincey Koziol -Date: Wed May 7 08:45:15 2014 -0500 - - Account for the HDF5 library not having the MPI-POSIX VFD configured in. - -diff --git a/libsrc4/nc4file.c b/libsrc4/nc4file.c -index ec3bb0c..5c957be 100644 ---- a/libsrc4/nc4file.c -+++ b/libsrc4/nc4file.c -@@ -308,12 +308,21 @@ nc4_create_file(const char *path, int cmode, MPI_Comm comm, MPI_Info info, - if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0) - BAIL(NC_EPARINIT); - } -+#ifdef USE_PARALLEL_POSIX - else /* MPI/POSIX */ - { - LOG((4, "creating parallel file with MPI/posix")); - if (H5Pset_fapl_mpiposix(fapl_id, comm, 0) < 0) - BAIL(NC_EPARINIT); - } -+#else /* USE_PARALLEL_POSIX */ -+ /* Should not happen! Code in NC4_create/NC4_open should alias the -+ * NC_MPIPOSIX flag to NC_MPIIO, if the MPI-POSIX VFD is not -+ * available in HDF5. -QAK -+ */ -+ else /* MPI/POSIX */ -+ BAIL(NC_EPARINIT); -+#endif /* USE_PARALLEL_POSIX */ - - /* Keep copies of the MPI Comm & Info objects */ - if (MPI_SUCCESS != MPI_Comm_dup(comm, &nc4_info->comm)) -@@ -465,6 +474,17 @@ NC4_create(const char* path, int cmode, size_t initialsz, int basepe, - ) - return NC_EINVAL; - -+#ifndef USE_PARALLEL_POSIX -+/* If the HDF5 library has been compiled without the MPI-POSIX VFD, alias -+ * the NC_MPIPOSIX flag to NC_MPIIO. -QAK -+ */ -+ if(cmode & NC_MPIPOSIX) -+ { -+ cmode &= ~NC_MPIPOSIX; -+ cmode |= NC_MPIIO; -+ } -+#endif /* USE_PARALLEL_POSIX */ -+ - cmode |= NC_NETCDF4; - - /* Apply default create format. */ -@@ -2168,12 +2188,21 @@ nc4_open_file(const char *path, int mode, MPI_Comm comm, - if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0) - BAIL(NC_EPARINIT); - } -+#ifdef USE_PARALLEL_POSIX - else /* MPI/POSIX */ - { - LOG((4, "opening parallel file with MPI/posix")); - if (H5Pset_fapl_mpiposix(fapl_id, comm, 0) < 0) - BAIL(NC_EPARINIT); - } -+#else /* USE_PARALLEL_POSIX */ -+ /* Should not happen! Code in NC4_create/NC4_open should alias the -+ * NC_MPIPOSIX flag to NC_MPIIO, if the MPI-POSIX VFD is not -+ * available in HDF5. -QAK -+ */ -+ else /* MPI/POSIX */ -+ BAIL(NC_EPARINIT); -+#endif /* USE_PARALLEL_POSIX */ - - /* Keep copies of the MPI Comm & Info objects */ - if (MPI_SUCCESS != MPI_Comm_dup(comm, &nc4_info->comm)) -@@ -2640,6 +2669,17 @@ NC4_open(const char *path, int mode, int basepe, size_t *chunksizehintp, - (mode & NC_MPIIO && mode & NC_MPIPOSIX)) - return NC_EINVAL; - -+#ifndef USE_PARALLEL_POSIX -+/* If the HDF5 library has been compiled without the MPI-POSIX VFD, alias -+ * the NC_MPIPOSIX flag to NC_MPIIO. -QAK -+ */ -+ if(mode & NC_MPIPOSIX) -+ { -+ mode &= ~NC_MPIPOSIX; -+ mode |= NC_MPIIO; -+ } -+#endif /* USE_PARALLEL_POSIX */ -+ - - /* Depending on the type of file, open it. */ - -diff --git a/nc_test4/tst_nc4perf.c b/nc_test4/tst_nc4perf.c -index 47af70e..3528b82 100644 ---- a/nc_test4/tst_nc4perf.c -+++ b/nc_test4/tst_nc4perf.c -@@ -244,6 +244,11 @@ int test_pio_4d(size_t cache_size, int facc_type, int access_flag, MPI_Comm comm - return 0; - } - -+/* Note: When the MPI-POSIX VFD is not compiled in to HDF5, the NC_MPIPOSIX -+ * flag will be aliased to the NC_MPIIO flag within the library, and -+ * therefore this test will exercise the aliasing, with the MPI-IO VFD, -+ * under that configuration. -QAK -+ */ - #define NUM_MODES 2 - #define NUM_FACC 2 - #define NUM_CHUNK_COMBOS_2D 3 -diff --git a/nc_test4/tst_parallel3.c b/nc_test4/tst_parallel3.c -index 27f9c98..9fa534f 100644 ---- a/nc_test4/tst_parallel3.c -+++ b/nc_test4/tst_parallel3.c -@@ -129,6 +129,11 @@ int main(int argc, char **argv) - if (mpi_rank == 0) - SUMMARIZE_ERR; - -+/* Note: When the MPI-POSIX VFD is not compiled in to HDF5, the NC_MPIPOSIX -+ * flag will be aliased to the NC_MPIIO flag within the library, and -+ * therefore this test will exercise the aliasing, with the MPI-IO VFD, -+ * under that configuration. -QAK -+ */ - if (mpi_rank == 0) - printf("*** Testing parallel IO for raw-data with MPIPOSIX-IO (driver)..."); - facc_type = NC_NETCDF4|NC_MPIPOSIX; diff --git a/netcdf.spec b/netcdf.spec index e61ceb2..bc50b8b 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,18 +1,16 @@ Name: netcdf -Version: 4.3.2 -Release: 7%{?dist} +Version: 4.3.3 +Release: 1%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering License: NetCDF URL: http://www.unidata.ucar.edu/software/netcdf/ # Use github tarball - the unidata download is missing files -Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -#Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-%{version}.tar.gz +#Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-%{version}.tar.gz # Use pkgconfig in nc-config to avoid multi-lib issues Patch0: netcdf-pkgconfig.patch -# Upstream patch to support hdf5 1.8.13 mpio change -Patch1: netcdf-mpio.patch BuildRequires: chrpath BuildRequires: doxygen @@ -188,9 +186,8 @@ NetCDF parallel openmpi static libraries %prep -%setup -q -n %{name}-c-%{version} +%setup -q %patch0 -p1 -b .pkgconfig -%patch1 -p1 -b .mpio %build @@ -290,6 +287,8 @@ done %doc examples %{_bindir}/nc-config %{_includedir}/netcdf.h +%{_includedir}/netcdf_meta.h +%{_libdir}/libnetcdf.settings %{_libdir}/*.so %{_libdir}/pkgconfig/netcdf.pc %{_mandir}/man3/* @@ -310,6 +309,7 @@ done %files mpich-devel %{_libdir}/mpich/bin/nc-config %{_includedir}/mpich-%{_arch} +%{_libdir}/mpich/lib/libnetcdf.settings %{_libdir}/mpich/lib/*.so %{_libdir}/mpich/lib/pkgconfig/%{name}.pc %doc %{_libdir}/mpich/share/man/man3/*.3* @@ -331,6 +331,7 @@ done %files openmpi-devel %{_libdir}/openmpi/bin/nc-config %{_includedir}/openmpi-%{_arch} +%{_libdir}/openmpi/lib/libnetcdf.settings %{_libdir}/openmpi/lib/*.so %{_libdir}/openmpi/lib/pkgconfig/%{name}.pc %doc %{_libdir}/openmpi/share/man/man3/*.3* @@ -341,6 +342,9 @@ done %changelog +* Fri Feb 13 2015 Orion Poplawski - 4.3.3-1 +- Update to 4.3.3 + * Tue Jan 27 2015 Orion Poplawski - 4.3.2-7 - Fix up provides/requires for mpi packages, use %%{?_isa}. diff --git a/sources b/sources index e563d27..4cace3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d0a2a1e2bd854390062f4a808dd94c4 netcdf-4.3.2.tar.gz +5fbd0e108a54bd82cb5702a73f56d2ae netcdf-4.3.3.tar.gz From 0b99a3b6ead70e7312dd5e9d82aa6866bcd228d0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Mar 2015 19:24:48 -0600 Subject: [PATCH 5/8] Update to 4.3.3.1 --- .gitignore | 1 + netcdf.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4e00f6a..4bdb337 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ netcdf-4.1.1.tar.gz /v4.3.1.1.tar.gz /netcdf-4.3.2.tar.gz /netcdf-4.3.3.tar.gz +/netcdf-4.3.3.1.tar.gz diff --git a/netcdf.spec b/netcdf.spec index bc50b8b..53d4f0e 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,5 +1,5 @@ Name: netcdf -Version: 4.3.3 +Version: 4.3.3.1 Release: 1%{?dist} Summary: Libraries for the Unidata network Common Data Form @@ -342,6 +342,9 @@ done %changelog +* Wed Mar 11 2015 Orion Poplawski - 4.3.3.1-1 +- Update to 4.3.3.1 + * Fri Feb 13 2015 Orion Poplawski - 4.3.3-1 - Update to 4.3.3 diff --git a/sources b/sources index 4cace3a..a8e5ceb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fbd0e108a54bd82cb5702a73f56d2ae netcdf-4.3.3.tar.gz +5c9dad3705a3408d27f696e5b31fb88c netcdf-4.3.3.1.tar.gz From 42c72dc7253d0b1c64ebd7afdeb3e849165c78ef Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 17 May 2015 14:52:54 -0600 Subject: [PATCH 6/8] Rebuild for hdf5 1.8.15 --- netcdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netcdf.spec b/netcdf.spec index 53d4f0e..f8d694f 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,6 @@ Name: netcdf Version: 4.3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering @@ -342,6 +342,9 @@ done %changelog +* Sun May 17 2015 Orion Poplawski - 4.3.3.1-2 +- Rebuild for hdf5 1.8.15 + * Wed Mar 11 2015 Orion Poplawski - 4.3.3.1-1 - Update to 4.3.3.1 From 5f5c2ff192acb68b51d1bf15037f0e4642ad8009 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 21:40:23 +0000 Subject: [PATCH 7/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- netcdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netcdf.spec b/netcdf.spec index f8d694f..8bcbcf5 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,6 @@ Name: netcdf Version: 4.3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering @@ -342,6 +342,9 @@ done %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 4.3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun May 17 2015 Orion Poplawski - 4.3.3.1-2 - Rebuild for hdf5 1.8.15 From d5f12e3cd6cb56be3c99c8b3e0b8448d5a3165b2 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 29 Jul 2015 17:01:29 +0200 Subject: [PATCH 8/8] mpich is available on ppc64 now --- netcdf.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/netcdf.spec b/netcdf.spec index 8bcbcf5..4350d81 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,6 @@ Name: netcdf Version: 4.3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Libraries for the Unidata network Common Data Form Group: Applications/Engineering @@ -35,7 +35,7 @@ Requires: hdf5%{?_isa} = %{_hdf5_version} %global with_mpich 1 %global with_openmpi 1 -%if 0%{?rhel} <= 6 +%if 0%{?rhel} && 0%{?rhel} <= 6 || 0%{?fedora} && 0%{?fedora} < 20 %ifarch ppc64 # No mpich on ppc64 in EL6 %global with_mpich 0 @@ -342,6 +342,9 @@ done %changelog +* Wed Jul 29 2015 Karsten Hopp 4.3.3.1-4 +- mpich is available on ppc64 now + * Wed Jun 17 2015 Fedora Release Engineering - 4.3.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild