Commit Graph

7495 Commits

Author SHA1 Message Date
Ward Fisher
16c27ca13f
Revert "Fix nczarr-experimental: improve build support, disengage hdf5 vs netcdf4 flags, and find AWS libraries" 2020-08-17 15:51:01 -06:00
Ward Fisher
c025e85a4a
Merge pull request #1792 from DennisHeimbigner/nczarr-update1.dmh
Fix nczarr-experimental: improve build support, disengage hdf5 vs netcdf4 flags, and find AWS libraries
2020-08-17 14:22:31 -06:00
Dennis Heimbigner
616812f204
Merge branch 'master' into nczarr-update1.dmh 2020-08-14 13:03:24 -06:00
Ward Fisher
d23a3272a1
Merge pull request #1809 from NOAA-GSD/ejh_fix_test_2
fixed tst_h_par_compress.c
2020-08-13 16:42:11 -06:00
Ward Fisher
665eb151c8
Merge pull request #1811 from magnusuMET/bugfix/m4_out_of_tree
Generate configure files out of tree
2020-08-13 16:40:46 -06:00
Ward Fisher
9944174b96
Merge pull request #1736 from DennisHeimbigner/noopfilterclean.dmh
Make plugin noop1 be distcleaned
2020-08-12 16:18:21 -06:00
Dennis Heimbigner
d85bb6fe20 The big change for this commit is complete the
disengagement of enable-netcdf4 from enable-hdf5.
That is, with the advent of nczarr, it is possible
to turn off hdf5 but still need netcdf-4 enabled
because nczarr uses libsrc4, but not libhdf5.
This change involves a bunch of things:
1. Modify configure.ac and CMakelist to make enable_hdf5
   control if hdf5 support is provided. For back compatibility,
   disable-netcdf4 is treated as disable-hdf5. But internally,
   netcdf4 support is controlled only by the enabling of formats
   that require it.
2. In support of #1, modify .travis.yml to use enable/disable-hdf5
   instead of enable/disable-netcdf4.
3. test_common.in is modified to track selected features,
   including enable-hdf5 and enable-s3-tests. This is used in
   selected tests that mix netcdf-3 and netcdf4 tests.
4. The conflation of USE_HDF5 and USE_NETCDF4 is common in
   code, tests, and build files, so all of those had to be weeded out.
5. It turns out that some of the NC4_dim functions really are HDF5 specific,
   but are not treated as such. So they are moved from nc4dim.c to
   hdf5dim.c or hdf5dispatch.c
