Rework the compression library search

.github/workflows/aocc-cmake.yml

@@ -70,6 +70,7 @@ jobs:
           CC=mpicc cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_PARALLEL:BOOL=ON \
           -DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
           -DHDF5_BUILD_CPP_LIB:BOOL=OFF \

.github/workflows/i386-cmake.yml

@@ -38,6 +38,7 @@ jobs:
           cmake -C ../config/cmake/cacheinit.cmake -G "Unix Makefiles" \
           --log-level=VERBOSE \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
           -DHDF5_BUILD_CPP_LIB:BOOL=OFF \
           -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \

.github/workflows/julia-cmake.yml

@@ -34,6 +34,7 @@ jobs:
           cd "${{ runner.workspace }}/build"
           cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_PARALLEL:BOOL=OFF \
           -DHDF5_BUILD_CPP_LIB:BOOL=OFF \

.github/workflows/netcdf.yml

@@ -52,6 +52,7 @@ jobs:
             -DHDF5_BUILD_DOC:BOOL=OFF \
             -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \
             -DZLIB_USE_LOCALCONTENT:BOOL=OFF \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON \
             -DH5_NO_DEPRECATED_SYMBOLS:BOOL=OFF \
             -DBUILD_TESTING:BOOL=OFF \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \

.github/workflows/nvhpc-cmake.yml

@@ -52,6 +52,7 @@ jobs:
           cd "${{ runner.workspace }}/build"
           cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+          -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
           -DHDF5_ENABLE_PARALLEL:BOOL=ON \
           -DMPIEXEC_NUMPROC_FLAG:STRING=-np \

.github/workflows/vol_adios2.yml

@@ -43,6 +43,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             ${{ github.workspace }}/hdf5
           cat src/libhdf5.settings

.github/workflows/vol_async.yml

@@ -55,6 +55,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/HDFGroup/vol-async.git" \

.github/workflows/vol_cache.yml

@@ -83,6 +83,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/HDFGroup/vol-async.git" \

.github/workflows/vol_ext_passthru.yml

@@ -42,6 +42,7 @@ jobs:
             -DBUILD_STATIC_LIBS=OFF \
             -DHDF5_TEST_API:BOOL=ON \
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/hpc-io/vol-external-passthrough.git" \

.github/workflows/vol_log.yml

@@ -41,6 +41,7 @@ jobs:
             -DHDF5_ENABLE_PARALLEL:BOOL=ON \
             -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             ${{ github.workspace }}/hdf5
           cat src/libhdf5.settings

.github/workflows/vol_rest.yml

@@ -57,8 +57,8 @@ jobs:
             -DHDF5_BUILD_HL_LIB:BOOL=ON \
             -DHDF5_TEST_API:BOOL=ON \
             -DHDF5_ALLOW_UNSUPPORTED:BOOL=ON \
-            -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF \
+            -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
             -DHDF5_VOL_ALLOW_EXTERNAL:STRING="GIT" \
             -DHDF5_VOL_URL01:STRING="https://github.com/HDFGroup/vol-rest.git" \
             -DHDF5_VOL_VOL-REST_BRANCH:STRING="master" \

CMakeFilters.cmake

@@ -77,7 +77,13 @@ endif ()
 # Option for ZLib support
 #-----------------------------------------------------------------------------
 set(H5_ZLIB_FOUND FALSE)
-option (HDF5_ENABLE_ZLIB_SUPPORT "Enable Zlib Filters" ON)
+if(NOT DEFINED ZLIB_PACKAGE_NAME)
+  set(ZLIB_PACKAGE_NAME "zlib")
+endif ()
+if(NOT DEFINED ZLIBNG_PACKAGE_NAME)
+  set(ZLIBNG_PACKAGE_NAME "zlib-ng")
+endif ()
+option (HDF5_ENABLE_ZLIB_SUPPORT "Enable Zlib Filters" OFF)
 if (HDF5_ENABLE_ZLIB_SUPPORT)
   if (NOT H5_ZLIB_HEADER)
     if (NOT ZLIB_USE_EXTERNAL)
@@ -88,11 +94,12 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
       endif ()
       set(ZLIB_FOUND FALSE)
       if (HDF5_USE_ZLIB_STATIC)
-        set(ZLIB_SEACH_TYPE static)
+        set(ZLIB_SEARCH_TYPE static)
       else ()
