From 1a5e27d05252e3701dc25102a059839250b8a056 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 23 Aug 2023 10:08:39 -0500 Subject: [PATCH 1/3] Re-enable libaec-SZIP as default --- .github/workflows/daily-build.yml | 15 +++++++++++++++ CMakeFilters.cmake | 2 +- CMakePresets.json | 3 +-- config/cmake/cacheinit.cmake | 4 ---- config/cmake/scripts/HDF5options.cmake | 6 +++--- release_docs/INSTALL_CMake.txt | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 5633b3cfbbc..844fda300c4 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -40,3 +40,18 @@ jobs: use_environ: snapshots if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }} + check-examples: + needs: call-workflow-release + - uses: convictional/trigger-workflow-and-wait@v1.6.1 + with: + owner: HDFGroup + repo: hdf5 + github_token: ${{ secrets.GITHUB_PERSONAL_ACCESS_TOKEN }} + workflow_file_name: daily-build.yml + ref: release-branch + wait_interval: 300 + client_payload: '{}' + propagate_failure: false + trigger_workflow: true + wait_workflow: true + diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 6573ee30a51..78f98db9384 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -131,7 +131,7 @@ endif () #----------------------------------------------------------------------------- # Option for SzLib support #----------------------------------------------------------------------------- -option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) +option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" ON) if (HDF5_ENABLE_SZIP_SUPPORT) option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON) if (NOT SZIP_USE_EXTERNAL) diff --git a/CMakePresets.json b/CMakePresets.json index dcb6ff5ee76..6fe2fd09571 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -34,8 +34,7 @@ "cacheVariables": { "HDF5_PACKAGE_EXTLIBS": "ON", "ZLIB_USE_LOCALCONTENT": "OFF", - "LIBAEC_USE_LOCALCONTENT": "OFF", - "HDF5_ENABLE_SZIP_SUPPORT": "ON" + "LIBAEC_USE_LOCALCONTENT": "OFF" } }, { diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 9a0d073a707..ad61584c902 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -32,10 +32,6 @@ set_property (CACHE HDF5_INSTALL_MOD_FORTRAN PROPERTY STRINGS NO SHARED STATIC) set (HDF5_BUILD_GENERATORS ON CACHE BOOL "Build Test Generators" FORCE) -set (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE) - -set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE) - set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE) set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE) diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 5267212a09c..92bfd37ecbe 100644 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -69,9 +69,9 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN ### disable using ext zlib #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF") -### enable using ext szip -#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON") -#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING: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") #### package examples #### #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-2.0.3-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}") diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index 75738adbde3..f979ff315bc 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -876,7 +876,7 @@ if (BUILD_TESTING) ---------------- External Library Options --------------------- 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_SZIP_SUPPORT "Use SZip Filter" ON HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" ON PLUGIN_USE_EXTERNAL "Use External Library Building for PLUGINS" 0 ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 0 From 352b8bd8fcbdaa45bc4deea7e3f862c4630924e6 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 23 Aug 2023 10:09:41 -0500 Subject: [PATCH 2/3] revert ci file --- .github/workflows/daily-build.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 844fda300c4..5633b3cfbbc 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -40,18 +40,3 @@ jobs: use_environ: snapshots if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }} - check-examples: - needs: call-workflow-release - - uses: convictional/trigger-workflow-and-wait@v1.6.1 - with: - owner: HDFGroup - repo: hdf5 - github_token: ${{ secrets.GITHUB_PERSONAL_ACCESS_TOKEN }} - workflow_file_name: daily-build.yml - ref: release-branch - wait_interval: 300 - client_payload: '{}' - propagate_failure: false - trigger_workflow: true - wait_workflow: true - From 47e9a7ad542426d14b5a46393fc3d31d89c5c95c Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 23 Aug 2023 12:08:58 -0500 Subject: [PATCH 3/3] Add note about szip filter --- release_docs/RELEASE.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index bef7c96a5d0..7de4b18539b 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -53,6 +53,9 @@ New Features Since libaec is prevalent and BSD-licensed for both encoding and decoding, we build the szip filter by default now. + Both autotools and CMake build systems will process the szip filter the same as + the zlib filter is processed. + - Removed CMake cross-compiling variables * HDF5_USE_PREGEN