6. Some generic functions in libhdf5 can be (and were) moved to libsrc4.
2020-08-12 15:42:50 -06:00
Dennis Heimbigner
8b487baa3a Merge branch 'master' into nczarr-update1.dmh 2020-08-12 15:08:42 -06:00
Magnus Ulimoen
12d86675ef H5Znoop1.c copied to BINARY_DIR instead of SOURCE_DIR 2020-08-12 17:03:33 +02:00
Magnus Ulimoen
9d10e605c2 Move generated file to BINARY_DIR 2020-08-12 16:55:14 +02:00
Magnus Ulimoen
a3f2c5847f Configure netcdf_meta.h directly to BINARY_DIR 2020-08-12 16:14:23 +02:00
Magnus Ulimoen
8f1fc8a73c Generate m4 files out of tree 2020-08-12 16:14:23 +02:00
Edward Hartnett
9c6b9bb72e fixed tst_h_par_compress.c 2020-08-12 07:28:49 -06:00
Dennis Heimbigner
da5431ff91 cleanup some LOOK code 2020-08-06 14:01:46 -06:00
Ward Fisher
a66b8ba0a9
Merge pull request #1804 from mandrakos/patch-1
Fix typo in postinstall script
2020-08-06 13:55:01 -06:00
Dennis Heimbigner
eef839e9e6 Disable all USE_PARALLEL code in libnczarr 2020-08-06 13:46:38 -06:00
John Correira
95bc80ba0a
Fix typo postinstall. 2020-08-06 15:27:20 -04:00
Dennis Heimbigner
931f6d0ad4 Define isnan and isinf for OSX 2020-08-04 19:22:42 -06:00
Dennis Heimbigner
70c873cd91 Merge branch 'nczarr-update1.dmh' of https://github.com/DennisHeimbigner/netcdf-c into nczarr-update1.dmh 2020-08-04 17:31:39 -06:00
Dennis Heimbigner
6074c8a02d Fix items in netcdf_meta.h 2020-08-04 17:31:24 -06:00
Ward Fisher
b9bb44f585
Merge pull request #1801 from DennisHeimbigner/ncgen3build.dmh
Update parser/lexer build process for ncgen3
2020-07-30 16:34:36 -06:00
Dennis Heimbigner
49b1f615e6 CMake fixes 2020-07-29 17:59:19 -06:00
Dennis Heimbigner
3da6ba8592 Malformed CMake 2020-07-29 16:52:10 -06:00
Dennis Heimbigner
6aff5a10d7 Update parser/lexer build process for ncgen3
Improve the ncgen3 process for building the parser
and lexer by making them match the process for ncgen.
Among other things, this entailed renaming some files.
2020-07-29 16:13:17 -06:00
Dennis Heimbigner
4044385832 Merge remote-tracking branch 'Unidata/master' 2020-07-28 12:28:09 -06:00
Dennis Heimbigner
a905c886d1
Merge branch 'master' into nczarr-update1.dmh 2020-07-27 19:17:57 -06:00
Ward Fisher
75777bd34b
Merge pull request #1791 from bombipappoo/current-buffer-size
Correct destination buffer size to strlcat
2020-07-27 10:24:10 -06:00
Ward Fisher
8f6c4fe140
Merge pull request #1795 from bombipappoo/fix-set-formats
Fix format buffer size
2020-07-24 11:27:39 -06:00
Ward Fisher
2dc0a7cc6c
Merge pull request #1797 from NOAA-GSD/ejh_dispatch
fixed dispatch version number in CMakeLists.txt
2020-07-22 15:37:45 -06:00
Ward Fisher
023fab065c
Merge pull request #1798 from dopplershift/fix-curl-7.71
Fix for cURL >7.69. Thanks @dopplershift ! Good catch and good find!
2020-07-22 13:46:48 -06:00
Ryan May
bff8b22c43
Add fix to release notes. 2020-07-22 12:52:53 -06:00
Ryan May
6ea54a76ed
Fix for cURL >7.69
Found on conda-forge (which is now running 7.71.1), that byte-range
requests would stall. It turns out this is due to
CURLOPT_NOBODY--apparently setting this to 0 disables the HEAD request,
but does not restore downloading the body. The way to fix this is to
reset to CURLOPT_HTTPGET when done with a HEAD request.
2020-07-22 02:19:43 -06:00
Dennis Heimbigner
7b098eb484 Merge branch 'master' into nczarr-update1.dmh 2020-07-15 10:37:14 -06:00
Dennis Heimbigner
dc6e2ef447 Merge remote-tracking branch 'Unidata/master' 2020-07-15 10:36:38 -06:00
Edward Hartnett
088528987f fixed dispatch version number in CMakeLists.txt 2020-07-15 06:58:16 -06:00
bombipappoo
254308521a Fix format buffer size 2020-07-15 21:37:46 +09:00
Dennis Heimbigner
b3ec7140e1 Move closer to getting S3 support work with CMake under Visual
Studio. The code will build and all the tests will run except for the
S3 tests in nczarr_test.
2020-07-14 19:24:20 -06:00
Ward Fisher
cee0a9332d
Merge pull request #1759 from brianmckenna/CES_FCN
parse projection functions
2020-07-14 17:35:37 -06:00
Ward Fisher
03eeea5efc
Merge pull request #1794 from bombipappoo/filename-encoding
Convert filename from ANSI to UTF-8 before calling HDF5.
2020-07-14 16:31:53 -06:00
bombipappoo
ecbb0f5bbf Convert filename from ANSI to UTF-8 before calling HDF5. 2020-07-14 22:44:42 +09:00
Dennis Heimbigner
3fd367b2e1 Conditional malloc.h on Windows 2020-07-13 12:35:59 -06:00
Dennis Heimbigner
d538cf38c2 Fix nczarr-experimental to better support CMake and find AWS libraries
The primary fix is to improve CMake build support.
Specific changes include:
* CMake: Provide a better soln to locating the AWS SDK
  libraries; the new way is the preferred method as described in
  the aws-cpp-sdk documentation.
