Merge remote-tracking branch 'origin/ts_h5fl_reg' into update_h5fl

qkoziol · Jan 7, 2025 · bca5241 · bca5241
2 parents 19ce6ca + 6b3c69a
commit bca5241
Show file tree

Hide file tree

Showing 49 changed files with 122 additions and 54 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -204,7 +204,7 @@ java/src/hdf/hdf5lib/H5.java -text
 java/src/hdf/hdf5lib/HDF5Constants.java -text
 java/src/hdf/hdf5lib/HDFArray.java -text
 java/src/hdf/hdf5lib/HDFNativeData.java -text
-java/src/hdf/hdf5lib/callbacks/Callbacks.java -text
+java/src/hdf/hdf5lib/callbacks/H5Callbacks.java -text
 java/src/hdf/hdf5lib/callbacks/H5A_iterate_cb.java -text
 java/src/hdf/hdf5lib/callbacks/H5A_iterate_t.java -text
 java/src/hdf/hdf5lib/callbacks/H5D_append_cb.java -text

diff --git a/.github/workflows/cygwin-cmake.yml b/.github/workflows/cygwin-cmake.yml
@@ -104,6 +104,8 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DPLUGIN_USE_LOCALCONTENT:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DENABLE_ZFP:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DENABLE_ZSTD:BOOL=OFF")
 
       - name: Run ctest (Cygwin)
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'

diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
@@ -1457,6 +1457,8 @@ test_dset(const void *params)
     fapl_id     = h5_fileaccess(); // in h5test.c, returns a file access template
     int nerrors = 0;               // keep track of number of failures occur
 
