Update presets, examples uncompress, szip cache (#3391)

2025-01-30 15:32:37 +08:00 · 2023-08-18 16:01:15 -05:00 · 2023-08-18 16:01:15 -05:00 · ffde055be2
commit ffde055be2
parent 81830c1ded
6 changed files with 35 additions and 26 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -203,7 +203,6 @@ java/src/hdf/CMakeLists.txt -text
 java/src/hdf/hdf5lib/CMakeLists.txt -text
 java/src/hdf/hdf5lib/H5.java -text
 java/src/hdf/hdf5lib/HDF5Constants.java -text
-java/src/hdf/hdf5lib/HDF5GroupInfo.java -text
 java/src/hdf/hdf5lib/HDFArray.java -text
 java/src/hdf/hdf5lib/HDFNativeData.java -text
 java/src/hdf/hdf5lib/callbacks/Callbacks.java -text
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@ -154,13 +154,20 @@ if (HDF5_PACK_EXAMPLES)
  option (EXAMPLES_USE_RELEASE_NAME "Use the released examples artifact name" OFF)
  option (EXAMPLES_DOWNLOAD "Download to use released examples files" OFF)
  if (EXAMPLES_DOWNLOAD)
-    if (NOT EXAMPLES_USE_LOCALCONTENT)
-      set (EXAMPLES_URL ${EXAMPLES_TGZ_ORIGPATH}/${EXAMPLES_TGZ_ORIGNAME})
+    if (EXAMPLES_USE_RELEASE_NAME)
+      set (EXAMPLES_NAME ${EXAMPLES_TGZ_ORIGNAME})
    else ()
-      set (EXAMPLES_URL ${TGZPATH}/${EXAMPLES_TGZ_ORIGNAME})
+      set (EXAMPLES_NAME ${HDF5_EXAMPLES_COMPRESSED})
+    endif ()
+    if (NOT EXAMPLES_USE_LOCALCONTENT)
+      set (EXAMPLES_URL ${EXAMPLES_TGZ_ORIGPATH}/${EXAMPLES_NAME})
+      file (DOWNLOAD ${EXAMPLES_URL} ${HDF5_BINARY_DIR}/${HDF5_EXAMPLES_COMPRESSED} STATUS EX_DL)
+      message (STATUS "Examples file is ${EXAMPLES_URL} STATUS=${EX_DL}")
+    else ()
+      set (EXAMPLES_URL ${TGZPATH}/${EXAMPLES_NAME})
+      file (COPY_FILE ${EXAMPLES_URL} ${HDF5_BINARY_DIR}/${HDF5_EXAMPLES_COMPRESSED} RESULT EX_DL)
+      message (STATUS "Examples file is ${EXAMPLES_URL} RESULT=${EX_DL}")
    endif ()
-    message (VERBOSE "Examples file is ${EXAMPLES_URL}")
-    file (DOWNLOAD ${EXAMPLES_URL} ${HDF5_BINARY_DIR}/${HDF5_EXAMPLES_COMPRESSED})
    if (EXISTS "${HDF5_BINARY_DIR}/${HDF5_EXAMPLES_COMPRESSED}")
      execute_process(
          COMMAND ${CMAKE_COMMAND} -E tar xzf ${HDF5_EXAMPLES_COMPRESSED}
@ -168,7 +175,6 @@ if (HDF5_PACK_EXAMPLES)
          COMMAND_ECHO STDOUT
      )
    endif ()
-    set (EXAMPLES_USE_RELEASE_NAME ON CACHE BOOL "" FORCE)
  else ()
    if (EXISTS "${HDF5_EXAMPLES_COMPRESSED_DIR}/${HDF5_EXAMPLES_COMPRESSED}")
      execute_process(
@ -178,20 +184,18 @@ if (HDF5_PACK_EXAMPLES)
      )
    endif ()
  endif ()
-  if (EXAMPLES_USE_RELEASE_NAME)
-    get_filename_component (EX_LAST_EXT ${HDF5_EXAMPLES_COMPRESSED} LAST_EXT)
-    if (${EX_LAST_EXT} STREQUAL ".zip")
-      get_filename_component (EX_DIR_NAME ${HDF5_EXAMPLES_COMPRESSED} NAME_WLE)
-    else ()
-      get_filename_component (EX_DIR_NAME ${HDF5_EXAMPLES_COMPRESSED} NAME_WLE)
-      get_filename_component (EX_DIR_NAME ${EX_DIR_NAME} NAME_WLE)
-    endif ()
-    execute_process(
-        COMMAND ${CMAKE_COMMAND} -E rename ${EX_DIR_NAME} HDF5Examples
-        WORKING_DIRECTORY ${HDF5_BINARY_DIR}
-        COMMAND_ECHO STDOUT
-    )
+  get_filename_component (EX_LAST_EXT ${HDF5_EXAMPLES_COMPRESSED} LAST_EXT)
+  if (${EX_LAST_EXT} STREQUAL ".zip")
+    get_filename_component (EX_DIR_NAME ${HDF5_EXAMPLES_COMPRESSED} NAME_WLE)
+  else ()
+    get_filename_component (EX_DIR_NAME ${HDF5_EXAMPLES_COMPRESSED} NAME_WLE)
+    get_filename_component (EX_DIR_NAME ${EX_DIR_NAME} NAME_WLE)
  endif ()
+  execute_process(
+      COMMAND ${CMAKE_COMMAND} -E rename ${EX_DIR_NAME} HDF5Examples
+      WORKING_DIRECTORY ${HDF5_BINARY_DIR}
+      COMMAND_ECHO STDOUT
+  )
  install (
    DIRECTORY ${HDF5_BINARY_DIR}/HDF5Examples
    DESTINATION ${HDF5_INSTALL_DATA_DIR}
--- a/CMakePresets.json
+++ b/CMakePresets.json
@ -34,7 +34,8 @@
      "cacheVariables": {
        "HDF5_PACKAGE_EXTLIBS": "ON",
        "ZLIB_USE_LOCALCONTENT": "OFF",
-        "LIBAEC_USE_LOCALCONTENT": "OFF"
+        "LIBAEC_USE_LOCALCONTENT": "OFF",
+        "HDF5_ENABLE_SZIP_SUPPORT": "ON"
      }
    },
    {
@ -86,10 +87,10 @@
      "name": "ci-ExamplesVars",
      "hidden": true,
      "cacheVariables": {
-        "HDF5_EXAMPLES_COMPRESSED": {"type": "STRING", "value": "hdf5-examples-2.0.3.tar.gz"},
+        "HDF5_EXAMPLES_COMPRESSED": {"type": "STRING", "value": "hdf5-examples-2.0.4.tar.gz"},
        "HDF5_EXAMPLES_COMPRESSED_DIR": {"type": "STRING", "value": "${sourceParentDir}/temp"},
        "EXAMPLES_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/HDFGroup/hdf5-examples/archive/refs/tags/"},
-        "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "2.0.3.tar.gz"}
+        "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "2.0.4.tar.gz"}
      }
    },
    {
@ -97,6 +98,7 @@
      "hidden": true,
      "inherits": ["ci-base", "ci-ExamplesVars", "ci-base-tgz"],
      "cacheVariables": {
+        "EXAMPLES_USE_RELEASE_NAME": "ON",
        "EXAMPLES_USE_LOCALCONTENT": "OFF",
        "HDF5_PACK_EXAMPLES": "ON",
        "EXAMPLES_DOWNLOAD": "ON"
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@ -32,6 +32,10 @@ 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)
--- 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")
-### disable using ext szip
+### 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=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")

 ####      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}")
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@ -373,7 +373,7 @@ IV. Further considerations
      the settings for the developers' environment. Then the only options needed
      on the command line are those options that are different. Example using HDF
      default cache file:
-           cmake -C ../config/cmake/cacheinit.cmake -G "Visual Studio 12 2013" \
+           cmake -C ../config/cmake/cacheinit.cmake -G "Visual Studio 16 2019" \
               -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF \
               -DCMAKE_BUILD_TYPE:STRING=Release ..