diff options
37 files changed, 132 insertions, 43 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cd5e221..8abe0fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -247,6 +247,28 @@ jobs: cmake: "Debug" autotools: "debug" + - name: "Ubuntu gcc Autotools v1.14 default API (build only)" + os: ubuntu-latest + cpp: enable + fortran: enable + java: enable + parallel: disable + mirror_vfd: enable + direct_vfd: enable + deprec_sym: enable + default_api: v114 + toolchain: "" + generator: "autogen" + flags: "" + run_tests: false + thread_safety: + - enabled: false + text: "" + build_mode: + - text: "DBG" + cmake: "Debug" + autotools: "debug" + - name: "Ubuntu gcc Autotools no deprecated symbols (build only)" os: ubuntu-latest cpp: enable @@ -256,7 +278,7 @@ jobs: mirror_vfd: enable direct_vfd: enable deprec_sym: disable - default_api: v114 + default_api: v116 toolchain: "" generator: "autogen" flags: "" diff --git a/CMakeLists.txt b/CMakeLists.txt index 31cae2e..1c85965 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -813,6 +813,17 @@ if (DEFAULT_API_VERSION MATCHES "v114") endif () #----------------------------------------------------------------------------- +# Option to use 1.16.x API +#----------------------------------------------------------------------------- +if (NOT DEFAULT_API_VERSION) + set (DEFAULT_API_VERSION "v116") +endif () +set (H5_USE_116_API_DEFAULT 0) +if (DEFAULT_API_VERSION MATCHES "v116") + set (H5_USE_116_API_DEFAULT 1) +endif () + +#----------------------------------------------------------------------------- # Include user macros #----------------------------------------------------------------------------- include (UserMacros.cmake) @@ -1,4 +1,4 @@ -HDF5 version 1.13.4-1 currently under development +HDF5 version 1.15.0 currently under development  diff --git a/bin/make_vers b/bin/make_vers index 956fbfd..1e21bf7 100755 --- a/bin/make_vers +++ b/bin/make_vers @@ -8,8 +8,8 @@ use warnings; # is added (like support for 1.4, etc), the min_sup_idx parameter will # need to be decremented.) -# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, 7 = 1.14, etc) -$max_idx = 7; +# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, 7 = 1.14, 8 = 1.16, etc) +$max_idx = 8; # Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc) $min_sup_idx = 3; diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 42bac70..a3595bf 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -38,7 +38,7 @@ PROJECT_NAME = # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.13.4-1, currently under development" +PROJECT_NUMBER = "1.15.0" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index c1b051f..da23cb3 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -632,6 +632,9 @@ /* Define using v1.14 public API symbols by default */ #cmakedefine H5_USE_114_API_DEFAULT @H5_USE_114_API_DEFAULT@ +/* Define using v1.16 public API symbols by default */ +#cmakedefine H5_USE_116_API_DEFAULT @H5_USE_116_API_DEFAULT@ + /* Define if the library will use file locking */ #cmakedefine H5_USE_FILE_LOCKING @H5_USE_FILE_LOCKING@ diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 71223cb..2fbb26c 100644 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -37,8 +37,8 @@ cmake_minimum_required (VERSION 3.18) # CTEST_SOURCE_NAME - source folder ############################################################################## -set (CTEST_SOURCE_VERSION "1.13.4") -set (CTEST_SOURCE_VERSEXT "-1") +set (CTEST_SOURCE_VERSION "1.15.0") +set (CTEST_SOURCE_VERSEXT "") ############################################################################## # handle input parameters to script. diff --git a/configure.ac b/configure.ac index 5f62140..3d82c20 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.13.4-1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.15.0], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) @@ -3789,6 +3789,11 @@ elif test "X$withval" = "Xv114"; then DEFAULT_API_VERSION=v114 AC_DEFINE([USE_114_API_DEFAULT], [1], [Define using v1.14 public API symbols by default]) +elif test "X$withval" = "Xv116"; then + AC_MSG_RESULT([v116]) + DEFAULT_API_VERSION=v116 + AC_DEFINE([USE_116_API_DEFAULT], [1], + [Define using v1.16 public API symbols by default]) else AC_MSG_ERROR([invalid version of public symbols given]) fi @@ -3798,7 +3803,7 @@ fi ## if the user insists on doing this via the --enable-unsupported configure ## flag, we'll let them. if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then - if test "X${DEFAULT_API_VERSION}" != "Xv114" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then + if test "X${DEFAULT_API_VERSION}" != "Xv116" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then AC_MSG_ERROR([Removing old public API symbols not allowed when using them as default public API symbols. Use --enable-unsupported to override this error.]) fi fi diff --git a/doxygen/dox/Overview.dox b/doxygen/dox/Overview.dox index 040769c..3d171f7 100644 --- a/doxygen/dox/Overview.dox +++ b/doxygen/dox/Overview.dox @@ -24,6 +24,7 @@ documents cover a mix of tasks, concepts, and reference, to help a specific Version-specific documentation (see the version in the title area) can be found here: - HDF5 <code>develop</code> branch (this site) + - <a href="https://docs.hdfgroup.org/hdf5/v1_14/index.html">HDF5 1.14.x</a> - <a href="https://docs.hdfgroup.org/hdf5/v1_12/index.html">HDF5 1.12.x</a> - <a href="https://docs.hdfgroup.org/hdf5/v1_10/index.html">HDF5 1.10.x</a> - <a href="https://docs.hdfgroup.org/hdf5/v1_8/index.html">HDF5 1.8.x</a> diff --git a/examples/testh5cc.sh.in b/examples/testh5cc.sh.in index a958b66..ff8f83f 100644 --- a/examples/testh5cc.sh.in +++ b/examples/testh5cc.sh.in @@ -51,6 +51,7 @@ H5_USE_18_API_DEFAULT=`grep '#define H5_USE_18_API_DEFAULT ' ../src/H5pubconf.h` H5_USE_110_API_DEFAULT=`grep '#define H5_USE_110_API_DEFAULT ' ../src/H5pubconf.h` H5_USE_112_API_DEFAULT=`grep '#define H5_USE_112_API_DEFAULT ' ../src/H5pubconf.h` H5_USE_114_API_DEFAULT=`grep '#define H5_USE_114_API_DEFAULT ' ../src/H5pubconf.h` +H5_USE_116_API_DEFAULT=`grep '#define H5_USE_116_API_DEFAULT ' ../src/H5pubconf.h` # setup my machine information. myos=`uname -s` @@ -415,6 +416,8 @@ elif [ -n "$H5_USE_112_API_DEFAULT" ]; then echo "H5_USE_112_API_DEFAULT is defined." elif [ -n "$H5_USE_114_API_DEFAULT" ]; then echo "H5_USE_114_API_DEFAULT is defined." +elif [ -n "$H5_USE_116_API_DEFAULT" ]; then + echo "H5_USE_116_API_DEFAULT is defined." else echo "No H5 API_DEFAULT is defined." fi @@ -447,15 +450,24 @@ elif [ -n "$H5_USE_112_API_DEFAULT" ]; then TOOLTEST -DH5_USE_18_API_DEFAULT $v18main TOOLTEST -DH5_USE_110_API_DEFAULT $v110main TOOLTEST $v112main -else +elif [ -n "$H5_USE_114_API_DEFAULT" ]; then echo "Testing HDF5 with 114_API_DEFAULT" TOOLTEST -DH5_USE_16_API_DEFAULT $v16main TOOLTEST -DH5_USE_18_API_DEFAULT $v18main TOOLTEST -DH5_USE_110_API_DEFAULT $v110main TOOLTEST -DH5_USE_112_API_DEFAULT $v112main + TOOLTEST $v114main +else + echo "Testing HDF5 with 116_API_DEFAULT" + TOOLTEST -DH5_USE_16_API_DEFAULT $v16main + TOOLTEST -DH5_USE_18_API_DEFAULT $v18main + TOOLTEST -DH5_USE_110_API_DEFAULT $v110main + TOOLTEST -DH5_USE_112_API_DEFAULT $v112main + TOOLTEST -DH5_USE_114_API_DEFAULT $v114main TOOLTEST $v18main TOOLTEST $v110main TOOLTEST $v112main + TOOLTEST $v114main fi ############################################################################## diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index e7b04dc..7a3ad89 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -228,7 +228,7 @@ import hdf.hdf5lib.structs.H5O_token_t; * which prints out the HDF5 error stack, as described in the HDF5 C API <i><b>@ref H5Eprint()</b>.</i> This * may be used by Java exception handlers to print out the HDF5 error stack. <hr> * - * @version HDF5 1.13.4 <BR> + * @version HDF5 1.15.0 <BR> * <b>See also: </b> * @ref HDFARRAY hdf.hdf5lib.HDFArray<br /> * @ref HDF5CONST hdf.hdf5lib.HDF5Constants<br /> @@ -270,7 +270,7 @@ public class H5 implements java.io.Serializable { * </ul> * Make sure to update the versions number when a different library is used. */ - public final static int LIB_VERSION[] = {1, 13, 3}; + public final static int LIB_VERSION[] = {1, 15, 0}; /** * @ingroup JH5 diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java index 57f88eb..25b65fa 100644 --- a/java/src/hdf/hdf5lib/HDF5Constants.java +++ b/java/src/hdf/hdf5lib/HDF5Constants.java @@ -573,6 +573,8 @@ public class HDF5Constants { /** */ public static final int H5F_LIBVER_V114 = H5F_LIBVER_V114(); /** */ + public static final int H5F_LIBVER_V116 = H5F_LIBVER_V116(); + /** */ public static final int H5F_LIBVER_NBOUNDS = H5F_LIBVER_NBOUNDS(); /** */ public static final int H5F_LIBVER_LATEST = H5F_LIBVER_LATEST(); @@ -2050,6 +2052,8 @@ public class HDF5Constants { private static native final int H5F_LIBVER_V114(); + private static native final int H5F_LIBVER_V116(); + private static native final int H5F_LIBVER_NBOUNDS(); private static native final int H5F_LIBVER_LATEST(); diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c index 18a74b3..c69ba09 100644 --- a/java/src/jni/h5Constants.c +++ b/java/src/jni/h5Constants.c @@ -1310,6 +1310,11 @@ Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V114(JNIEnv *env, jclass cls) return H5F_LIBVER_V114; } JNIEXPORT jint JNICALL +Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V116(JNIEnv *env, jclass cls) +{ + return H5F_LIBVER_V116; +} +JNIEXPORT jint JNICALL Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1NBOUNDS(JNIEnv *env, jclass cls) { return H5F_LIBVER_NBOUNDS; diff --git a/java/test/TestH5.java b/java/test/TestH5.java index bb92582..9457ffd 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -313,7 +313,7 @@ public class TestH5 { @Test public void testH5get_libversion() { - int libversion[] = {1, 13, 3}; + int libversion[] = {1, 15, 0}; try { H5.H5get_libversion(libversion); @@ -354,7 +354,7 @@ public class TestH5 { @Test public void testH5check_version() { - int majnum = 1, minnum = 13, relnum = 4; + int majnum = 1, minnum = 15, relnum = 0; try { H5.H5check_version(majnum, minnum, relnum); diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 5dea822..fe06301 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.13.4-1 currently under development +HDF5 version 1.15.0 currently under development ================================================================================ @@ -70,8 +70,8 @@ static int H5__mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *fla /*****************************/ /* Library incompatible release versions, develop releases are incompatible by design */ -const unsigned VERS_RELEASE_EXCEPTIONS[] = {0, 1, 2, 3, 4}; -const unsigned VERS_RELEASE_EXCEPTIONS_SIZE = 5; +const unsigned VERS_RELEASE_EXCEPTIONS[] = {0}; +const unsigned VERS_RELEASE_EXCEPTIONS_SIZE = 1; /* statically initialize block for pthread_once call used in initializing */ /* the first global mutex */ diff --git a/src/H5Aint.c b/src/H5Aint.c index 8662b5f..0b504be 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -104,6 +104,7 @@ const unsigned H5O_attr_ver_bounds[] = { H5O_ATTR_VERSION_3, /* H5F_LIBVER_V18 */ H5O_ATTR_VERSION_3, /* H5F_LIBVER_V110 */ H5O_ATTR_VERSION_3, /* H5F_LIBVER_V112 */ + H5O_ATTR_VERSION_3, /* H5F_LIBVER_V114 */ H5O_ATTR_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index 8a10a37..26bdc55 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -42,11 +42,13 @@ /* Format version bounds for layout */ const unsigned H5O_layout_ver_bounds[] = { - H5O_LAYOUT_VERSION_1, /* H5F_LIBVER_EARLIEST */ - H5O_LAYOUT_VERSION_3, /* H5F_LIBVER_V18 */ /* H5O_LAYOUT_VERSION_DEFAULT */ - H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V110 */ - H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V112 */ - H5O_LAYOUT_VERSION_LATEST /* H5F_LIBVER_LATEST */ + H5O_LAYOUT_VERSION_1, /* H5F_LIBVER_EARLIEST */ + H5O_LAYOUT_VERSION_3, + /* H5F_LIBVER_V18 */ /* H5O_LAYOUT_VERSION_DEFAULT */ + H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V110 */ + H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V112 */ + H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V114 */ + H5O_LAYOUT_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; /*****************************/ diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 7d2a5da..9bee5c4 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -189,10 +189,11 @@ typedef enum H5F_libver_t { H5F_LIBVER_V110 = 2, /**< Use the latest v110 format for storing objects */ H5F_LIBVER_V112 = 3, /**< Use the latest v112 format for storing objects */ H5F_LIBVER_V114 = 4, /**< Use the latest v114 format for storing objects */ + H5F_LIBVER_V116 = 5, /**< Use the latest v116 format for storing objects */ H5F_LIBVER_NBOUNDS /**< Sentinel */ } H5F_libver_t; -#define H5F_LIBVER_LATEST H5F_LIBVER_V114 +#define H5F_LIBVER_LATEST H5F_LIBVER_V116 /** * File space handling strategy diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index cf18fb0..d590119 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -70,6 +70,7 @@ static const unsigned HDF5_superblock_ver_bounds[] = { HDF5_SUPERBLOCK_VERSION_2, /* H5F_LIBVER_V18 */ HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V110 */ HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V112 */ + HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V114 */ HDF5_SUPERBLOCK_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Ofill.c b/src/H5Ofill.c index 094edaca..45877d2 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -155,6 +155,7 @@ const unsigned H5O_fill_ver_bounds[] = { H5O_FILL_VERSION_3, /* H5F_LIBVER_V18 */ H5O_FILL_VERSION_3, /* H5F_LIBVER_V110 */ H5O_FILL_VERSION_3, /* H5F_LIBVER_V112 */ + H5O_FILL_VERSION_3, /* H5F_LIBVER_V114 */ H5O_FILL_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c index 4d5934d..b376606 100644 --- a/src/H5Ofsinfo.c +++ b/src/H5Ofsinfo.c @@ -69,6 +69,7 @@ static const unsigned H5O_fsinfo_ver_bounds[] = { H5O_INVALID_VERSION, /* H5F_LIBVER_V18 */ H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V110 */ H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V112 */ + H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V114 */ H5O_FSINFO_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; #define N_FSINFO_VERSION_BOUNDS H5F_LIBVER_NBOUNDS diff --git a/src/H5Oint.c b/src/H5Oint.c index 0499cd9..cdcf6c8 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -125,6 +125,7 @@ const unsigned H5O_obj_ver_bounds[] = { H5O_VERSION_2, /* H5F_LIBVER_V18 */ H5O_VERSION_2, /* H5F_LIBVER_V110 */ H5O_VERSION_2, /* H5F_LIBVER_V112 */ + H5O_VERSION_2, /* H5F_LIBVER_V114 */ H5O_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Opline.c b/src/H5Opline.c index 58c729f..4ccd96c 100644 --- a/src/H5Opline.c +++ b/src/H5Opline.c @@ -91,6 +91,7 @@ const unsigned H5O_pline_ver_bounds[] = { H5O_PLINE_VERSION_2, /* H5F_LIBVER_V18 */ H5O_PLINE_VERSION_2, /* H5F_LIBVER_V110 */ H5O_PLINE_VERSION_2, /* H5F_LIBVER_V112 */ + H5O_PLINE_VERSION_2, /* H5F_LIBVER_V114 */ H5O_PLINE_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; @@ -60,6 +60,7 @@ const unsigned H5O_sdspace_ver_bounds[] = { H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V18 */ H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V110 */ H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V112 */ + H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V114 */ H5O_SDSPACE_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 84cef80..2399937 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -243,6 +243,7 @@ const unsigned H5O_sds_hyper_ver_bounds[] = { H5S_HYPER_VERSION_1, /* H5F_LIBVER_V18 */ H5S_HYPER_VERSION_2, /* H5F_LIBVER_V110 */ H5S_HYPER_VERSION_3, /* H5F_LIBVER_V112 */ + H5S_HYPER_VERSION_3, /* H5F_LIBVER_V114 */ H5S_HYPER_VERSION_3 /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 8844181..b10b7da 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -128,6 +128,7 @@ const unsigned H5O_sds_point_ver_bounds[] = { H5S_POINT_VERSION_1, /* H5F_LIBVER_V18 */ H5S_POINT_VERSION_1, /* H5F_LIBVER_V110 */ H5S_POINT_VERSION_2, /* H5F_LIBVER_V112 */ + H5S_POINT_VERSION_2, /* H5F_LIBVER_V114 */ H5S_POINT_VERSION_2 /* H5F_LIBVER_LATEST */ }; @@ -551,6 +551,7 @@ const unsigned H5O_dtype_ver_bounds[] = { H5O_DTYPE_VERSION_3, /* H5F_LIBVER_V18 */ H5O_DTYPE_VERSION_3, /* H5F_LIBVER_V110 */ H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V112 */ + H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V114 */ H5O_DTYPE_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5public.h b/src/H5public.h index 345191c..5ed54d9 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -79,19 +79,19 @@ /** * For minor interface/format changes */ -#define H5_VERS_MINOR 13 +#define H5_VERS_MINOR 15 /** * For tweaks, bug-fixes, or development */ -#define H5_VERS_RELEASE 4 +#define H5_VERS_RELEASE 0 /** * For pre-releases like \c snap0. Empty string for official releases. */ -#define H5_VERS_SUBRELEASE "1" +#define H5_VERS_SUBRELEASE "" /** * Full version string */ -#define H5_VERS_INFO "HDF5 library version: 1.13.4-1" +#define H5_VERS_INFO "HDF5 library version: 1.15.0" #define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE) diff --git a/src/H5trace.c b/src/H5trace.c index 03eaf11..3be5b91 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -1441,7 +1441,11 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap) break; case H5F_LIBVER_V114: - HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V114); + H5RS_acat(rs, "H5F_LIBVER_V114"); + break; + + case H5F_LIBVER_V116: + HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V116); H5RS_acat(rs, "H5F_LIBVER_LATEST"); break; diff --git a/test/chunk_info.c b/test/chunk_info.c index 5651b26..6f3359e 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -47,8 +47,13 @@ #endif /* Test file names, using H5F_libver_t as indices */ -const char *FILENAME[] = {"tchunk_info_earliest", "tchunk_info_v18", "tchunk_info_v110", - "tchunk_info_v112", "tchunk_info_v114", NULL}; +const char *FILENAME[] = {"tchunk_info_earliest", + "tchunk_info_v18", + "tchunk_info_v110", + "tchunk_info_v112", + "tchunk_info_v114", + "tchunk_info_v116", + NULL}; /* File to be used in test_failed_attempts */ #define FILTERMASK_FILE "tflt_msk" diff --git a/test/dtypes.c b/test/dtypes.c index cffc08f..2d0dc88 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -8695,9 +8695,9 @@ test_versionbounds(void) H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ int low, high; /* Indices for iterating over versions */ - H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, - H5F_LIBVER_V114}; - int versions_count = 5; /* Number of version bounds in the array */ + H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, + H5F_LIBVER_V112, H5F_LIBVER_V114, H5F_LIBVER_V114}; + int versions_count = 6; /* Number of version bounds in the array */ unsigned highest_version; /* Highest version in nested datatypes */ color_t enum_val; /* Enum type index */ herr_t ret = 0; /* Generic return value */ diff --git a/test/h5test.c b/test/h5test.c index b4bf102..0138c69 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -109,7 +109,8 @@ const char *LIBVER_NAMES[] = {"earliest", /* H5F_LIBVER_EARLIEST = 0 */ "v18", /* H5F_LIBVER_V18 = 1 */ "v110", /* H5F_LIBVER_V110 = 2 */ "v112", /* H5F_LIBVER_V112 = 3 */ - "latest", /* H5F_LIBVER_V114 = 4 */ + "v114", /* H5F_LIBVER_V114 = 4 */ + "latest", /* H5F_LIBVER_V116 = 5 */ NULL}; /* Previous error reporting function */ diff --git a/test/tfile.c b/test/tfile.c index 16e55c6..dd72da6 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -5915,6 +5915,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n case H5F_LIBVER_V110: case H5F_LIBVER_V112: case H5F_LIBVER_V114: + case H5F_LIBVER_V116: ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_3); VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds"); break; diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index 5ecb423..9578f7a 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -224,8 +224,9 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, " 2: This is H5F_LIBVER_V110 in H5F_libver_t struct\n"); PRINTVALSTREAM(rawoutstream, " 3: This is H5F_LIBVER_V112 in H5F_libver_t struct\n"); PRINTVALSTREAM(rawoutstream, " 4: This is H5F_LIBVER_V114 in H5F_libver_t struct\n"); + PRINTVALSTREAM(rawoutstream, " 5: This is H5F_LIBVER_V116 in H5F_libver_t struct\n"); PRINTVALSTREAM(rawoutstream, - " (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V114 for this release\n"); + " (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V116 for this release\n"); PRINTVALSTREAM(rawoutstream, "\n"); PRINTVALSTREAM(rawoutstream, " FS_STRATEGY is a string indicating the file space strategy used:\n"); PRINTVALSTREAM(rawoutstream, " FSM_AGGR:\n"); diff --git a/tools/test/h5repack/testfiles/h5repack-help.txt b/tools/test/h5repack/testfiles/h5repack-help.txt index bff70af..b291a68 100644 --- a/tools/test/h5repack/testfiles/h5repack-help.txt +++ b/tools/test/h5repack/testfiles/h5repack-help.txt @@ -91,7 +91,8 @@ usage: h5repack [OPTIONS] file1 file2 2: This is H5F_LIBVER_V110 in H5F_libver_t struct 3: This is H5F_LIBVER_V112 in H5F_libver_t struct 4: This is H5F_LIBVER_V114 in H5F_libver_t struct - (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V114 for this release + 5: This is H5F_LIBVER_V116 in H5F_libver_t struct + (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V116 for this release FS_STRATEGY is a string indicating the file space strategy used: FSM_AGGR: diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl index 6afabbc..d7aa1c3 100644 --- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl +++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl @@ -11,7 +11,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 4 } + PARAMS { 9 1 15 0 } } } FILLVALUE { @@ -33,7 +33,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 4 } + PARAMS { 9 1 15 0 } } } FILLVALUE { @@ -55,7 +55,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 4 } + PARAMS { 9 1 15 0 } } } FILLVALUE { @@ -77,7 +77,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 4 } + PARAMS { 9 1 15 0 } } } FILLVALUE { @@ -99,7 +99,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 4 } + PARAMS { 9 1 15 0 } } } FILLVALUE { @@ -121,7 +121,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 4 } + PARAMS { 9 1 15 0 } } } FILLVALUE { @@ -143,7 +143,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 4 } + PARAMS { 9 1 15 0 } } } FILLVALUE { |