* CMake (and Automake): allow -DENABLE_S3_SDK (default off) to suppress
  looking for AWS libraries.
* CMake: add the complete set of nczarr tests
* CMake: add EXTERNL as needed to various .h files.
* Improve support for windows drive letters in paths.
* Add nczarr and s3 flags to nc-config
* For VisualStudio X nczarr, cleanup the NAN+INFINITY handling
* Convert _MSC_VER -> _WIN32 and vice versa as needed
* NCZarr - support multiple platform paths including windows, cygwin.
  mingw, etc.
* NCZarr - sort the test outputs because different platforms
  produce directory contents in different orders.

One big change concerns netcdf-c/CMakeLists.txt and netcdf-c/configure.ac.
In the current versions, it was the case that --disable-hdf5
disabled netcdf-4 (libsrc4). With nczarr, this can no longer
be the case because nczarr requires libsrc4 even if libhdf5
is disabled. So, I modified the above files to move the
format options (HDF5, NCZarr, HDF4, etc) to a single place
near the front of the files. Now it is the case that:
* Enabling any of the formats that require libsrc4
  also does an implicit --enable-netcdf4.
* --disable-netcdf4 | --disable-netcdf-4 now becomes
  and alias for --disable-hdf5.

There are probably some bugs in this change in terms of
dependencies between format options.

Problems:
* CMake S3 support is still not working for Visual Studio
* A recent issue points out that there is work to do on handling
  UTF8 filenames, but that will be addressed in a separate fix.

Notes:
* Consider converting all of our includes/.h files to use EXTERNL
2020-07-12 12:21:56 -06:00
bombipappoo
68f86b52c6 Correct destination buffer size to strlcat 2020-07-12 01:54:02 +09:00
Dennis Heimbigner
b75dd77a1f Merge remote-tracking branch 'Unidata/master' 2020-07-10 21:21:48 -06:00
Ward Fisher
3afce176ac
Merge pull request #1789 from gsjaardema/patch-44
Remove test since file was moved to nc_perf
2020-07-10 16:14:15 -06:00
Ward Fisher
8fbaf27ecb
Merge pull request #1790 from gsjaardema/patch-45
Protect use of `H5Dread_chunk` function
2020-07-10 16:06:41 -06:00
Greg Sjaardema
338ca2c212
Protect use of H5Dread_chunk function
The`H5Dread_chunk` function is only available if `HDF5_SUPPORTS_PAR_FILTERS` is defined (See CMakeLists.txt, line 745)  The function was added in HDF5-1.10.3
2020-07-10 15:27:54 -06:00
Greg Sjaardema
102758d3ce
Remove test since file was moved to nc_perf
In commit ba6ab3, the `tst_gfs_data_1.c` file was moved from `nc_test4` to `nc_perf`, but the test/executable that uses that file was not removed from nc_test4 CMakeLists.txt
2020-07-10 15:14:12 -06:00
Ward Fisher
57ea8f903d
Merge pull request #1788 from Unidata/NOAA-GSD-ejh_par_test
Noaa gsd ejh par test
2020-07-09 19:12:10 -06:00
Ward Fisher
0825c9767f Merge branch 'ejh_par_test' of https://github.com/NOAA-GSD/netcdf-c into NOAA-GSD-ejh_par_test 2020-07-09 17:29:45 -06:00