Merge branch '4.8.0-wellspring-prs.wif' into 4.8.0-wellspring.wif

Author: WardF

CMakeLists.txt

@@ -37,7 +37,7 @@ SET(PACKAGE_VERSION ${VERSION})
 
 # Version of the dispatch table. This must match the value in
 # configure.ac.
-SET(NC_DISPATCH_VERSION 2)
+SET(NC_DISPATCH_VERSION 3)
 
 # Get system configuration, Use it to determine osname, os release, cpu. These
 # will be used when committing to CDash.
@@ -163,8 +163,6 @@ SET(EXTRA_DEPS "")
 # Set CTest Properties
 ################################
 
-
-
 ENABLE_TESTING()
 INCLUDE(CTest)
 
@@ -262,6 +260,7 @@ ENDIF()
 #####
 # System inspection checks
 #####
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/oc2)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libsrc)
@@ -766,7 +765,6 @@ IF(USE_HDF5)
 
   #Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0)
   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS)
-  CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS)
   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY)
   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5allocate_memory "" HAVE_H5ALLOCATE_MEMORY)
   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5resize_memory "" HAVE_H5RESIZE_MEMORY)
@@ -2235,6 +2233,13 @@ configure_file(
   ${netCDF_SOURCE_DIR}/include/netcdf_meta.h.in
   ${netCDF_BINARY_DIR}/include/netcdf_meta.h @ONLY)
 
+#####
+# Create 'netcdf_dispatch.h' include file.
+#####
+configure_file(
+  ${netCDF_SOURCE_DIR}/include/netcdf_dispatch.h.in
+  ${netCDF_BINARY_DIR}/include/netcdf_dispatch.h @ONLY NEWLINE_STYLE LF)
+
 #####
 # Build test_common.sh
 #####

RELEASE_NOTES.md

@@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.8.0 - March 22, 2021
 
