Commit Graph

5384 Commits

Author SHA1 Message Date
Dennis Heimbigner
2f1daaa61e Merge branch 'master' into vars.dmh 2018-05-30 10:45:00 -06:00
Ed Hartnett
011e85cea4 merge ejh_par_tests 2018-05-30 05:06:25 -06:00
Ed Hartnett
3949bd61bc merge ejh_par_leak 2018-05-30 05:03:42 -06:00
Ed Hartnett
5ac7df7ae1 merge ejh_more_tests 2018-05-30 05:01:19 -06:00
Ed Hartnett
fcc6091600 merged ejh_test_def_var_extra 2018-05-30 04:59:10 -06:00
Ed Hartnett
6992295ef7 getting windows build working 2018-05-30 04:31:15 -06:00
Ed Hartnett
dbacd00c9c fixing windows build problem, plus documentation 2018-05-30 03:29:19 -06:00
Ed Hartnett
aa4032a4f1 merged upstream master 2018-05-30 02:51:32 -06:00
Ed Hartnett
39ad753a3b trying to get UDF working for windows 2018-05-30 02:50:09 -06:00
Ed Hartnett
c5c84645d0 merged master 2018-05-30 02:33:12 -06:00
Ward Fisher
d4332040c4
Merge pull request #1005 from Unidata/misc-changes.wif
Misc changes.wif
2018-05-29 21:37:20 -06:00
Ward Fisher
84fd054a29 Merge branch 'ejh_hdf5_3' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into misc-changes.wif 2018-05-29 15:39:09 -06:00
Ward Fisher
a5ea8411d6 Merge branch 'ejh_comm_info' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into misc-changes.wif 2018-05-29 15:18:27 -06:00
Ed Hartnett
5b56e66096 removed changes to nc4hdf5.c 2018-05-24 15:26:17 -06:00
Ed Hartnett
e0f92efaa2 fixed logging 2018-05-24 14:55:34 -06:00
Ed Hartnett
d26df3fb27 comment cleanup 2018-05-24 14:43:00 -06:00
Ed Hartnett
f2cb4678ee moving HDF5 functions to libhdf5 2018-05-24 14:27:16 -06:00
Ed Hartnett
0c0da02b49
Merge branch 'master' into ejh_comm_info 2018-05-24 13:39:42 -06:00
Ward Fisher
4283b791b5 Misc changes to appveyor testing. 2018-05-24 13:16:56 -06:00
Ward Fisher
491b96066c
Merge pull request #980 from NetCDF-World-Domination-Council/ejh_hdf5_2
more progress towards separating HDF5 code from libsrc4 code
2018-05-24 13:13:27 -06:00
Dennis Heimbigner
ee509ff4f3 Re-Implement the nc_get/put_vars operations for netcdf-4 using the
corresponding HDF5 operations.

re: github issue https://github.com/Unidata/netcdf-c/issues/908
also in reference to https://github.com/pydata/xarray/issues/2004

The netcdf-c library has implemented the nc_get_vars and nc_put_vars
operations as element at a time. This has resulted in very slow
operation.

This pr attempts to improve the situation for netcdf-4/hdf5 files
by using the slab operations provided by the hdf5 library. The new
implementation passes the get/put vars stride information down to
the hdf5 slab operations.

The result appears to improve performance significantly. Some simple
tests on large 2-D arrays shows speedups in excess of 150.

Misc. other changes:
1. fix bug in ncgen/semantics.c; using a list's allocated length
   instead of actual length.
2. Added a temporary hook in the netcdf library plus a performance
   test case (tst_varsperf.c) to estimate the speedup. After users
   have had some experience with this, I will remove it, probably
   after the 4.7 release.
2018-05-22 16:50:52 -06:00
Ed Hartnett
59f9a0c4f0
Merge branch 'master' into ejh_hdf5_2 2018-05-22 07:19:23 -06:00
Ed Hartnett
7a18d361fb
Merge branch 'master' into ejh_udf 2018-05-22 07:19:10 -06:00
Ward Fisher
9440132bf6
Merge branch 'master' into ejh_streq 2018-05-21 15:06:57 -06:00
Ward Fisher
2a9eaffd67
Merge pull request #619 from Unidata/dapparams.dmh
Alias stringlength url parameter and maxstrlen
2018-05-21 13:36:29 -06:00
Dennis Heimbigner
02bd33f250 Merge branch 'dapparams.dmh' of https://github.com/Unidata/netcdf-c into dapparams.dmh 2018-05-19 16:11:24 -06:00
Dennis Heimbigner
5fc6be9472 Code duplicated; merge failure? 2018-05-18 20:28:51 -06:00
Ed Hartnett
e4bed351c3
Merge branch 'master' into ejh_hdf5_2 2018-05-18 17:15:25 -06:00
Ed Hartnett
4a443d1d76
Merge branch 'master' into ejh_comm_info 2018-05-18 17:15:06 -06:00
Ed Hartnett
a0a8dc6204
Merge branch 'master' into ejh_udf 2018-05-18 17:14:29 -06:00
Ed Hartnett
f4a9b26683
Merge branch 'master' into ejh_more_testing 2018-05-18 17:14:08 -06:00
Ed Hartnett
1bd08591a6
Merge branch 'master' into ejh_logging 2018-05-18 17:13:52 -06:00
Ed Hartnett
e63f8ff9bf
Merge branch 'master' into ejh_streq 2018-05-18 17:13:29 -06:00
Ed Hartnett
43b06e1c2f
Merge branch 'master' into ejh_fix_user_type 2018-05-18 17:13:12 -06:00
Ward Fisher
30d41fa44a
Merge branch 'master' into dapparams.dmh 2018-05-18 14:27:55 -06:00
Ed Hartnett
29427ef3ec
Merge branch 'master' into ejh_comm_info 2018-05-18 05:32:53 -06:00
Ed Hartnett
fb6d19c3bb
Merge branch 'master' into ejh_hdf5_2 2018-05-18 05:32:09 -06:00
Ed Hartnett
fedd8d0f5d
Merge branch 'master' into ejh_udf 2018-05-18 05:31:27 -06:00
Ed Hartnett
13d0b9022c
Merge branch 'master' into ejh_more_testing 2018-05-18 05:31:03 -06:00
Ed Hartnett
b3fa2d430b
Merge branch 'master' into ejh_logging 2018-05-18 04:44:12 -06:00
Ed Hartnett
3de9bdd86e
Merge branch 'master' into ejh_streq 2018-05-18 04:43:43 -06:00
Ed Hartnett
1a88589ca7
Merge branch 'master' into ejh_fix_user_type 2018-05-18 04:43:24 -06:00
Ward Fisher
61a6c0c183
Merge branch 'master' into cleanncgen.dmh 2018-05-17 12:41:03 -06:00
Ward Fisher
5bd8992ff6
Merge pull request #988 from NetCDF-World-Domination-Council/ejh_clean
removed unused function
2018-05-17 12:40:41 -06:00
Ed Hartnett
7d117cc0ce removed more dead code 2018-05-17 05:58:57 -06:00
Ed Hartnett
7f4717bf97 removed more dead code 2018-05-17 05:58:46 -06:00
Ed Hartnett
bab5ef7549 fixed printf statement 2018-05-17 05:53:10 -06:00
Ed Hartnett
df60e5917a added test 2018-05-17 05:50:30 -06:00
Ed Hartnett
6c6c86ef96 added tests, cleaned up test 2018-05-17 05:45:51 -06:00
Ed Hartnett
b03277caea
Merge branch 'master' into ejh_streq 2018-05-17 04:26:59 -06:00