Merge remote-tracking branch 'origin/develop' into pause_errors_15

.github/workflows/h5py.yml

@@ -28,8 +28,9 @@ jobs:
  ./spack/bin/spack install py-h5py@master+mpi ^[email protected]
  ./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);"

.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,20 +254,20 @@ 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
  with:
  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
  with:
  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') }}

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 ()

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

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
  *
  */