Merge branch 'develop' into improve_error_checking

Author: bmribler

.github/workflows/nvhpc.yml

@@ -78,6 +78,7 @@ jobs:
           -DHDF5_BUILD_JAVA:BOOL=OFF \
           -DMPIEXEC_MAX_NUMPROCS:STRING="2" \
           -DMPIEXEC_PREFLAGS:STRING="--mca;opal_warn_on_missing_libcuda;0" \
+          -DCMAKE_C_FLAGS="-Mnovect" \
           $GITHUB_WORKSPACE
 
       - name: Build

.github/workflows/openbsd.yml

@@ -45,14 +45,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openbsd-version: ['7.8']
+        openbsd-version: ['7.9']
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Build and test on OpenBSD
-        uses: vmactions/openbsd-vm@d7d892b7b9ba97ed2747b0fc201be65037d64c3e # v1.4.0
+        uses: vmactions/openbsd-vm@23b3fb94fbb4729a51b1c937f609483e759c8f28
         with:
           release: ${{ matrix.openbsd-version }}
           usesh: true

fortran/src/CMakeLists.txt

@@ -8,12 +8,6 @@ cmake_minimum_required (VERSION 3.26)
 project (HDF5_F90_SRC C Fortran)
 
 #-----------------------------------------------------------------------------
-if (H5_NO_DEPRECATED_SYMBOLS)
-  set (CMAKE_NO_DEPRECATED_SYMBOLS 1)
-else ()
-  set (CMAKE_NO_DEPRECATED_SYMBOLS 0)
-endif ()
-
 # configure def file for shared libs on windows
 if (WIN32)
   if (BUILD_SHARED_LIBS)
@@ -34,64 +28,8 @@ if (WIN32)
   endif ()
 endif ()
 
-if (H5_HAVE_MPI_F08) # MPI-3 module mpi_f08 supported
-  set (CMAKE_H5_HAVE_MPI_F08 1)
-else ()
+if (NOT H5_HAVE_MPI_F08) # MPI-3 module mpi_f08 supported
   set (H5_NOMPI_F08 ";")
-  set (CMAKE_H5_HAVE_MPI_F08 0)
-endif ()
-
-if (H5_HAVE_DARWIN) # Used in testing
-  set (CMAKE_H5_HAVE_DARWIN 1)
-else ()
-  set (CMAKE_H5_HAVE_DARWIN 0)
-endif ()
-
-# configure for Fortran preprocessor
-
-# Define Parallel variable for passing to H5config_f.inc.cmake
-set (CMAKE_H5_HAVE_PARALLEL 0)
-set (CMAKE_H5_HAVE_SUBFILING_VFD 0)
-if (H5_HAVE_PARALLEL)
-  set (CMAKE_H5_HAVE_PARALLEL 1)
-  if (H5_HAVE_SUBFILING_VFD)
-    set (CMAKE_H5_HAVE_SUBFILING_VFD 1)
-  endif ()
-endif ()
-
-set (CMAKE_H5_HAVE_FLOAT128 0)
-if (H5_HAVE_FLOAT128)
-  set (CMAKE_H5_HAVE_FLOAT128 1)
-endif ()
-
-set (CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE 0)
-if (H5_FORTRAN_HAVE_STORAGE_SIZE)
-  set (CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE 1)
-endif ()
-
-set (CMAKE_H5_FORTRAN_HAVE_SIZEOF 0)
-if (H5_FORTRAN_HAVE_SIZEOF)
-  set (CMAKE_H5_FORTRAN_HAVE_SIZEOF 1)
-endif ()
-
-set (CMAKE_H5_FORTRAN_HAVE_C_SIZEOF 0)
-if (H5_FORTRAN_HAVE_C_SIZEOF)
-  set (CMAKE_H5_FORTRAN_HAVE_C_SIZEOF 1)
-endif ()
-
-set (CMAKE_H5_HAVE_ISO_FORTRAN_ENV 0)
-if (H5_HAVE_ISO_FORTRAN_ENV)
-  set (CMAKE_H5_HAVE_ISO_FORTRAN_ENV 1)
-endif ()
-
-set (CMAKE_H5_FORTRAN_HAVE_CHAR_ALLOC 0)
-if (H5_FORTRAN_HAVE_CHAR_ALLOC)
-  set (CMAKE_H5_FORTRAN_HAVE_CHAR_ALLOC 1)
-endif ()
-
-set (CMAKE_H5_MPI_LOGICAL_KIND 0)
-if (H5_MPI_LOGICAL_KIND)
-  set (CMAKE_H5_MPI_LOGICAL_KIND 1)
 endif ()
 
 configure_file (${HDF5_F90_SRC_SOURCE_DIR}/H5config_f.inc.cmake ${HDF5_F90_BINARY_DIR}/H5config_f.inc @ONLY)