+* [Enhancement] Bump the NC_DISPATCH_VERSION from 2 to 3, and as a side effect, unify the definition of NC_DISPATCH_VERSION so it only needs to be defined in CMakeLists.txt and configure.ac. See [Github #1945](https://github.com/Unidata/netcdf-c/pull/1945) for more information.
 * [Enhancement] Provide better cross platform path name management. This converts paths for various platforms (e.g. Windows, MSYS, etc.) so that they are in the proper format for the executing platform. See [Github #1958](https://github.com/Unidata/netcdf-c/pull/1958) for more information.
 * [Bug Fixes] The nccopy program was treating -d0 as turning deflation on rather than interpreting it as "turn off deflation". See [Github #1944](https://github.com/Unidata/netcdf-c/pull/1944) for more information.
 * [Enhancement] Add support for storing NCZarr data in zip files. See [Github #1942](https://github.com/Unidata/netcdf-c/pull/1942) for more information.

config.h.cmake.in

@@ -256,9 +256,6 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have the `gettimeofday' function. */
 #cmakedefine HAVE_STRUCT_TIMESPEC 1
 
-/* if true, netcdf4 file properties will be set using H5Pset_libver_bounds */
-#cmakedefine HAVE_H5PSET_LIBVER_BOUNDS 1
-
 /* Define to 1 if you have the `H5Z_SZIP' function. */
 #cmakedefine HAVE_H5Z_SZIP 1
 
@@ -463,6 +460,9 @@ with zip */
 /* Add extra properties to _NCProperties attribute */
 #cmakedefine NCPROPERTIES_EXTRA ${NCPROPERTIES_EXTRA}
 
+/* Idspatch table version */
+#cmakedefine NC_DISPATCH_VERSION ${NC_DISPATCH_VERSION}
+
 /* no IEEE float on this platform */
 #cmakedefine NO_IEEE_FLOAT 1
 

configure.ac

@@ -1216,7 +1216,8 @@ if test "x$enable_hdf5" = xyes; then
 
    # H5Pset_fapl_mpiposix and H5Pget_fapl_mpiposix have been removed since HDF5 1.8.12.
    # Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead.
-   AC_CHECK_FUNCS([H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5resize_memory H5allocate_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops H5Literate])
+
+   AC_CHECK_FUNCS([H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5resize_memory H5allocate_memory H5Pset_all_coll_metadata_ops H5Literate])
 
    # Check to see if HDF5 library has H5Literate (HDF5 1.8.x, 1.10.x)
    if test "x$ac_cv_func_H5Literate" = xno; then
@@ -1229,6 +1230,7 @@ if test "x$enable_hdf5" = xyes; then
       AC_MSG_RESULT(yes)
    fi
 
+
    # Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0)
    if test "x$ac_cv_func_H5Pset_all_coll_metadata_ops" = xyes; then
       AC_DEFINE([HDF5_HAS_COLL_METADATA_OPS], [1], [if true, use collective metadata ops in parallel netCDF-4])
@@ -1700,7 +1702,9 @@ AX_SET_META([NC_HAS_MULTIFILTERS],[$has_multifilters],[yes])
 # applications like PIO can determine whether they have an appropriate
 # dispatch table to submit. If this is changed, make sure the value in
 # CMakeLists.txt also changes to match.
-AC_SUBST([NC_DISPATCH_VERSION], [2])
+
+AC_SUBST([NC_DISPATCH_VERSION], [3])
+AC_DEFINE_UNQUOTED([NC_DISPATCH_VERSION], [${NC_DISPATCH_VERSION}], [Dispatch table version.])
 
 #####
 # End netcdf_meta.h definitions.
@@ -1734,6 +1738,7 @@ AC_CONFIG_FILES([Makefile
                  libnetcdf.settings
                  postinstall.sh
                  include/netcdf_meta.h
+                 include/netcdf_dispatch.h
                  include/Makefile
                  h5_test/Makefile
                  hdf4_test/Makefile

h5_test/tst_h_atts3.c

@@ -209,11 +209,7 @@ main()
       hid_t file_typeid1[NUM_OBJ_1], native_typeid1[NUM_OBJ_1];
       hid_t file_typeid2, native_typeid2;
       hsize_t num_obj;
-#if H5_VERSION_GE(1,12,0)
-      H5O_info2_t obj_info;
-#else
       H5O_info_t obj_info;
-#endif
       char obj_name[STR_LEN + 1];
       hsize_t dims[1] = {ATT_LEN}; /* netcdf attributes always 1-D. */
 

include/CMakeLists.txt

@@ -28,7 +28,7 @@ INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf_filter.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     COMPONENT headers)
 
-INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf_dispatch.h
+INSTALL(FILES ${netCDF_BINARY_DIR}/include/netcdf_dispatch.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     COMPONENT headers)
 

include/Makefile.am

@@ -29,4 +29,4 @@ if ENABLE_BYTERANGE
 noinst_HEADERS += nchttp.h
 endif
 
-EXTRA_DIST = CMakeLists.txt XGetopt.h netcdf_meta.h.in
+EXTRA_DIST = CMakeLists.txt XGetopt.h netcdf_meta.h.in netcdf_dispatch.in

include/ncdispatch.h

@@ -80,9 +80,6 @@
 #define ATOMICTYPEMAX3 NC_DOUBLE
 #define ATOMICTYPEMAX5 NC_UINT64
 
-/* Define an alias for int to indicate an error return */
-typedef int NCerror;
-
 #if !defined HDF5_PARALLEL && !defined USE_PNETCDF
 typedef int MPI_Comm;
 typedef int MPI_Info;

include/nchttp.h

@@ -23,7 +23,7 @@ typedef struct NC_HTTP_STATE {
     char errbuf[1024]; /* assert(CURL_ERROR_SIZE <= 1024) */
 } NC_HTTP_STATE;
 
-extern int nc_http_open(const char* objecturl, NC_HTTP_STATE** state, size64_t* lenp);
+extern int nc_http_open(const char* objecturl, NC_HTTP_STATE** state, long long* lenp);
 extern int nc_http_size(NC_HTTP_STATE* state, const char* url, size64_t* sizep);
 extern int nc_http_read(NC_HTTP_STATE* state, const char* url, size64_t start, size64_t count, NCbytes* buf);
 extern int nc_http_close(NC_HTTP_STATE* state);

include/netcdf_dispatch.h include/netcdf_dispatch.h.in

@@ -25,7 +25,9 @@
 
 /* This is the version of the dispatch table. It should be changed
  * when new functions are added to the dispatch table. */
-#define NC_DISPATCH_VERSION 3
+#ifndef NC_DISPATCH_VERSION
+#define NC_DISPATCH_VERSION @NC_DISPATCH_VERSION@
+#endif /*NC_DISPATCH_VERSION*/
 
 /* This is the dispatch table, with a pointer to each netCDF
  * function. */

libdap2/dapincludes.h

@@ -32,6 +32,7 @@
 #include "oc.h"
 
 #include "ncdap.h"
+#include "nccommon.h"
 #include "dapdebug.h"
 #include "daputil.h"
 
@@ -47,7 +48,6 @@ struct NCsegment;
 
 /**************************************************/
 
-#include "nccommon.h"
 #include "getvara.h"
 #include "constraints.h"
 

libdap2/daputil.c

@@ -435,7 +435,7 @@ simplepathstring(NClist* names,  char* separator)
 /* Define a number of location tests */
 
 /* Is node contained (transitively) in a sequence ? */
-BOOL
+int
 dapinsequence(CDFnode* node)
 {
     if(node == NULL || node->container == NULL) return TRUE;
@@ -446,7 +446,7 @@ dapinsequence(CDFnode* node)
 }
 
 /* Is node contained (transitively) in a structure array */
-BOOL
+int
 dapinstructarray(CDFnode* node)
 {
     if(node == NULL) return TRUE;
@@ -459,7 +459,7 @@ dapinstructarray(CDFnode* node)
 }
 
 /* Is node a map field of a grid? */
-BOOL
+int
 dapgridmap(CDFnode* node)
 {
     if(node != NULL && node->container != NULL
@@ -471,7 +471,7 @@ dapgridmap(CDFnode* node)
 }
 
 /* Is node an array field of a grid? */
-BOOL
+int
 dapgridarray(CDFnode* node)
 {
     if(node != NULL && node->container != NULL
@@ -482,31 +482,31 @@ dapgridarray(CDFnode* node)
     return FALSE;
 }
 
-BOOL
+int
 dapgridelement(CDFnode* node)
 {
     return dapgridarray(node)
            || dapgridmap(node);
 }
 
 /* Is node a top-level grid node? */
-BOOL
+int
 daptopgrid(CDFnode* grid)
 {
     if(grid == NULL || grid->nctype != NC_Grid) return FALSE;
     return daptoplevel(grid);
 }
 
 /* Is node a top-level sequence node? */
-BOOL
+int
 daptopseq(CDFnode* seq)
 {
     if(seq == NULL || seq->nctype != NC_Sequence) return FALSE;
     return daptoplevel(seq);
 }
 
 /* Is node a top-level node? */
-BOOL
+int
 daptoplevel(CDFnode* node)
 {
     if(node->container == NULL

libdap2/nccommon.h

@@ -9,14 +9,14 @@
 #include "dapincludes.h"
 
 /* Mnemonics */
-#ifndef BOOL
-#define BOOL int
-#endif
 #ifndef TRUE
 #define TRUE 1
 #define FALSE 0
 #endif
 
+/* Define an alias for int to indicate an error return */
+typedef int NCerror;
+
 #ifndef nullfree
 #define nullfree(m) {if((m)!=NULL) {free(m);} else {}}
 #endif
@@ -206,7 +206,7 @@ typedef struct NCD2alignment {
 } NCD2alignment;
 
 typedef struct NCtypesize {
-    BOOL             aligned; /*  have instance and field been defined? */
+    int             aligned; /*  have instance and field been defined? */
     NCD2alignment      instance; /* Alignment, etc for instance data */
     NCD2alignment      field; /* Alignment, etc WRT to parent */
 } NCtypesize;
@@ -232,13 +232,13 @@ typedef struct CDFnode {
     int              ncid;          /* relevant NC id for this object*/
     unsigned long    maxstringlength;
     unsigned long    sequencelimit; /* 0=>unlimited */
-    BOOL	     usesequence;   /* If this sequence is usable */
-    BOOL             elided;        /* 1 => node does not partipate in naming*/
+    int	     usesequence;   /* If this sequence is usable */
+    int             elided;        /* 1 => node does not partipate in naming*/
     struct CDFnode*  basenode;      /* derived tree map to pattern tree */
-    BOOL	     invisible;     /* 1 => do not show to user */
-    BOOL	     zerodim;       /* 1 => node has a zero dimension */
+    int	     invisible;     /* 1 => do not show to user */
+    int	     zerodim;       /* 1 => node has a zero dimension */
     /* These two flags track the effects on grids of constraints */
-    BOOL             nc_virtual;       /* node added by regrid */
+    int             nc_virtual;       /* node added by regrid */
     struct CDFnode* attachment;     /* DDS<->DATADDS cross link*/
     struct CDFnode* pattern;       /* temporary field for regridding */
     /* Fields for use by libncdap4 */
@@ -249,8 +249,8 @@ typedef struct CDFnode {
     char*            vlenname;      /* for sequence types */
     int              singleton;     /* for singleton sequences */
     unsigned long    estimatedsize; /* > 0 Only for var nodes */
-    BOOL             whole;         /* projected as whole node */
-    BOOL             prefetchable;  /* eligible to be prefetched (if whole) */
+    int             whole;         /* projected as whole node */
+    int             prefetchable;  /* eligible to be prefetched (if whole) */
 } CDFnode;
 
 /**************************************************/

libdap4/ncd4.h

@@ -71,18 +71,6 @@ extern int dsp_close(ND4dsp* dsp);
 /* DSP API */
 extern int dsp_open(const char* path, ND4dsp** dspp);
 
-/*
-extern NCerror dapbuildvaraprojection(CDFnode*,
-		     const size_t* startp, const size_t* countp, const ptrdiff_t* stridep,
-		     struct DCEprojection** projectionlist);
-
-extern NCerror NCD4_getvarx(int ncid, int varid,
-	    const size_t *startp,
-	    const size_t *countp,
-	    const ptrdiff_t *stridep,
-	    void *data,
-	    nc_type dsttype0);
-*/
 #endif
 
 /**************************************************/

libdispatch/dhttp.c

@@ -71,7 +71,7 @@ Trace(const char* fcn)
 */
 
 int
-nc_http_open(const char* objecturl, NC_HTTP_STATE** statep, size64_t* filelenp)
+nc_http_open(const char* objecturl, NC_HTTP_STATE** statep, long long* filelenp)
 {
     int stat = NC_NOERR;
     int i;

libdispatch/dinfermodel.c

@@ -44,7 +44,7 @@ struct MagicFile {
     struct NCURI* uri;
     int omode;
     NCmodel* model;
-    fileoffset_t filelen;
+    long long filelen;
     int use_parallel;
     void* parameters; /* !NULL if inmemory && !diskless */
     FILE* fp;
@@ -937,7 +937,7 @@ check_file_type(const char *path, int omode, int use_parallel,
     if((status = openmagic(&magicinfo))) goto done;
 
     /* Verify we have a large enough file */
-    if(magicinfo.filelen < MAGIC_NUMBER_LEN)
+    if(magicinfo.filelen < (long long)MAGIC_NUMBER_LEN)
 	{status = NC_ENOTNC; goto done;}
     if((status = readmagic(&magicinfo,0L,magic)) != NC_NOERR) {
 	status = NC_ENOTNC;

libhdf5/hdf5create.c

@@ -163,15 +163,19 @@ nc4_create_file(const char *path, int cmode, size_t initialsz,
 	     nc4_chunk_cache_preemption));
     }
 
-#ifdef HAVE_H5PSET_LIBVER_BOUNDS
 #if H5_VERSION_GE(1,10,2)
-    if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_EARLIEST, H5F_LIBVER_V18) < 0)
+    /* lib versions 1.10.2 and higher */
+    if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_V18, H5F_LIBVER_LATEST) < 0)
 #else
-        if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_EARLIEST,
-                                 H5F_LIBVER_LATEST) < 0)
+#if H5_VERSION_GE(1,10,0)
+    /* lib versions 1.10.0, 1.10.1 */
+    if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_EARLIEST, H5F_LIBVER_LATEST) < 0)
+#else
+    /* all HDF5 1.8 lib versions */
+    if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
 #endif
-            BAIL(NC_EHDFERR);
 #endif
+        BAIL(NC_EHDFERR);
 
     /* Create the property list. */
     if ((fcpl_id = H5Pcreate(H5P_FILE_CREATE)) < 0)

ncdump/tst_netcdf4.sh

@@ -14,7 +14,7 @@ cleanncprops() {
   rm -f $dst
   cat $src \
   | sed -e '/:_Endianness/d' \
-  | sed -e 's/_SuperblockVersion = 1/_SuperblockVersion = 0/' \
+  | sed -e 's/_SuperblockVersion = [12]/_SuperblockVersion = 0/' \
   | sed -e 's/\(netcdflibversion\|netcdf\)=.*|/\1=NNNN|/' \
   | sed -e 's/\(hdf5libversion\|hdf5\)=.*"/\1=HHHH"/' \
   | grep -v '_NCProperties' \