Adjust 1.14 files after merging

.github/workflows/autotools.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev autools CI
+name: hdf5 1.14 autools CI
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 on:

.github/workflows/cmake.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev cmake CI
+name: hdf5 1.14 cmake CI
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 on:

.github/workflows/cve.yml

@@ -1,10 +1,10 @@
-name: cve dev
+name: cve 1.14
 
 on:
   workflow_dispatch:
   push:
   pull_request:
-    branches: [ develop ]
+    branches: [ hdf5_1_14 ]
     paths-ignore:
       - '.github/CODEOWNERS'
       - '.github/FUNDING.yml'

.github/workflows/intel-auto.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev autotools icx CI
+name: hdf5 1.14 autotools icx CI
 
 on:
   workflow_call:

.github/workflows/intel-cmake.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev CMake icx CI
+name: hdf5 1.14 CMake icx CI
 
 # Controls when the action will run. Triggers the workflow on a call
 on:

.github/workflows/linux-nvhpc-auto.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
   pull_request:
-    branches: [ develop ]
+    branches: [ hdf5_1_14 ]
     paths-ignore:
       - '.github/CODEOWNERS'
       - '.github/FUNDING.yml'

.github/workflows/linux-nvhpc.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
   pull_request:
-    branches: [ develop ]
+    branches: [ hdf5_1_14 ]
     paths-ignore:
       - '.github/CODEOWNERS'
       - '.github/FUNDING.yml'

.github/workflows/main-auto-par.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev autotools CI
+name: hdf5 1.14 autotools CI
 
 # Controls when the action will run. Triggers the workflow on a call
 on:

.github/workflows/main-auto-spc.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev autotools special CI
+name: hdf5 1.14 autotools special CI
 
 # Controls when the action will run. Triggers the workflow on a call
 on:

.github/workflows/main-auto.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev autotools CI
+name: hdf5 1.14 autotools CI
 
 # Controls when the action will run. Triggers the workflow on a call
 on:

.github/workflows/main-cmake.yml

@@ -1,4 +1,4 @@
-name: hdf5 dev CMake CI
+name: hdf5 1.14 CMake CI
 
 # Controls when the action will run. Triggers the workflow on a call
 on:

.github/workflows/scorecard.yml

@@ -7,12 +7,8 @@ on:
   # For Branch-Protection check. Only the default branch is supported. See
   # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
   branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '36 22 * * 4'
   push:
-    branches: [ "develop" ]
+    branches: [ "hdf5_1_14" ]
 
 # Declare default permissions as read only.
 permissions: read-all

CMakeLists.txt

@@ -788,9 +788,9 @@ if (HDF5_ENABLE_SUBFILING_VFD)
   unset (CMAKE_REQUIRED_LIBRARIES)
 endif()
 
-#option (DEFAULT_API_VERSION "Enable v1.16 API (v16, v18, v110, v112, v114, v116)" "v116")
-set (DEFAULT_API_VERSION "v116" CACHE STRING "Enable v1.16 API (v16, v18, v110, v112, v114, v116)")
-set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112 v114 v116)
+#option (DEFAULT_API_VERSION "Enable v1.14 API (v16, v18, v110, v112, v114)" "v114")
+set (DEFAULT_API_VERSION "v114" CACHE STRING "Enable v1.14 API (v16, v18, v110, v112, v114)")
+set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112 v114)
 #-----------------------------------------------------------------------------
 # Option to use 1.6.x API
 #-----------------------------------------------------------------------------
@@ -826,22 +826,14 @@ endif ()
 #-----------------------------------------------------------------------------
 # Option to use 1.14.x API
 #-----------------------------------------------------------------------------
+if (NOT DEFAULT_API_VERSION)
+  set (DEFAULT_API_VERSION "v114")
+endif ()
 set (H5_USE_114_API_DEFAULT 0)
 if (DEFAULT_API_VERSION MATCHES "v114")
   set (H5_USE_114_API_DEFAULT 1)
 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
 #-----------------------------------------------------------------------------

README.md