fortran/src/H5Dff.F90

@@ -95,7 +95,7 @@ MODULE H5D
   PRIVATE h5dwrite_reference_obj, h5dwrite_reference_dsetreg, h5dwrite_char_scalar, h5dwrite_ptr
   PRIVATE h5dread_reference_obj, h5dread_reference_dsetreg, h5dread_char_scalar, h5dread_ptr
   PRIVATE h5dfill_integer, h5dfill_c_float, h5dfill_c_double, h5dfill_char, h5dfill_ptr
-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
   PRIVATE h5dfill_c_long_double
 #endif
 
@@ -180,7 +180,7 @@ END FUNCTION h5dread_f_c
      MODULE PROCEDURE h5dfill_integer
      MODULE PROCEDURE h5dfill_c_float
      MODULE PROCEDURE h5dfill_c_double
-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
      MODULE PROCEDURE h5dfill_c_long_double
 #endif
      MODULE PROCEDURE h5dfill_char
@@ -2308,7 +2308,7 @@ SUBROUTINE h5dfill_c_double(fill_value, space_id, buf,  hdferr)
 
   END SUBROUTINE h5dfill_c_double
 
-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
   SUBROUTINE h5dfill_c_long_double(fill_value, space_id, buf,  hdferr)
     IMPLICIT NONE
     REAL(KIND=C_LONG_DOUBLE), INTENT(IN), TARGET :: fill_value

fortran/src/H5_f.c

@@ -183,7 +183,7 @@ h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes)
     /*
      * FIND H5T_NATIVE_REAL_C_LONG_DOUBLE
      */
-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE != 0
+#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
     if (sizeof(real_C_LONG_DOUBLE_f) == sizeof(float)) {
         if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
             return ret_value;
@@ -192,7 +192,7 @@ h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes)
         if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
             return ret_value;
     } /*end if */
