From 6074c8a02d50399b962b03af85ceb15b80978aff Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Tue, 4 Aug 2020 17:31:24 -0600 Subject: [PATCH] Fix items in netcdf_meta.h --- CMakeLists.txt | 1 - configure.ac | 2 -- include/netcdf_meta.h.in | 2 +- libnczarr/zvar.c | 10 ++++++---- libnetcdf.settings.in | 1 - ncgen/ncdumpchunks.c | 7 +++++-- plugins/H5Znoop.c | 7 +++++++ 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eefb0184..4e1353e08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2052,7 +2052,6 @@ is_enabled(ENABLE_ERANGE_FILL HAS_ERANGE_FILL) is_enabled(HAVE_H5Z_SZIP HAS_SZLIB) is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS) is_enabled(ENABLE_NCZARR HAS_NCZARR) -is_enabled(ENABLE_S3_SDK HAS_S3_SDK) # Generate file from template. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in" diff --git a/configure.ac b/configure.ac index ba7b4e5b5..6a276f052 100644 --- a/configure.ac +++ b/configure.ac @@ -1551,7 +1551,6 @@ AC_SUBST(HAS_BYTERANGE,[$enable_byterange]) AC_SUBST(RELAX_COORD_BOUND,[yes]) AC_SUBST([HAS_PAR_FILTERS], [$hdf5_supports_par_filters]) AC_SUBST(HAS_NCZARR,[$enable_nczarr]) -AC_SUBST(HAS_S3_SDK,[$have_aws]) # Include some specifics for netcdf on windows. #AH_VERBATIM([_WIN32_STRICMP], @@ -1623,7 +1622,6 @@ AX_SET_META([NC_HAS_ERANGE_FILL], [$enable_erange_fill],[yes]) AX_SET_META([NC_HAS_PAR_FILTERS], [$hdf5_supports_par_filters],[yes]) AX_SET_META([NC_HAS_BYTERANGE],[$enable_byterange],[yes]) AX_SET_META([NC_HAS_NCZARR],[$enable_nczarr],[yes]) -AX_SET_META([NC_S3_SDK],[$have_aws],[yes]) AC_SUBST([NC_DISPATCH_VERSION], [2]) diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in index 78f77ae25..8a8a8df7b 100644 --- a/include/netcdf_meta.h.in +++ b/include/netcdf_meta.h.in @@ -60,6 +60,6 @@ #define NC_RELAX_COORD_BOUND 1 /*!< RELAX_COORD_BOUND */ #define NC_DISPATCH_VERSION @NC_DISPATCH_VERSION@ /*!< Dispatch table version */ #define NC_HAS_PAR_FILTERS @NC_HAS_PAR_FILTERS@ /* Parallel I/O with filter support. */ -#define NC_HAS_ZARR @NC_HAS_ZARR@ +#define NC_HAS_NCZARR @NC_HAS_NCZARR@ #endif diff --git a/libnczarr/zvar.c b/libnczarr/zvar.c index 19328eecb..58d47daf9 100644 --- a/libnczarr/zvar.c +++ b/libnczarr/zvar.c @@ -1358,7 +1358,7 @@ NCZ_put_vars(int ncid, int varid, const size_t *startp, const size_t *countp, #ifdef LOOK hid_t file_spaceid = 0, mem_spaceid = 0, xfer_plistid = 0; #endif - size64_t fdims[NC_MAX_VAR_DIMS], fmaxdims[NC_MAX_VAR_DIMS]; + size64_t fdims[NC_MAX_VAR_DIMS]; size64_t start[NC_MAX_VAR_DIMS], count[NC_MAX_VAR_DIMS]; size64_t stride[NC_MAX_VAR_DIMS]; #ifdef USE_PARALLEL4 @@ -1369,6 +1369,9 @@ NCZ_put_vars(int ncid, int varid, const size_t *startp, const size_t *countp, int need_to_convert = 0; int zero_count = 0; /* true if a count is zero */ size_t len = 1; + size64_t fmaxdims[NC_MAX_VAR_DIMS]; + + NC_UNUSED(fmaxdims); #ifndef LOOK NC_UNUSED(fmaxdims); @@ -1695,7 +1698,8 @@ NCZ_get_vars(int ncid, int varid, const size_t *startp, const size_t *countp, NC_DIM_INFO_T *dim; size_t file_type_size; size64_t count[NC_MAX_VAR_DIMS]; - size64_t fdims[NC_MAX_VAR_DIMS], fmaxdims[NC_MAX_VAR_DIMS]; + size64_t fdims[NC_MAX_VAR_DIMS]; + size64_t fmaxdims[NC_MAX_VAR_DIMS]; size64_t start[NC_MAX_VAR_DIMS]; size64_t stride[NC_MAX_VAR_DIMS]; void *fillvalue = NULL; @@ -1706,9 +1710,7 @@ NCZ_get_vars(int ncid, int varid, const size_t *startp, const size_t *countp, int need_to_convert = 0; size_t len = 1; -#ifndef LOOK NC_UNUSED(fmaxdims); -#endif /* Find info for this file, group, and var. */ if ((retval = nc4_find_grp_h5_var(ncid, varid, &h5, &grp, &var))) diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in index 588a4840f..eddfbb8ff 100644 --- a/libnetcdf.settings.in +++ b/libnetcdf.settings.in @@ -44,4 +44,3 @@ SZIP Support: @HAS_SZLIB@ SZIP Write Support: @HAS_SZLIB_WRITE@ Parallel Filters: @HAS_PAR_FILTERS@ NCZarr Support: @HAS_NCZARR@ -NCZarr S3: @HAS_S3_SDK@ diff --git a/ncgen/ncdumpchunks.c b/ncgen/ncdumpchunks.c index 6c15c6a79..4ccaa9643 100755 --- a/ncgen/ncdumpchunks.c +++ b/ncgen/ncdumpchunks.c @@ -49,11 +49,14 @@ usage(int err) int main(int argc, char** argv) { - int i,r,stat = NC_NOERR; + int i,stat = NC_NOERR; hid_t fileid, grpid, datasetid; - hid_t dxpl_id = H5P_DEFAULT; /*data transfer property list */ int* chunkdata = NULL; /*[CHUNKPROD];*/ +#ifdef HDF5_SUPPORTS_PAR_FILTERS + int r; + hid_t dxpl_id = H5P_DEFAULT; /*data transfer property list */ unsigned int filter_mask = 0; +#endif const char* file_name = NULL; const char* var_name = NULL; int ncid, varid, dimids[NC_MAX_VAR_DIMS]; diff --git a/plugins/H5Znoop.c b/plugins/H5Znoop.c index 66aea8be0..0d72ded3a 100644 --- a/plugins/H5Znoop.c +++ b/plugins/H5Znoop.c @@ -97,6 +97,13 @@ H5Z_filter_noop(unsigned int flags, size_t cd_nelmts, void* newbuf; size_t i; +#if NOOP_INSTANCE == 0 + NC_UNUSED(instance0); +#endif +#if NOOP_INSTANCE == 1 + NC_UNUSED(instance1); +#endif + printf("cd_nelmts=%lu cd_values=",(unsigned long)cd_nelmts); for(i=0;i