Commit Graph

7662 Commits

Author SHA1 Message Date
Dennis Heimbigner
4614690d61 Fix some additional edges cases for mapping slices to chunks
The code for mapping slices to chunks is wrong for some cases.
Fix code and add additional chunking tests to cover edge cases.
2020-12-19 21:17:46 -07:00
Ward Fisher
5e5b8f88da
Merge pull request #1914 from DennisHeimbigner/dupcode.dmh
Remove some potentially harmful duplicate code
2020-12-18 10:08:56 -07:00
Ward Fisher
5ef558169e
Merge pull request #1916 from gsjaardema/patch-46
Fix CMake build so netcdf_meta.h has correct form
2020-12-18 09:11:24 -07:00
Greg Sjaardema
143c191898
Fix CMake build so netcdf_meta.h has correct form
The `NC_HAS_MULTIFILTERS` line in `netcdf_meta.h` was not of the correct form  -- showed as
```
#define NC_HAS_MULTIFILTERS
```
Instead of the better form:
```
#define NC_HAS_MULTIFILTERS 0  (or 1 if enabled)
```
2020-12-17 16:13:39 -07:00
Dennis Heimbigner
b0990a24d5 Remove some potentially harmful duplicate code 2020-12-17 12:52:35 -07:00
Ward Fisher
c612db3b1a
Merge pull request #1913 from DennisHeimbigner/nczarr_misc.dmh
Additional Fixes to NCZarr
2020-12-17 10:35:01 -07:00
Dennis Heimbigner
6c9817b275 Update Release Notes 2020-12-16 21:47:38 -07:00
Dennis Heimbigner
d2316f866c Additional Fixes to NCZarr
Primary Fixes:
* Add a whole variable optimization -- used in the rare case that nc_get/put_vara covers the whole of a variable and the variable has a single chunk.
* Fix chunking error when stride causes whole chunks to be skipped.
* Fix some memory leaks
* Add test cases
* Add one performance test to nczarr_test/. This uses the timer utils from unit_test: timer_utils.[ch].
* Move ncdumpchunks utility from ncdump to nczarr_test

Misc. Other Changes:
* Make check for aws libraries conditional on --enable-nczarr-s3
* Remove all but one bm tests from nczarr_test until they are working.
* Remove another dependency on HDF5 from supposedly non-HDF5 specific code; specifically hdf5_log_hdf5.
* Make the BAIL2 macro be hdf5 specific and replace elsewhere with an HDF5 independent equivalent.
* Move hdf5cache.c to libsrc4/nc4cache.c because it is used by nczarr.
* Modify unit_tests so that some of them are run even if using Windows.
* Misc. small bug fixes and refactors and memory leaks.
* Rename some conflicting tests for cmake.
* Attempted to make nc_perf work with cmake and failed.
2020-12-16 20:48:02 -07:00
Ward Fisher
9a2c0efd14
Merge pull request #1912 from Unidata/gh-action.wif
Added an apt update stanza to the github action script.
2020-12-16 11:19:38 -07:00
Ward Fisher
bb2b864674 Added more updates 2020-12-16 09:34:42 -07:00
Ward Fisher
3e01272cee Added an apt update stanza to the github action script. 2020-12-16 09:19:21 -07:00
Ward Fisher
eba281a8d9
Merge pull request #1905 from Unidata/gh1740.wif
Fixing up PR 1740
2020-12-07 14:58:33 -07:00
Ward Fisher
66a2cd371a More tweaking. 2020-12-07 14:45:14 -07:00
Ward Fisher
3eec4d66cc Fix logic error. 2020-12-07 14:27:36 -07:00
Ward Fisher
6f5ba50881 tweak m4 detection. 2020-12-07 13:01:25 -07:00
Ward Fisher
6fafa6612c Merge remote-tracking branch 'origin/gh1739.wif' into gh1740.wif 2020-12-07 12:49:28 -07:00
Ward Fisher
b2924966b0
Merge pull request #1904 from Unidata/gh1753.wif
#1753 + Conflict Resolution
2020-12-07 12:44:49 -07:00
Ward Fisher
d58a21cb5f Removed dangling conflict info. 2020-12-07 12:18:30 -07:00
Ward Fisher
878866c039 Merge branch 'ncgenkw.dmh' of https://github.com/DennisHeimbigner/netcdf-c into gh1753.wif 2020-12-07 11:29:12 -07:00
Ward Fisher
e2e6f5f94b
Merge pull request #1903 from Unidata/gh1902.wif
PR #1902 + Github Actions
2020-12-07 11:21:40 -07:00
Ward Fisher
5fed325180 Cleaned up orphaned github action files, modified GA to run on PR instead of push. 2020-12-07 11:16:04 -07:00
Dennis Heimbigner
90fd1406bc Make use of clock_gettime be conditional.
Re: GH Issue https://github.com/Unidata/netcdf-c/issues/1900