-        set(ZLIB_SEACH_TYPE shared)
+        set(ZLIB_SEARCH_TYPE shared)
       endif ()
-      find_package (ZLIB NAMES ${PACKAGE_NAME} COMPONENTS ${ZLIB_SEACH_TYPE})
+      # Search pure Config mode first
+      find_package (ZLIB NAMES ${PACKAGE_NAME} OPTIONAL_COMPONENTS ${ZLIB_SEARCH_TYPE})
       if (NOT ZLIB_FOUND)
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
           set(ZLIB_USE_STATIC_LIBS  ${HDF5_USE_ZLIB_STATIC})
@@ -140,7 +147,7 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
     message (VERBOSE "Filter HDF5_ZLIB is ON")
   else ()
     set (HDF5_ENABLE_ZLIB_SUPPORT OFF CACHE BOOL "" FORCE)
-    message (WARNING " ZLib support in HDF5 was enabled but not found")
+    message (FATAL_ERROR " ZLib support in HDF5 was enabled but not found")
   endif ()
   message(STATUS "H5_ZLIB_HEADER=${H5_ZLIB_HEADER}")
 endif ()
@@ -149,7 +156,10 @@ endif ()
 # Option for SzLib support
 #-----------------------------------------------------------------------------
 set(H5_SZIP_FOUND FALSE)
-option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" ON)
+if(NOT DEFINED LIBAEC_PACKAGE_NAME)
+  set(LIBAEC_PACKAGE_NAME "libaec")
+endif ()
+option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON)
   if (NOT SZIP_USE_EXTERNAL)
@@ -160,10 +170,8 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
     endif ()
     set(libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC})
     set(SZIP_FOUND FALSE)
-    find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS ${LIBAEC_SEARCH_TYPE})
-    if (NOT SZIP_FOUND)
-      find_package (SZIP) # Legacy find
-    endif ()
+    # Search pure Config mode, there is not a FindSZIP module available
+    find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} OPTIONAL_COMPONENTS ${LIBAEC_SEARCH_TYPE})
     set(H5_SZIP_FOUND ${SZIP_FOUND})
     if (H5_SZIP_FOUND)
       set (H5_SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
@@ -173,8 +181,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
   else ()
     if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
-      message (VERBOSE "Filter SZIP is built")
-      message (VERBOSE "... with library AEC")
+      message (VERBOSE "Filter SZIP is built using library AEC")
       set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${H5_SZIP_STATIC_LIBRARY})
     endif ()
   endif ()
@@ -193,6 +200,6 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
     endif ()
   else ()
     set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
-    message (WARNING "SZIP support in HDF5 was enabled but not found")
+    message (FATAL_ERROR "SZIP support in HDF5 was enabled but not found")
   endif ()
 endif ()

config/cmake/cacheinit.cmake

