diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index 3a0c1c3e..d9dded0a 100644 --- a/.ci_support/linux_64_mpimpich.yaml +++ b/.ci_support/linux_64_mpimpich.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml index 59fd14de..f33c08a2 100644 --- a/.ci_support/linux_64_mpinompi.yaml +++ b/.ci_support/linux_64_mpinompi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml index c27d04b1..d45536d9 100644 --- a/.ci_support/linux_64_mpiopenmpi.yaml +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml index dbfe1d2a..8df2f545 100644 --- a/.ci_support/linux_aarch64_mpimpich.yaml +++ b/.ci_support/linux_aarch64_mpimpich.yaml @@ -15,7 +15,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml index 9d41ef8b..1773b287 100644 --- a/.ci_support/linux_aarch64_mpinompi.yaml +++ b/.ci_support/linux_aarch64_mpinompi.yaml @@ -15,7 +15,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml index a2e1db5b..32824fd6 100644 --- a/.ci_support/linux_aarch64_mpiopenmpi.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml @@ -15,7 +15,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml index f1427048..1ec2b8a9 100644 --- a/.ci_support/linux_ppc64le_mpimpich.yaml +++ b/.ci_support/linux_ppc64le_mpimpich.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml index c70a3567..980ec37e 100644 --- a/.ci_support/linux_ppc64le_mpinompi.yaml +++ b/.ci_support/linux_ppc64le_mpinompi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml index 369dda6a..ea1a6a57 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml index eb6172b5..f7904735 100644 --- a/.ci_support/osx_64_mpimpich.yaml +++ b/.ci_support/osx_64_mpimpich.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml index 33b72b98..4d6fd923 100644 --- a/.ci_support/osx_64_mpinompi.yaml +++ b/.ci_support/osx_64_mpinompi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml index 5b130c86..1b6c92b5 100644 --- a/.ci_support/osx_64_mpiopenmpi.yaml +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml index 531d573c..e67ffb81 100644 --- a/.ci_support/osx_arm64_mpimpich.yaml +++ b/.ci_support/osx_arm64_mpimpich.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml index 855af9ee..c5256e5d 100644 --- a/.ci_support/osx_arm64_mpinompi.yaml +++ b/.ci_support/osx_arm64_mpinompi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml index c9279699..f163fbc5 100644 --- a/.ci_support/osx_arm64_mpiopenmpi.yaml +++ b/.ci_support/osx_arm64_mpiopenmpi.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 898b9815..b761f926 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_sources: channel_targets: - conda-forge main curl: -- '7' +- '8' cxx_compiler: - vs2019 hdf4: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 151bafdf..13062347 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @WardF @dopplershift @groutr @kmuehlbauer @mingwandroid @msarahan @ocefpaf @xylar \ No newline at end of file +* @WardF @dopplershift @groutr @kmuehlbauer @mingwandroid @msarahan @ocefpaf @xylar @zklaus \ No newline at end of file diff --git a/README.md b/README.md index 115da2fa..7d20ed53 100644 --- a/README.md +++ b/README.md @@ -277,4 +277,5 @@ Feedstock Maintainers * [@msarahan](https://github.com/msarahan/) * [@ocefpaf](https://github.com/ocefpaf/) * [@xylar](https://github.com/xylar/) +* [@zklaus](https://github.com/zklaus/) diff --git a/recipe/build.sh b/recipe/build.sh index 130c978b..d8dd562b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -48,6 +48,7 @@ if [[ ${HOST} =~ .*darwin.* ]]; then # or to fix ld64 so that it checks for symbols being used in this section). export LDFLAGS=$(echo "${LDFLAGS}" | sed "s/-Wl,-dead_strip_dylibs//g") export HDF5_PLUGIN_PATH=$(echo "H5_DEFAULT_PLUGINDIR" | clang-cpp -P -include $PREFIX/include/H5pubconf.h - | tr -d '"') + export CMAKE_ARGS="${CMAKE_ARGS} -DHAVE_CLOCK_GETTIME:BOOL=OFF" else export HDF5_PLUGIN_PATH=$(echo "H5_DEFAULT_PLUGINDIR" | $CPP -P -include $PREFIX/include/H5pubconf.h - | tr -d '"') fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 999d137b..edcb8960 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "4.9.2" %} -{% set build = 3 %} +{% set build = 4 %} # recipe-lint fails if mpi is undefined {% set mpi = mpi or 'nompi' %} @@ -20,6 +20,7 @@ source: - patches/0009-topsrcdir.patch - patches/prevent_MS_runtime_libs_being_installed_again.patch # [win] - patches/do_not_use_16_processes_in_tests.patch # [ppc64le] + - patches/0001-Fix-issue-2674.patch build: number: {{ build }} @@ -107,3 +108,4 @@ extra: - msarahan - xylar - dopplershift + - zklaus diff --git a/recipe/patches/0001-Fix-issue-2674.patch b/recipe/patches/0001-Fix-issue-2674.patch new file mode 100644 index 00000000..76e68f51 --- /dev/null +++ b/recipe/patches/0001-Fix-issue-2674.patch @@ -0,0 +1,56 @@ +From b61e5cb9022b98312e6135bda859108352b531f0 Mon Sep 17 00:00:00 2001 +From: uweschulzweida <35592488+uweschulzweida@users.noreply.github.com> +Date: Wed, 5 Apr 2023 18:05:53 +0200 +Subject: [PATCH] Fix issue #2674 + +--- + libhdf5/hdf5open.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/libhdf5/hdf5open.c b/libhdf5/hdf5open.c +index cb2491ff..e00f426e 100644 +--- a/libhdf5/hdf5open.c ++++ b/libhdf5/hdf5open.c +@@ -1205,12 +1205,14 @@ static int get_quantize_info(NC_VAR_INFO_T *var) + { + hid_t attid; + hid_t datasetid; ++ htri_t attr_exists; + + /* Try to open an attribute of the correct name for quantize + * info. */ + datasetid = ((NC_HDF5_VAR_INFO_T *)var->format_var_info)->hdf_datasetid; +- attid = H5Aopen_by_name(datasetid, ".", NC_QUANTIZE_BITGROOM_ATT_NAME, +- H5P_DEFAULT, H5P_DEFAULT); ++ attr_exists = H5Aexists(datasetid, NC_QUANTIZE_BITGROOM_ATT_NAME); ++ attid = attr_exists ? H5Aopen_by_name(datasetid, ".", NC_QUANTIZE_BITGROOM_ATT_NAME, ++ H5P_DEFAULT, H5P_DEFAULT) : 0; + + if (attid > 0) + { +@@ -1218,16 +1220,18 @@ static int get_quantize_info(NC_VAR_INFO_T *var) + } + else + { +- attid = H5Aopen_by_name(datasetid, ".", NC_QUANTIZE_GRANULARBR_ATT_NAME, +- H5P_DEFAULT, H5P_DEFAULT); ++ attr_exists = H5Aexists(datasetid, NC_QUANTIZE_GRANULARBR_ATT_NAME); ++ attid = attr_exists ? H5Aopen_by_name(datasetid, ".", NC_QUANTIZE_GRANULARBR_ATT_NAME, ++ H5P_DEFAULT, H5P_DEFAULT) : 0; + if (attid > 0) + { + var->quantize_mode = NC_QUANTIZE_GRANULARBR; + } + else + { +- attid = H5Aopen_by_name(datasetid, ".", NC_QUANTIZE_BITROUND_ATT_NAME, +- H5P_DEFAULT, H5P_DEFAULT); ++ attr_exists = H5Aexists(datasetid, NC_QUANTIZE_BITROUND_ATT_NAME); ++ attid = attr_exists ? H5Aopen_by_name(datasetid, ".", NC_QUANTIZE_BITROUND_ATT_NAME, ++ H5P_DEFAULT, H5P_DEFAULT) : 0; + if (attid > 0) + var->quantize_mode = NC_QUANTIZE_BITROUND; + } +-- +2.39.1 +