From b24cd0261b2ae256d09f4afc5f07314f28137dc8 Mon Sep 17 00:00:00 2001 From: "H. Joe Lee" Date: Thu, 17 Oct 2024 11:11:24 -0500 Subject: [PATCH 1/4] Fix h5py GitHub Action (#4962) --- .github/workflows/h5py.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/h5py.yml b/.github/workflows/h5py.yml index a0c39d67f59..c6c6aa7505b 100644 --- a/.github/workflows/h5py.yml +++ b/.github/workflows/h5py.yml @@ -28,8 +28,9 @@ jobs: ./spack/bin/spack install py-h5py@master+mpi ^hdf5@develop-1.17 ./spack/bin/spack install py-pytest ./spack/bin/spack install py-ipython + ./spack/bin/spack install py-pytest-mpi spack load py-h5py spack load py-pytest spack load py-ipython - pip install pytest-mpi + spack load py-pytest-mpi python -c "import h5py; h5py.run_tests(); print(h5py.version.info);" From 7f619c9b13f846bcecaf70569a8a4992b1fa491d Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:11:52 -0500 Subject: [PATCH 2/4] Do not package debug builds (#4963) * Do not package debug builds * Do not try to upload with debug builds --- .github/workflows/main-cmake.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index 3c953409740..d633bb77ebb 100644 --- a/.github/workflows/main-cmake.yml +++ b/.github/workflows/main-cmake.yml @@ -241,6 +241,7 @@ jobs: - name: CMake Run Package run: cpack -C ${{ inputs.build_mode }} -V working-directory: ${{ runner.workspace }}/build + if: ${{ inputs.build_mode != 'Debug' }} - name: List files in the space run: | @@ -253,7 +254,7 @@ jobs: name: zip-vs2022_cl-${{ inputs.build_mode }}-binary path: ${{ runner.workspace }}/build/HDF5-*-win64.zip if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn` - if: ${{ (matrix.os == 'windows-latest') && (inputs.thread_safety != 'TS') }} + if: ${{ (matrix.os == 'windows-latest') && (inputs.thread_safety != 'TS') && ( inputs.build_mode != 'Debug') }} - name: Save published binary (linux) uses: actions/upload-artifact@v4 @@ -261,7 +262,7 @@ jobs: name: tgz-ubuntu-2204_gcc-${{ inputs.build_mode }}-binary path: ${{ runner.workspace }}/build/HDF5-*-Linux.tar.gz if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn` - if: ${{ (matrix.os == 'ubuntu-latest') && (inputs.thread_safety != 'TS') }} + if: ${{ (matrix.os == 'ubuntu-latest') && (inputs.thread_safety != 'TS') && ( inputs.build_mode != 'Debug') }} - name: Save published binary (Mac_latest) uses: actions/upload-artifact@v4 @@ -269,4 +270,4 @@ jobs: name: tgz-macos14_clang-${{ inputs.build_mode }}-binary path: ${{ runner.workspace }}/build/HDF5-*-Darwin.tar.gz if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn` - if: ${{ (matrix.os == 'macos-latest') && (inputs.thread_safety != 'TS') }} + if: ${{ (matrix.os == 'macos-latest') && (inputs.thread_safety != 'TS') && ( inputs.build_mode != 'Debug') }} From ad307bf61f7dcd234204c1256b4954d9493e956a Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Thu, 17 Oct 2024 11:17:20 -0500 Subject: [PATCH 3/4] Updated hyperslab documentation (#4965) * corrected Fortran docs for hyperslab selection * updated hyperslab op doc --- fortran/src/H5Sff.F90 | 6 ++++-- src/H5Spublic.h | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fortran/src/H5Sff.F90 b/fortran/src/H5Sff.F90 index 3c301c2f462..db709ddc10f 100644 --- a/fortran/src/H5Sff.F90 +++ b/fortran/src/H5Sff.F90 @@ -893,6 +893,10 @@ END SUBROUTINE h5sset_extent_none_f !! \param operator Flag, valid values are: !! \li H5S_SELECT_SET_F !! \li H5S_SELECT_OR_F +!! \li H5S_SELECT_AND_F +!! \li H5S_SELECT_XOR_F +!! \li H5S_SELECT_NOTB_F +!! \li H5S_SELECT_NOTA_F !! \param start Array with hyperslab offsets, \Bold{0-based indices}. !! \param count Number of blocks included in the hyperslab. !! \param hdferr \fortran_error @@ -1000,8 +1004,6 @@ END SUBROUTINE h5sselect_hyperslab_f ! H5S_SELECT_XOR_F ! H5S_SELECT_NOTB_F ! H5S_SELECT_NOTA_F -! H5S_SELECT_APPEND_F -! H5S_SELECT_PREPEND_F ! start - array with hyperslab offsets ! count - number of blocks included in the ! hyperslab diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 3697374d49c..a5264099b0f 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -190,6 +190,8 @@ H5_DLL herr_t H5Sclose(hid_t space_id); * composing the entire current extent). If either \p stride or * \p block is NULL, then it will be set to \p 1. * + * See H5Sselect_hyperslab() for valid operators (\p op). + * * \since 1.10.6 * */ @@ -213,6 +215,8 @@ H5_DLL hid_t H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_ * from \p space1_id is copied for the dataspace extent of the * newly created dataspace. * + * See H5Sselect_hyperslab() for valid operators (\p op). + * * \since 1.10.6 * */ @@ -816,6 +820,8 @@ H5_DLL htri_t H5Sis_simple(hid_t space_id); * \p space2_id. The first selection is modified to contain the * result of \p space1_id operated on by \p space2_id. * + * See H5Sselect_hyperslab() for valid operators (\p op). + * * \since 1.10.6 * */ From e64e1ea881c431a9561b83607d722994af641026 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Thu, 17 Oct 2024 12:20:47 -0400 Subject: [PATCH 4/4] Fix linker flag in pkg-config file for system zlib (#4957) Previously was hardcoding `-lzlib-static` which will result in the wrong linker flags when built with system zlib. It looks like there was logic to figure out the library name but the resulting `libname` was never used. --- CMakeFilters.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 52d65e59e47..57c51edceaf 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -108,7 +108,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT) # on the target. The target returned is: ZLIB::ZLIB get_filename_component (libname ${ZLIB_LIBRARIES} NAME_WLE) string (REGEX REPLACE "^lib" "" libname ${libname}) - set_target_properties (ZLIB::ZLIB PROPERTIES OUTPUT_NAME zlib-static) + set_target_properties (ZLIB::ZLIB PROPERTIES OUTPUT_NAME ${libname}) set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ZLIB::ZLIB) endif () else ()