Merge 839 (round 5) PRs to hdf5 1 10

fortran/src/CMakeLists.txt

@@ -579,4 +579,17 @@ if (NOT WIN32 AND NOT MINGW)
       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
       COMPONENT fortlibraries
   )
+  if (HDF5_ENABLE_PARALLEL AND MPI_Fortran_FOUND)
+    configure_file (
+        ${HDF_RESOURCES_DIR}/libh5cc.in
+        ${HDF5_BINARY_DIR}/CMakeFiles/h5pfc
+        @ONLY
+    )
+    install (
+        FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5pfc
+        DESTINATION ${HDF5_INSTALL_BIN_DIR}
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+        COMPONENT fortlibraries
+    )
+  endif ()
 endif ()

release_docs/RELEASE.txt

@@ -769,6 +769,10 @@ The following platforms are not supported but have been tested for this release.
 
 Known Problems
 ==============
+    Setting a variable-length dataset fill value will leak the memory allocated
+    for the p field of the hvl_t struct. A fix is in progress for this.
+    HDFFV-10840
+
     CMake files do not behave correctly with paths containing spaces.
     Do not use spaces in paths because the required escaping for handling spaces
     results in very complex and fragile build files.

src/H5.c

@@ -824,7 +824,11 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
             disable_version_check = (unsigned int)HDstrtol(s, NULL, 0);
     }
 
-    if (H5_VERS_MAJOR != majnum || H5_VERS_MINOR != minnum || H5_VERS_RELEASE != relnum) {
+    /* H5_VERS_MAJOR and H5_VERS_MINOR must match */
+    /* Cast relnum to int to avoid warning for unsigned < 0 comparison
+     * in first release versions */
+    if (H5_VERS_MAJOR != majnum || H5_VERS_MINOR != minnum || H5_VERS_RELEASE > (int)relnum) {
+
         switch (disable_version_check) {
             case 0:
                 HDfprintf(stderr, "%s%s", version_mismatch_warning,

src/H5mpi.c

@@ -523,7 +523,7 @@ H5_mpio_create_large_type(hsize_t num_elements, MPI_Aint stride_bytes, MPI_Datat
             MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
         }
 
-        /* Set up the arguments for MPI_Type_struct constructor */
+        /* Set up the arguments for MPI_Type_create_struct() */
         type[0]      = outer_type;
         type[1]      = leftover_type;
         block_len[0] = 1;

tools/test/h5jam/h5jamgentest.c

@@ -31,24 +31,7 @@
 #define UBTXT3 "u511.txt"
 #define UBTXT4 "u512.txt"
 #define UBTXT5 "u513.txt"
-/* not used yet
-#define UBTXT6 "u1023.txt"
-#define UBTXT7 "u1024.txt"
-#define UBTXT8 "u1025.txt"
-#define UBTXT9 "u2047.txt"
-#define UBTXT10 "u2048.txt"
-#define UBTXT11 "u2049.txt"
-#define UBBIN1 "u0.dat"
-#define UBBIN2 "u10.dat"
-#define UBBIN3 "u511.dat"
-#define UBBIN4 "u512.dat"
-#define UBBIN5 "u513.dat"
-*/
 
-/* not used yet
-#define FILE1 "tnull.h5"
-#define FILE2 "tnullwithub.h5"
-*/
 /* tall is same as dumper test */
 #define FILE7 "tall.h5"
 #define FILE8 "twithub.h5"
@@ -66,17 +49,6 @@ char pattern[11] = "abcdefghij";
 
 #define BUF_SIZE 1024
 
-/* Element selection information */
-
-typedef enum { RED, GREEN, BLUE, WHITE, BLACK } enumtype;
-
-/* Compound datatype */
-typedef struct s1_t {
-    unsigned int a;
-    unsigned int b;
-    float        c;
-} s1_t;
-
 /* A UD link traversal function.  Shouldn't actually be called. */
 static hid_t
 UD_traverse(const char H5_ATTR_UNUSED *link_name, hid_t H5_ATTR_UNUSED cur_group,
@@ -115,7 +87,6 @@ g1.2.1 : slink
 g2 : dset2.1  dset2.2 udlink
 
 */
-
 static void
 gent_ub(const char *filename, size_t ub_size, size_t ub_fill)
 {
@@ -308,65 +279,19 @@ create_textfile(const char *name, size_t size)
     HDclose(fd);
 }
 
-#ifdef notdef
-/* not used yet */
-void
-create_binfile(char *name, off_t size)
-{
-    char *buf;
-    int   fd;
-    int   i;
-    char *bp;
-
-    fd = creat(name, 0777);
-    HDassert(fd >= 0);
-
-    buf = HDcalloc(size, 1);
-    HDassert(buf);
-
-    /* fill buf with pattern */
-    bp = buf;
-    for (i = 0; i < size; i++)
-        *bp++ = (char)i & 0xff;
-
-    (void)HDwrite(fd, buf, size);
-
-    HDclose(fd);
-}
-#endif
-
 /*-------------------------------------------------------------------------
  * Function: main
  *
  *-------------------------------------------------------------------------
  */
-
 int
 main(void)
 {
-
-    /*
-    create_textfile(UBTXT1, (size_t)0);
-    */
     create_textfile(UBTXT2, (size_t)10);
     create_textfile(UBTXT3, (size_t)511);
     create_textfile(UBTXT4, (size_t)512);
     create_textfile(UBTXT5, (size_t)513);
-    /*
-    create_textfile(UBTXT6, (size_t)1023);
-    create_textfile(UBTXT7, (size_t)1024);
-    create_textfile(UBTXT8, (size_t)1025);
-    create_textfile(UBTXT9, (size_t)2047);
-    create_textfile(UBTXT10, (size_t)2048);
-    create_textfile(UBTXT11, (size_t)2049);
-
-    create_binfile(UBBIN1, (off_t)0);
-    create_binfile(UBBIN2, (off_t)10);
-    create_binfile(UBBIN3, (off_t)511);
-    create_binfile(UBBIN4, (off_t)512);
-    create_binfile(UBBIN5, (off_t)513);
-
-    */
+
     gent_ub(FILE7, (size_t)0, (size_t)0);
     gent_ub(FILE8, (size_t)512, HDstrlen(pattern));
     gent_ub(FILE9, (size_t)1024, (size_t)513);