@@ -79,7 +79,7 @@ set (KWSYS_USE_LOCALCONTENT OFF CACHE BOOL "Use local file for KWSYS FetchConten
 # filter plugin options
 ########################
 
-set (PLUGIN_TGZ_ORIGPATH "https://github.com/HDFGroup/hdf5_plugins/releases/download/snapshots" CACHE STRING "Use PLUGINS from original location" FORCE)
+set (PLUGIN_TGZ_ORIGPATH "https://github.com/HDFGroup/hdf5_plugins/releases/download/snapshot" CACHE STRING "Use PLUGINS from original location" FORCE)
 set (PLUGIN_TGZ_NAME "hdf5_plugins-master.tar.gz" CACHE STRING "Use PLUGINS from compressed file" FORCE)
 set (PLUGIN_USE_LOCALCONTENT ON CACHE BOOL "Use local file for PLUGIN FetchContent" FORCE)
 set (PLUGIN_PACKAGE_NAME "pl" CACHE STRING "Name of PLUGIN package" FORCE)

config/cmake/scripts/HDF5options.cmake

@@ -66,8 +66,8 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN
 #set(ENV{SZIP_ROOT} "some_location")
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5_SZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib -DH5_SZIP_INCLUDE_DIR:PATH=some_location/include")
 
-### disable using ext zlib
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF")
+### enable using ext zlib
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON")
 ### disable using ext szip
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")

release_docs/INSTALL_CMake.txt

@@ -68,7 +68,7 @@ Download from https://github.com/HDFGroup/hdf5/blob/develop/config/cmake/scripts
 External compression plugin libraries from https://github.com/HDFGroup/hdf5_plugins:
     hdf5_plugins.tar.gz
 
-External compression szip and zlib libraries:
+External compression szip and zlib libraries:0
     ZLIB          "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz"
     ZLIBNG        "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.2.tar.gz"
     LIBAEC        "https://github.com/MathisRosenhauer/libaec/releases/download/v1.1.3/libaec-1.1.3.tar.gz"
@@ -556,7 +556,7 @@ These five steps are described in detail below.
             ########################
             # filter plugin options
             ########################
-            set (PLUGIN_TGZ_ORIGPATH "https://github.com/HDFGroup/hdf5_plugins/releases/download/snapshots" CACHE STRING "Use PLUGINS from original location" FORCE)
+            set (PLUGIN_TGZ_ORIGPATH "https://github.com/HDFGroup/hdf5_plugins/releases/download/snapshot" CACHE STRING "Use PLUGINS from original location" FORCE)
             set (PLUGIN_TGZ_NAME "hdf5_plugins-master.tar.gz" CACHE STRING "Use PLUGINS from compressed file" FORCE)
             set (PLUGIN_USE_LOCALCONTENT ON CACHE BOOL "Use local file for PLUGIN FetchContent" FORCE)
             set (PLUGIN_PACKAGE_NAME "pl" CACHE STRING "Name of PLUGIN package" FORCE)
@@ -939,7 +939,7 @@ if (BUILD_TESTING)
 HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)"  "NO"
 HDF5_ENABLE_PLUGIN_SUPPORT  "Enable PLUGIN Filters"                         OFF
 HDF5_ENABLE_SZIP_SUPPORT    "Use SZip Filter"                               OFF
-HDF5_ENABLE_ZLIB_SUPPORT   "Enable Zlib Filters"                           ON
+HDF5_ENABLE_ZLIB_SUPPORT    "Enable Zlib Filters"                           OFF
 
 if (HDF5_USE_ZLIB_NG)
     ZLIBNG_USE_EXTERNAL     "Use External Library Building for ZLIBNG"      OFF

release_docs/RELEASE.txt

@@ -50,7 +50,7 @@ New Features
     - Renamed the option: HDF5_ENABLE_Z_LIB_SUPPORT
 
       The option has been renamed to HDF5_ENABLE_ZLIB_SUPPORT to be consistent
-      with the naming of other options.
+      with the naming of other options. Also, the option defaults to OFF.
 
     - Added support for MinGW + MSYS2 when building with CMake
 
@@ -510,6 +510,18 @@ Bug Fixes since HDF5-2.0.0 release
 
     Configuration
     -------------
+    - Changed the zlib/szip compression find message to FATAL ERROR
+
+      The message was changed to indicate that zlib/szip compression was requested and
+      that it was not found. If an option is requested, not finding it should always
+      be an error.
+
+    - Removed the module search find_package for szip library
+
+      There is not a szip module file to use, so the find_package only uses
+      find_package in config mode. The choice then is to either build szip, with libaec,
+      inline or find a system installed szip library, built with CMake.
+
     - Changed name of libhdf5hl_fortran installed by autotools to libhdf5_hl_fortran.  The 
       new name is consistent with the name of the lib when installed by CMake and with the 
       other hl libs.  

test/dsets.c

@@ -2845,13 +2845,14 @@ test_missing_filter(hid_t file)
     size_t        i, j;                                   /* Local index variables */
     herr_t        ret;                                    /* Generic return value */
     const char   *testfile       = H5_get_srcdir_filename(FILE_DEFLATE_NAME); /* Corrected test file name */
-    H5CX_node_t   api_ctx        = {{0}, NULL};                               /* API context node to push */
     bool          api_ctx_pushed = false;                                     /* Whether API context pushed */
 
     TESTING("dataset access with missing filter");
 
     /* Unregister the deflate filter */
 #ifdef H5_HAVE_FILTER_DEFLATE
+    H5CX_node_t api_ctx = {{0}, NULL}; /* API context node to push */
+
     /* Verify deflate filter is registered currently */
     if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != true) {
         H5_FAILED();