Commit Graph

6510 Commits

Author SHA1 Message Date
Dennis Heimbigner
c9d16d82d6 Fix cmake X mmap
supercede PR: https://github.com/Unidata/netcdf-c/pull/1384

Since we have an mmap user, undeprecate it and make sure
it works. Other changes:

* fix test cases to work with make -j
* fix exposed ncgen error.
2019-04-19 20:32:26 -06:00
Ward Fisher
48cc56ea38
Merge pull request #1383 from Unidata/gh1360.wif
Bring behavior of nc-config in line with pkgconfig --libs --static netcdf
2019-04-19 16:43:11 -06:00
Ward Fisher
038bebfead
Merge pull request #1361 from Unidata/simpleprov.dmh
Simplify libhdf5/nc5info.c to move to avoid parsing
2019-04-19 15:35:01 -06:00
Dennis Heimbigner
2eb1a8d8cf For some reason, the code for this was incorrect.
Anyway, I repaired it as follows:
1. Created NC4_write_provenance as parallel to NC4_read_provenance
2. Modified hdf5file.c to use NC4_write_provenance
3. Modified hdf5open.c to use NC4_read_provenance (was NC4_read_ncproperties).
4. The creation of the _NCProperties string was seriously hosed:
   was using all the wrong fields.
2019-04-18 14:23:20 -06:00
Ward Fisher
c776039eba Updated call to NC4_read_provenance. 2019-04-18 10:53:16 -06:00
Ward Fisher
8421dccbf0 Fixed line return issue. 2019-04-08 15:05:26 -06:00
Ward Fisher
3ec310829a Updating template files for nc-config in support of https://github.com/Unidata/netcdf-c/issues/1360. Still have a linebreak to deal with to bring this into line with the behavior of pkgconfig, currently nc-config --libs --static will print two separate lines. 2019-04-08 14:46:08 -06:00
Ward Fisher
6446ff37c5
Merge pull request #1368 from jschueller/mingw
Fix MinGW build
2019-04-03 17:32:22 -06:00
Ward Fisher
0fd5a9f0a4
Merge pull request #1378 from Unidata/cleanup.wif
Minor Maintenance PR
2019-04-02 13:45:06 -06:00
Ward Fisher
832c90bb56 Merge branch 'master' into cleanup.wif 2019-04-02 10:44:51 -06:00
Ward Fisher
d0a46d0eed
Merge pull request #1371 from NetCDF-World-Domination-Council/ejh_move_perf
Move performance testing from nc_test4 to new directory nc_perf
2019-04-01 11:08:13 -06:00
Ward Fisher
3823307b9e Disable run_par_test2.sh.in template processing code temporarily. 2019-03-26 15:38:22 -06:00
Ward Fisher
752a040bb0 Merge branch 'master' into cleanup.wif 2019-03-26 15:33:40 -06:00
Ward Fisher
7addb30afd
Merge pull request #1367 from jschueller/patch-1
Fix STRNG typo in CMakeList
2019-03-26 15:33:00 -06:00
Ward Fisher
0810d00511
Merge pull request #1377 from Unidata/ansifileno.dmh
Fix minor --ansi warnings in dinfermodel.c and bzlib.c
2019-03-26 15:31:47 -06:00
Ward Fisher
0b292063b3 Merge branch 'master' into cleanup.wif 2019-03-26 14:28:34 -06:00
Ed Hartnett
d4ab03ea23 merged upstream/master 2019-03-26 11:29:01 -06:00
Ward Fisher
85b94a4244
Merge pull request #1364 from NetCDF-World-Domination-Council/ejh_non_contoversial
non controversial parts of last PR
2019-03-26 11:14:33 -06:00
Dennis Heimbigner
4026323383 Fix minor --ansi warnings in dinfermodel.c and bzlib.c
re:

Needed to provide centralized definitions of fileno and fdopen;
also need to #include sys/types.h
2019-03-22 15:16:47 -06:00
Ward Fisher
5ee026f843 Cleaned up some errant conflict resolution fenceposting. 2019-03-21 15:56:27 -06:00
Ward Fisher
b20dd7df9d Removed a redundant check 2019-03-21 15:31:01 -06:00
Ward Fisher
f6b1e83fbc Only check for szlib if HDF5 requires it. 2019-03-21 15:25:20 -06:00
Ward Fisher
275516e32f Correct typo in CMakeLists.txt 2019-03-21 14:47:03 -06:00
Ward Fisher
cb7bec8dbc Merge branch 'master' into cleanup.wif 2019-03-21 14:39:57 -06:00
Ed Hartnett
e7d0a7b671 change to trigger CI 2019-03-21 13:35:49 -06:00
Ward Fisher
a25236eac4
Merge pull request #1348 from Unidata/pluginst.dmh
Support installation of the bzip2 plugin under name libh5bzip2.so
2019-03-20 15:42:06 -06:00
Ed Hartnett
54eb9dad77
Merge branch 'master' into ejh_non_contoversial 2019-03-19 14:16:52 -06:00
Ward Fisher
6b470b2c37
Merge pull request #1267 from Unidata/byterange.dmh
Provide byte-range reading of remote datasets
2019-03-19 14:03:57 -06:00
Ward Fisher
e2b31ffae4
Merge branch 'master' into byterange.dmh 2019-03-19 12:05:44 -06:00
Ward Fisher
3de2cf3d55
Merge pull request #1346 from wkliao/nc_mpiio
move checking for flag conflict to nc_create_par
2019-03-19 12:04:38 -06:00
Ed Hartnett
f5aeef50b3 removed dependcancy on nc_test4/tst_files output for nc_perf/tst_files2.c 2019-03-18 12:16:42 -06:00
Ed Hartnett
5c1c7b3713 turned on run_tst_chunks3 2019-03-18 11:29:04 -06:00
Ed Hartnett
d709624174 now run tst_put_vars_two_unlim_dim 2019-03-18 11:16:44 -06:00
Ed Hartnett
8799fff54b cleanup Makefile.am 2019-03-18 11:09:44 -06:00
Ed Hartnett
06c9f681f4 got distcheck target working 2019-03-18 10:15:18 -06:00
Ed Hartnett
daf2be5649 working on distcheck target 2019-03-18 09:46:50 -06:00
Ed Hartnett
e8869624b2 further work on distcheck target 2019-03-18 08:51:26 -06:00
Ed Hartnett
94d9cd7c8f don't allow benchmarks for classic only builds 2019-03-18 08:40:18 -06:00
Ed Hartnett
e3c628482e moving metadata performance tests to nc_perf 2019-03-18 08:30:14 -06:00
Ed Hartnett
5c06d40006 attempting to get cmake build working with new nc_perf directory 2019-03-18 08:15:57 -06:00
Ed Hartnett
9d546bfdab attempting to get cmake build working with new nc_perf directory 2019-03-18 08:12:43 -06:00
Ed Hartnett
9c2e2b2268 attempting to get cmake build working with new nc_perf directory 2019-03-18 08:09:56 -06:00
Ed Hartnett
51b8ba10b4 attempting to get cmake build working with new nc_perf directory 2019-03-18 08:09:46 -06:00
Ed Hartnett
43034c7b97 fixing distcheck issues 2019-03-17 11:38:27 -06:00
Ed Hartnett
d97c8b535f fixing distcheck issues 2019-03-17 11:36:32 -06:00
Ed Hartnett
cf7126b294 fixing distcheck issues 2019-03-17 11:17:29 -06:00
Ed Hartnett
e48bd5e4c2 removed benchmarking stuff from nc_test4/Makefile.am 2019-03-17 10:57:45 -06:00
Ed Hartnett
286dddac4b moved many other benchmark tests to nc_perf 2019-03-17 10:57:00 -06:00
Ed Hartnett
95a0b8ddfb moved other benchmark programs to nc_perf 2019-03-17 08:30:06 -06:00
Ed Hartnett
e391a9b41f moved bm_file.c 2019-03-17 08:19:17 -06:00