@@ -5,8 +5,6 @@ HDF5 version 1.14.3-1 currently under development
 [![1.14 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=hdf5_1_14&label=1.14)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Ahdf5_1_14)
 [![BSD](https://img.shields.io/badge/License-BSD-blue.svg)](https://github.com/HDFGroup/hdf5/blob/develop/COPYING)
 
-[HPC configure/build/test results](https://my.cdash.org/index.php?project=HDF5)
-
 *Please refer to the release_docs/INSTALL file for installation instructions.*
 
 This repository contains a high-performance library's source code and a file format

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, 8 = 1.16, etc)
-$max_idx = 8;
+# 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;
 
 # Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc)
 $min_sup_idx = 3;

config/cmake/ConfigureChecks.cmake

@@ -909,7 +909,7 @@ endmacro ()
 #-----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------
-# Set the flag to indicate that the machine is using a special algorithm toconvert
+# Set the flag to indicate that the machine is using a special algorithm to convert
 # 'long double' to '(unsigned) long' values.  (This flag should only be set for
 # the IBM Power Linux.  When the bit sequence of long double is
 # 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long

config/cmake/H5pubconf.h.in

@@ -611,9 +611,6 @@
 /* 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@
 

configure.ac

@@ -3814,11 +3814,6 @@ elif test "X$withval" = "Xv114" -o "X$withval" = "Xdefault"; 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" -o "X$withval" = "Xdefault"; 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
@@ -3828,7 +3823,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}" != "Xv116" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
+  if test "X${DEFAULT_API_VERSION}" != "Xv114" -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

examples/testh5cc.sh.in

@@ -43,7 +43,6 @@ 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`
@@ -61,8 +60,6 @@ v110main=${H5TOOL}_v110main.$suffix
 v110main_o=${H5TOOL}_v110main.o
 v112main=${H5TOOL}_v112main.$suffix
 v112main_o=${H5TOOL}_v112main.o
-v114main=${H5TOOL}_v114main.$suffix
-v114main_o=${H5TOOL}_v114main.o
 appmain=${H5TOOL}_appmain.$suffix
 appmain_o=${H5TOOL}_appmain.o
 prog1=${H5TOOL}_prog1.$suffix
@@ -76,7 +73,7 @@ applib=libapp${H5TOOL}.a
 # Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated
 # by other test programs. This will cause a racing condition error when
 # parallel make (e.g., gmake -j 4) is used.
-temp_SRC="$hdf5main $v16main $v18main $v110main $v112main $v114main $appmain $prog1 $prog2"
+temp_SRC="$hdf5main $v16main $v18main $v110main $v112main $appmain $prog1 $prog2"
 temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"`
 temp_FILES="a.out $applib"
 
@@ -280,53 +277,6 @@ main (void)
 }
 EOF
 
-# Generate HDF5 v1.14 Main Program:
-# This makes unique V1.14 API calls.
-cat > $v114main <<EOF
-/* This is a V1.14 API calls example Program. */
-#include "hdf5.h"
-#define H5FILE_NAME        "tmp.h5"
-#define SPACE1_RANK    3
-int
-main (void)
-{
-    hid_t       sid;                  /* Dataspace ID */
-    hid_t       fapl = -1;            /* File access property list ID */
-    int         rank;                 /* Logical rank of dataspace    */
-    hsize_t     dims[] = {3, 3, 15};
-    size_t      sbuf_size=0;
-    herr_t      ret;                  /* Generic return value        */
-    hsize_t             start[] = {0, 0, 0};
-    hsize_t             stride[] = {2, 5, 3};
-    hsize_t             count[] = {2, 2, 2};
-    hsize_t             block[] = {1, 3, 1};
-
-    /* Create the file access property list */
-    fapl = H5Pcreate(H5P_FILE_ACCESS);
-
-    /* Set low/high bounds in the fapl */
-    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_EARLIEST,
-                               H5F_LIBVER_LATEST);
-
-    /* Create the dataspace */
-    sid = H5Screate_simple(SPACE1_RANK, dims, NULL);
-
-    /* Set the hyperslab selection */
-    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block);
-
-    /* Encode simple dataspace in a buffer with the fapl setting */
-    ret = H5Sencode(sid, NULL, &sbuf_size, fapl);
-
-    /* Encode simple dataspace in a buffer with the fapl setting */
-    ret = H5Sencode2(sid, NULL, &sbuf_size, fapl);
-
-    printf("HDF5 C program created with V1.14 API ran successfully. ");
-/*       "File %s generated.\n", H5FILE_NAME);
-      remove(H5FILE_NAME); */
-    return 0;
-}
-EOF
-
 
 # Parse option
 #   None
@@ -457,8 +407,6 @@ 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
@@ -473,7 +421,6 @@ if [ -n "$H5_NO_DEPRECATED_SYMBOLS" ]; then
     TOOLTEST $v18main
     TOOLTEST $v110main
     TOOLTEST $v112main
-    TOOLTEST $v114main
 elif [ -n "$H5_USE_16_API_DEFAULT" ]; then
     echo "Testing HDF5  with 16_API_DEFAULT"
     TOOLTEST $v16main
@@ -492,24 +439,15 @@ elif [ -n "$H5_USE_112_API_DEFAULT" ]; then
     TOOLTEST -DH5_USE_18_API_DEFAULT $v18main
     TOOLTEST -DH5_USE_110_API_DEFAULT $v110main
     TOOLTEST $v112main
-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"
+    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 -DH5_USE_114_API_DEFAULT $v114main
     TOOLTEST $v18main
     TOOLTEST $v110main
     TOOLTEST $v112main
-    TOOLTEST $v114main
 fi
 
 ##############################################################################

java/src/hdf/hdf5lib/HDF5Constants.java

@@ -573,8 +573,6 @@ 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();
@@ -2052,8 +2050,6 @@ 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();

java/src/jni/h5Constants.c

@@ -1310,11 +1310,6 @@ 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;