-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
     else if (sizeof(real_C_LONG_DOUBLE_f) == sizeof(long double)) {
         if (H5_PAC_C_MAX_REAL_PRECISION >= H5_PAC_FC_MAX_REAL_PRECISION) {
             if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0)

fortran/src/H5_ff.F90

@@ -997,7 +997,7 @@ INTEGER(HID_T) FUNCTION h5kind_to_type(ikind, flag) RESULT(h5_type)
     INTEGER, INTENT(IN) :: flag
     INTEGER :: i
 
-!#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+!#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16
 !    ! (1) The array index assumes INTEGER*16 the last integer in the series, and
 !    ! (2) it should map to INTEGER*16 on most modern processors
 !    H5T_NATIVE_INTEGER_KIND(H5_FORTRAN_NUM_INTEGER_KINDS)=SELECTED_INT_KIND(36)
@@ -1016,7 +1016,7 @@ INTEGER(HID_T) FUNCTION h5kind_to_type(ikind, flag) RESULT(h5_type)
           h5_type = H5T_NATIVE_REAL_C_FLOAT
        ELSE IF(ikind.EQ.KIND(1.0_C_DOUBLE))THEN
           h5_type = H5T_NATIVE_REAL_C_DOUBLE
-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
        ELSE IF(ikind.EQ.KIND(1.0_C_LONG_DOUBLE))THEN
           h5_type = H5T_NATIVE_REAL_C_LONG_DOUBLE
 #endif

fortran/src/H5config_f.inc.cmake

@@ -12,88 +12,43 @@
 ! fortran/H5config_f.inc. Generated from fortran/src/H5config_f.inc.cmake by CMake
 
 ! Define if there is parallel support
-#cmakedefine01 CMAKE_H5_HAVE_PARALLEL
-#if CMAKE_H5_HAVE_PARALLEL == 0
-#undef H5_HAVE_PARALLEL
-#else
-#define H5_HAVE_PARALLEL
-#endif
+#cmakedefine H5_HAVE_PARALLEL
 
 ! Define if MPI supports mpi_f08 module
-#cmakedefine01 CMAKE_H5_HAVE_MPI_F08
-#if CMAKE_H5_HAVE_MPI_F08 == 0
-#undef H5_HAVE_MPI_F08
-#else
-#define H5_HAVE_MPI_F08
-#endif
+#cmakedefine H5_HAVE_MPI_F08
 
 ! Define if there is subfiling support
-#cmakedefine01 CMAKE_H5_HAVE_SUBFILING_VFD
-#if CMAKE_H5_HAVE_SUBFILING_VFD == 0
-#undef H5_HAVE_SUBFILING_VFD
-#else
-#define H5_HAVE_SUBFILING_VFD
-#endif
+#cmakedefine H5_HAVE_SUBFILING_VFD
 
 ! Define if on APPLE
-#cmakedefine01 CMAKE_H5_HAVE_DARWIN
-#if CMAKE_H5_HAVE_DARWIN == 0
-#undef H5_HAVE_DARWIN
-#else
-#define H5_HAVE_DARWIN
-#endif
+#cmakedefine H5_HAVE_DARWIN
 
 ! Define if the intrinsic function STORAGE_SIZE exists
-#cmakedefine01 CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE
-#if CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE == 0
-#undef H5_FORTRAN_HAVE_STORAGE_SIZE
-#else
-#define H5_FORTRAN_HAVE_STORAGE_SIZE
-#endif
+#cmakedefine H5_FORTRAN_HAVE_STORAGE_SIZE
 
 ! Define if the intrinsic function SIZEOF exists
-#cmakedefine01 CMAKE_H5_FORTRAN_HAVE_SIZEOF
-#if CMAKE_H5_FORTRAN_HAVE_SIZEOF == 0
-#undef H5_FORTRAN_HAVE_SIZEOF
-#else
-#define H5_FORTRAN_HAVE_SIZEOF
-#endif
+#cmakedefine H5_FORTRAN_HAVE_SIZEOF
 
 ! Define if the intrinsic function C_SIZEOF exists
-#cmakedefine01 CMAKE_H5_FORTRAN_HAVE_C_SIZEOF
-#if CMAKE_H5_FORTRAN_HAVE_C_SIZEOF == 0
-#undef H5_FORTRAN_HAVE_C_SIZEOF
-#else
-#define H5_FORTRAN_HAVE_C_SIZEOF
-#endif
+#cmakedefine H5_FORTRAN_HAVE_C_SIZEOF
 
 ! Define if allocatable character is supported
-#define H5_FORTRAN_HAVE_CHAR_ALLOC @H5_FORTRAN_HAVE_CHAR_ALLOC@
+#cmakedefine H5_FORTRAN_HAVE_CHAR_ALLOC
 
 ! Define if the intrinsic function C_LONG_DOUBLE exists
-#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @H5_FORTRAN_HAVE_C_LONG_DOUBLE@
+#cmakedefine H5_FORTRAN_HAVE_C_LONG_DOUBLE
 
 ! Define if Fortran C_LONG_DOUBLE is different from C_DOUBLE
-#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
+#cmakedefine H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
 
 ! Define if Fortran C_BOOL is different from default LOGICAL
-#define H5_FORTRAN_C_BOOL_IS_UNIQUE @H5_FORTRAN_C_BOOL_IS_UNIQUE@
+#cmakedefine H5_FORTRAN_C_BOOL_IS_UNIQUE
 
 ! Define  MPI Fortran KIND of LOGICAL
-#cmakedefine01 CMAKE_H5_MPI_LOGICAL_KIND
-#if CMAKE_H5_MPI_LOGICAL_KIND == 0
-#undef H5_MPI_LOGICAL_KIND
-#else
-#define H5_MPI_LOGICAL_KIND @H5_MPI_LOGICAL_KIND@
-#endif
+#cmakedefine H5_MPI_LOGICAL_KIND @H5_MPI_LOGICAL_KIND@
 
 ! Define if Fortran supports ISO_FORTRAN_ENV (F08)
-#cmakedefine01 CMAKE_H5_HAVE_ISO_FORTRAN_ENV
-#if CMAKE_H5_HAVE_ISO_FORTRAN_ENV == 0
-#undef H5_HAVE_ISO_FORTRAN_ENV
-#else
-#define H5_HAVE_ISO_FORTRAN_ENV
-#endif
+#cmakedefine H5_HAVE_ISO_FORTRAN_ENV
 
 ! Define the size of C's double
 #define H5_SIZEOF_DOUBLE @H5_SIZEOF_DOUBLE@
@@ -105,15 +60,10 @@
 #define H5_PAC_FC_MAX_REAL_PRECISION @H5_PAC_FC_MAX_REAL_PRECISION@
 
 ! If C has quad precision
-#cmakedefine01 CMAKE_H5_HAVE_FLOAT128
-#if CMAKE_H5_HAVE_FLOAT128 == 0
-#undef H5_HAVE_FLOAT128
-#else
-#define H5_HAVE_FLOAT128
-#endif
+#cmakedefine H5_HAVE_FLOAT128
 
 ! Define if INTEGER*16 is available
-#define H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@
+#cmakedefine H5_HAVE_Fortran_INTEGER_SIZEOF_16
 
 ! Maximum decimal precision for C
 #define H5_PAC_C_MAX_REAL_PRECISION @H5_PAC_C_MAX_REAL_PRECISION@
@@ -137,12 +87,7 @@
 #define H5_Fortran_COMPILER_ID @CMAKE_Fortran_COMPILER_ID@
 
 ! Define if deprecated public API symbols are disabled
-#cmakedefine01 CMAKE_NO_DEPRECATED_SYMBOLS
-#if CMAKE_NO_DEPRECATED_SYMBOLS == 0
-#undef H5_NO_DEPRECATED_SYMBOLS
-#else
-#define H5_NO_DEPRECATED_SYMBOLS
-#endif
+#cmakedefine H5_NO_DEPRECATED_SYMBOLS
 
 ! For major interface/format changes
 #define H5_VERS_MAJOR @H5_VERS_MAJOR@

fortran/src/H5fort_type_defines.h.cmake

@@ -23,6 +23,6 @@
 #define H5_FORTRAN_INTEGER_KINDS_SIZEOF @PAC_FC_ALL_INTEGER_KINDS_SIZEOF@
 #define H5_FORTRAN_REAL_KINDS @PAC_FC_ALL_REAL_KINDS@
 #define H5_FORTRAN_REAL_KINDS_SIZEOF @PAC_FC_ALL_REAL_KINDS_SIZEOF@
-#define H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@
-#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @H5_FORTRAN_HAVE_C_LONG_DOUBLE@
-#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
+#cmakedefine H5_HAVE_Fortran_INTEGER_SIZEOF_16
+#cmakedefine H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#cmakedefine H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE

fortran/src/H5match_types.c

@@ -156,7 +156,7 @@ main(void)
 
     int FORTRAN_NUM_INTEGER_KINDS = H5_FORTRAN_NUM_INTEGER_KINDS;
     int H5_FORTRAN_NUM_REAL_KINDS;
-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
     int found_long_double = 0;
 #endif
 
@@ -213,7 +213,7 @@ main(void)
             writeTypedef("float", "double", RealKinds[i]);
             strcpy(Real_C_TYPES[i], "C_DOUBLE");
         }
-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
         else if (sizeof(long double) == RealKinds_SizeOf[i] && found_long_double == 0) {
             writeTypedef("float", "long double", RealKinds[i]);
             strcpy(Real_C_TYPES[i], "C_LONG_DOUBLE");
@@ -376,7 +376,7 @@ main(void)
             return -1;
     }
     /* real_f */
-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
     if (H5_FORTRAN_NATIVE_REAL_SIZEOF == sizeof(long double)) {
         writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_LONG_DOUBLE");
     }
@@ -403,7 +403,7 @@ main(void)
     }
 
     /* double_f */
-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0
+#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
     if (H5_FORTRAN_NATIVE_DOUBLE_SIZEOF == sizeof(long double)) {
         writeToFilesChr("float", "Fortran_DOUBLE", "double_f", H5_FORTRAN_NATIVE_DOUBLE_KIND,
                         "C_LONG_DOUBLE");