+    (void)params;
+
     try {
         // Use the file access template id to create a file access prop.
         // list object to pass in H5File::H5File
@@ -1505,6 +1507,8 @@ test_dset(const void *params)
 extern "C" void
 cleanup_dsets(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILE1.c_str());
         HDremove(FILE_ACCPLIST.c_str());

diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
@@ -479,6 +479,8 @@ test_array_info()
 extern "C" void
 test_array(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Array Datatypes\n"));
 
@@ -504,6 +506,8 @@ test_array(const void *params)
 extern "C" void
 cleanup_array(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILENAME.c_str());
     }

diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
@@ -1958,6 +1958,8 @@ test_attr_corder_create_basic(FileCreatPropList &fcpl, FileAccPropList &fapl)
 extern "C" void
 test_attr(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Attributes\n"));
 
@@ -2043,6 +2045,8 @@ test_attr(const void *params)
 extern "C" void
 cleanup_attr(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILE_BASIC.c_str());
         HDremove(FILE_COMPOUND.c_str());

diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
@@ -731,6 +731,8 @@ test_compound_set_size()
 extern "C" void
 test_compound(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Compound Data Type operations\n"));
 
@@ -755,6 +757,8 @@ test_compound(const void *params)
 extern "C" void
 cleanup_compound(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(COMPFILE.c_str());
     }

diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
@@ -116,6 +116,8 @@ test_transfplist()
 extern "C" void
 test_dsproplist(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Generic Dataset Property Lists\n"));
 
@@ -134,6 +136,8 @@ test_dsproplist(const void *params)
 extern "C" void
 cleanup_dsproplist(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILENAME.c_str());
     }

diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
@@ -970,6 +970,8 @@ test_file_info()
 extern "C" void
 test_file(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing File I/O Operations\n"));
 
@@ -992,12 +994,11 @@ test_file(const void *params)
  * Return       none
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
-extern "C"
-#endif
-    void
-    cleanup_file(void *params)
+extern "C" void
+cleanup_file(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILE1.c_str());
         HDremove(FILE2.c_str());

diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
@@ -229,6 +229,8 @@ const H5std_string FILE1("tfilters.h5");
 extern "C" void
 test_filters(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Various Filters\n"));
 
@@ -261,6 +263,8 @@ test_filters(const void *params)
 extern "C" void
 cleanup_filters(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILE1.c_str());
     }

diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
@@ -473,6 +473,8 @@ test_h5s_compound_scalar_read()
 extern "C" void
 test_h5s(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Dataspaces\n"));
 
@@ -495,6 +497,8 @@ test_h5s(const void *params)
 extern "C" void
 cleanup_h5s(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(DATAFILE.c_str());
     }

diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
@@ -442,6 +442,8 @@ test_HDFFV_9920()
 extern "C" void
 test_iterate(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Iterate Feature\n"));
 
@@ -466,6 +468,8 @@ test_iterate(const void *params)
 extern "C" void
 cleanup_iterate(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILE_ITERATE.c_str());
         HDremove(FILE_NAME.c_str());

diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
@@ -714,6 +714,8 @@ test_links(const void *params)
     hid_t    fapl_id, fapl2_id; /* File access property lists */
     unsigned new_format;        /* Whether to use the new format or not */
 
+    (void)params;
+
     if ((fapl_id = h5_fileaccess()) < 0)
         throw Exception("test_links", "Unable to get file access property list");
 
@@ -771,6 +773,8 @@ test_links(const void *params)
 extern "C" void
 cleanup_links(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILENAME[0]);
         HDremove(FILENAME[1]);

diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
@@ -512,8 +512,6 @@ test_open_object_header()
  *              file will return the same file "number".
  *
  * Return       None
- *
- * July, 2018
  *-------------------------------------------------------------------------
  */
 const H5std_string FILE_OBJINFO("tobject_getinfo.h5");
@@ -599,8 +597,6 @@ test_getobjectinfo_same_file()
  *              the property setting.
  *
  * Return       None
- *
- * April, 2019
  *-------------------------------------------------------------------------
  */
 const H5std_string FILE_INTERGRPS("tobject_intergrps.h5");
@@ -713,13 +709,13 @@ test_intermediate_groups()
  *
  * Return       Success: 0
  *              Failure: -1
- *
- * March 4, 2014
  *-------------------------------------------------------------------------
  */
 extern "C" void
 test_object(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Object Functions\n"));
 
@@ -744,6 +740,8 @@ test_object(const void *params)
 extern "C" void
 cleanup_object(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILE_OBJECTS.c_str());
         HDremove(FILE_OBJHDR.c_str());

diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
@@ -829,6 +829,8 @@ test_reference_region_1D()
 extern "C" void
 test_reference(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing References\n"));
 
@@ -850,6 +852,8 @@ test_reference(const void *params)
 extern "C" void
 cleanup_reference(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILE1.c_str());
         HDremove(FILE2.c_str());

diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
@@ -1095,6 +1095,8 @@ test_operators()
 extern "C" void
 test_types(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Generic Data Types\n"));
 
@@ -1122,6 +1124,8 @@ test_types(const void *params)
 extern "C" void
 cleanup_types(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         for (int i = 0; i < 6; i++)
             HDremove(FILENAME[i]);

diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
@@ -936,6 +936,8 @@ test_vl_rewrite()
 extern "C" void
 test_vlstrings(const void *params)
 {
+    (void)params;
+
     // Output message about test being performed
     MESSAGE(5, ("Testing Variable-Length Strings"));
 
@@ -969,6 +971,8 @@ test_vlstrings(const void *params)
 extern "C" void
 cleanup_vlstrings(void *params)
 {
+    (void)params;
+
     if (GetTestCleanup()) {
         HDremove(FILENAME.c_str());
         HDremove(FILENAME2.c_str());

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
@@ -180,7 +180,7 @@ if (NOT DEFINED HPC)
     if (DEFINED NINJA)
       set (CTEST_CMAKE_GENERATOR "Ninja")
     else ()
-      if (MINGW)
+      if (BUILD_GENERATOR STREQUAL "MINGW")
         set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
       else ()
         set (CTEST_CMAKE_GENERATOR "Unix Makefiles")

diff --git a/doc/parallel-compression.md b/doc/parallel-compression.md
@@ -341,7 +341,7 @@ hid_t file_id = H5Fcreate("file.h5", H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
 [u6]: https://hdfgroup.github.io/hdf5/develop/group___d_c_p_l.html#ga4335bb45b35386daa837b4ff1b9cd4a4
 [u7]: https://hdfgroup.github.io/hdf5/develop/group___d_c_p_l.html#ga6bd822266b31f86551a9a1d79601b6a2
 [u8]: https://www.hdfgroup.org/2022/03/04/parallel-compression-improvements-in-hdf5-1-13-1/
-[u9]: https://support.hdfgroup.org/releases/hdf5/documentation/advanced_topics/chunking_in_hdf5.md
+[u9]: https://hdfgroup.github.io/hdf5/develop/chunking__in__hdf5_8dox.html
 [u10]: https://support.hdfgroup.org/releases/hdf5/documentation/hdf5_topics/HDF5ImprovingIOPerformanceCompressedDatasets.pdf
 [u11]: https://hdfgroup.github.io/hdf5/develop/group___f_a_p_l.html#gab99d5af749aeb3896fd9e3ceb273677a
 [u12]: https://hdfgroup.github.io/hdf5/develop/group___f_c_p_l.html#ga167ff65f392ca3b7f1933b1cee1b9f70

diff --git a/java/src/Makefile.am b/java/src/Makefile.am
@@ -41,7 +41,7 @@ CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$$CLASSPATH
 AM_JAVACFLAGS = $(H5_JAVACFLAGS) -deprecation
 
 hdf5_java_JAVA =  \
-	${pkgpath}/callbacks/Callbacks.java \
+	${pkgpath}/callbacks/H5Callbacks.java \
 	${pkgpath}/callbacks/H5A_iterate_cb.java \
 	${pkgpath}/callbacks/H5A_iterate_t.java \
 	${pkgpath}/callbacks/H5D_append_cb.java \

diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt
@@ -10,7 +10,7 @@ SET_GLOBAL_VARIABLE (HDF5_JAVA_SOURCE_PACKAGES
 )
 
 set (HDF5_JAVA_HDF_HDF5_CALLBACKS_SOURCES
-    callbacks/Callbacks.java
+    callbacks/H5Callbacks.java
     callbacks/H5A_iterate_cb.java
     callbacks/H5A_iterate_t.java
     callbacks/H5D_append_cb.java