From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28E0613835B for ; Sat, 27 Feb 2021 15:38:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43564E097A; Sat, 27 Feb 2021 15:38:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CA55E097A for ; Sat, 27 Feb 2021 15:38:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 160BE34112E for ; Sat, 27 Feb 2021 15:38:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AD2C567 for ; Sat, 27 Feb 2021 15:38:07 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1614440178.6552a105bd9efbcd159a05f851a8417ee69a8646.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/netcdf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/netcdf/files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch X-VCS-Directories: sci-libs/netcdf/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 6552a105bd9efbcd159a05f851a8417ee69a8646 X-VCS-Branch: master Date: Sat, 27 Feb 2021 15:38:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 86fca0f7-3c41-400e-bad9-e54fa9dc0481 X-Archives-Hash: b78de0ad46cb002e7466fa7b33303db9 commit: 6552a105bd9efbcd159a05f851a8417ee69a8646 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Feb 26 16:52:32 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Feb 27 15:36:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6552a105 sci-libs/netcdf: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/19672 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch | 145 --------------------- 1 file changed, 145 deletions(-) diff --git a/sci-libs/netcdf/files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch b/sci-libs/netcdf/files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch deleted file mode 100644 index 783a5b06e99..00000000000 --- a/sci-libs/netcdf/files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 435d8a03ed28bb5ad63aff12cbc6ab91531b6bc8 Mon Sep 17 00:00:00 2001 -From: Quincey Koziol -Date: Wed, 7 May 2014 08:45:15 -0500 -Subject: [PATCH] Account for the HDF5 library not having the MPI-POSIX VFD - configured in. - ---- - RELEASE_NOTES.md | 2 ++ - libsrc4/nc4file.c | 40 ++++++++++++++++++++++++++++++++++++++++ - nc_test4/tst_nc4perf.c | 5 +++++ - nc_test4/tst_parallel3.c | 5 +++++ - 4 files changed, 52 insertions(+) - -diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md -index 27f228c..1a69d17 100644 ---- a/RELEASE_NOTES.md -+++ b/RELEASE_NOTES.md -@@ -9,6 +9,8 @@ This file contains a high-level description of this package's evolution. Release - - ### 4.3.3-rc1 Released TBD - -+* When the NC_MPIPOSIX flag is given for parallel I/O access and the HDF5 library does not have the MPI-POSIX VFD configured in, the NC_MPIPOSIX flag is transparently aliased to the NC_MPIIO flag within the netCDF-4 library. -+ - ## 4.3.2 Released 2014-04-23 - - * As part of an ongoing project, the Doxygen-generated netcdf documentation has been reorganized. The goal is to make the documentation easier to parse, and to eliminate redundant material. This project is ongoing. -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; --- -2.0.3 -