Apparently the clock_gettime() function is not always available.
It is used in unit_test/tst_exhash.c and unit_test/tst_xcache.c.

To solve this, a number of things were changed:
* Move the timing code to a new file unit_tests/timer_utils.[ch]
* Modify the timing code to choose one of several timing methods
depending on availability. The prioritized order is as follows:
    1. If Windows, use the QueryPerformanceCounter mechanism else
    2. Use clock_gettime if available else
    3. Use gettimeofday if available else
    4. Use getrusage if available

Note that the resolution of 3 and 4 is less than 1 or 2.

Misc. Other Changes:
* Move the test in CMakeLists.txt that disables unit tests for WIN32 to unit_test/CMakeLists.txt since some unit tests actually work under Visual Studio.
* Fix some of the unit tests to work under visual studio
* Fix problem with using remove() in zmap_nzf.c
* Remove some warning about use of EXTERNL
2020-12-06 18:19:53 -07:00
Dennis Heimbigner
731d9bbb0b Merge remote-tracking branch 'Unidata/master' 2020-12-05 12:59:34 -07:00
Ward Fisher
4cf290dc0b
Merge pull request #1897 from DennisHeimbigner/oceanunavail.dmh
Disable use of opendap2.oceanbrowser.net
2020-12-04 16:11:47 -07:00
Ward Fisher
8caa2aa640
Merge pull request #1901 from Unidata/add-github-actions.wif
Add GitHub actions.wif
2020-12-04 16:11:25 -07:00
Ward Fisher
bfa8fde35e Temporarily disabled encoding test under cmake 2020-12-04 15:49:30 -07:00
Ward Fisher
7fce4b3482 Clean up, bring over a new action script. This one uses apt and cached builds instead of conda. 2020-12-04 15:38:13 -07:00
Ward Fisher
1814da1f7f Temporarily reducing test matrix. 2020-12-03 12:20:52 -07:00
Ward Fisher
04640abe32 Github Action debugging. 2020-12-03 12:12:07 -07:00
Ward Fisher
9b9ca97712 Explicitly link rt library for github actions. 2020-12-03 12:09:24 -07:00
Ward Fisher
d263a48637 Correct previous 'fix' that wasn't. 2020-12-03 12:03:34 -07:00
Ward Fisher
f48ccb465d Address link issue on github actions platform. 2020-12-03 11:59:25 -07:00
Ward Fisher
11bf6e81ca Merge branch 'master' into add-github-actions.wif 2020-12-03 11:40:40 -07:00
Dennis Heimbigner
2c71bf5d06 Merge remote-tracking branch 'Unidata/master' 2020-12-03 11:39:17 -07:00
Ward Fisher
74fbad49ea
Merge pull request #1895 from DennisHeimbigner/mergeerr.dmh
Fix merge error from previous PR
2020-12-03 11:13:17 -07:00
Dennis Heimbigner
4126ca218a unblock dmh appveyor 2020-12-02 18:17:07 -07:00
Dennis Heimbigner
bbb62e697a unblock .dmh 2020-12-02 16:51:14 -07:00
Dennis Heimbigner
c797eb29ad remove worflows and fix ifdef 2020-12-02 16:36:09 -07:00
Dennis Heimbigner
6f72cec65e opendap2.oceanbrowser.net is temporarily unavailable 2020-12-02 11:18:54 -07:00
Dennis Heimbigner
4a5e228bfd update file permission 2020-12-01 22:17:07 -07:00
Dennis Heimbigner
af89295852 ignore 2020-12-01 22:09:13 -07:00
Dennis Heimbigner
5b8842b373
manual.yml 2020-12-01 22:06:16 -07:00
Dennis Heimbigner
62036cbf45
ignore.yml 2020-12-01 22:01:44 -07:00
Dennis Heimbigner
8cf8c31df4
automake-dmh.yml 2020-12-01 21:59:52 -07:00
Dennis Heimbigner
c164650cb6 rename 2020-12-01 21:58:10 -07:00
Dennis Heimbigner
6cdddd7596 update workflows 2020-12-01 21:53:33 -07:00
Dennis Heimbigner
0aa80f91d6 manual workflow 2020-12-01 21:48:39 -07:00
Dennis Heimbigner
3b704d0635 Fix minor Makefile.am warning 2020-12-01 20:26:34 -07:00
Dennis Heimbigner
e1c470683c Fix merge error from PR https://github.com/Unidata/netcdf-c/pull/1892/files 2020-12-01 20:10:48 -07:00
Ward Fisher
c96722e001
Merge pull request #1890 from gsjaardema/patch-46
Fix undefined struct member access
2020-12-01 14:41:27 -07:00