Commit Graph

7288 Commits

Author SHA1 Message Date
Greg Sjaardema
8d7d5ac9e5
Different method of setting Parallel Filters variables
The current method of setting the `HDF5_HAS_PAR_FILTERS` and `HAS_PAR_FILTERS` variables is done purely based on the `HDF5_VERSION` and that variable is only set inside the if block which finds the HDF5 library based on CMake package files.  If the user specifies the explicit location of the HDF5 library and include files (for example, via:
```
         -DHDF5_C_LIBRARY:PATH=${INSTALL_PATH}/lib/libhdf5.${LD_EXT} \
         -DHDF5_HL_LIBRARY:PATH=${INSTALL_PATH}/lib/libhdf5_hl.${LD_EXT} \
         -DHDF5_INCLUDE_DIR:PATH=${INSTALL_PATH}/include
```
Then, the code path which determines whether the par filters variables is set is not run.  However, later on in the file, there is another check for parallel filter support (near line 759):
```
  # Check to see if this is hdf5-1.10.3 or later.
  CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Dread_chunk "" HDF5_SUPPORTS_PAR_FILTERS)
```

This PR moves the code that sets the two other par filters variables down after this check and instead of setting their values based on the version, it bases it on the results of this test.

I'm not totally sure why there are three variables; it looks like the `HDF5_SUPPORTS_PAR_FILTERS` and `HDF5_HAS_PAR_FILTERS` could be combined.  I think the `HAS_PAR_FILTERS` is a string which is used to show the results of the configuration and the other two are booleans.

The new check should work for both types of HDF5 installs (cmake-based and configure-based)
2020-05-11 11:11:24 -06:00
Ward Fisher
b490c457e9
Merge pull request #1717 from NOAA-GSD/ejh_cache
now properly setting HDF5 file cache for files created/opened sequentially on parallel I/O builds
2020-05-08 15:00:45 -06:00
Edward Hartnett
1fb8d161ce updated RELEASE_NOTES 2020-05-08 11:12:47 -06:00
Edward Hartnett
1267358e9b whitespace cleanup 2020-05-08 11:11:56 -06:00
Edward Hartnett
7414880060 updated RELEASE_NOTES 2020-05-08 11:03:25 -06:00
Edward Hartnett
6aa6eff710 now properly setting HDF5 file cache for files created/opened sequentially on parallel IO builds 2020-05-08 11:00:56 -06:00
Edward Hartnett
e3c9e83ecf adding internal function, plus some documentation 2020-05-08 08:58:42 -06:00
Ward Fisher
2a78af1115
Merge pull request #1716 from Unidata/stand-alone-doxygen.wif
Added a stand-alone user level doxygen configuration file
2020-05-07 16:48:09 -06:00
Ward Fisher
31654e650b Added a stand-alone user level doxygen configuration file. It must be used from the top-level netcdf-c directory, e.g. doxygen docs/Doxyfile.user. 2020-05-07 16:23:43 -06:00
Ward Fisher
4bd52474f0
Merge pull request #1714 from NOAA-GSD/ejh_deflate
added demonstration of nc_def_var_deflate() issue
2020-05-07 15:47:40 -06:00
Edward Hartnett
2e2f3e7d29 added demonstration of nc_def_var_deflate() issue 2020-05-07 07:08:52 -06:00
Ward Fisher
524bdd5224
Merge pull request #1698 from DennisHeimbigner/dispnoop.dmh
Support no-op dispatch functions
2020-05-04 13:39:06 -06:00
Dennis Heimbigner
91060e9362 Remove RELEASE_NOTES.md conflict 2020-05-01 20:48:38 -06:00
Ward Fisher
aa0b0db6b3
Merge pull request #1709 from gsjaardema/patch-39
Proof-of-Concept:  Avoid N^2 behavior in NC4_inq_dim
2020-04-30 16:11:29 -06:00
Greg Sjaardema
3e919a568f
Remove line that was missed in original patch 2020-04-30 14:00:18 -06:00
Greg Sjaardema
1db3d07beb
Proof-of-Concept: Avoid N^2 behavior in NC4_inq_dim
The current library seems to have some behavior which is N^2 in the number of vars in a file.

The `NC4_inq_dim` routine calls down to `nc4_find_dim_len` which iterates through each `var` in the file/group and calls `find_var_dim_max_length` on each var and finds the largest length of the dim on each of those vars. This is done only for unlimited vars.

I have a file with 129 dim and 1630 vars.  The unlimited dimension is of length 41.  In my test program, I am reading data from 4 files which have the same dim and var count and reading every 4th time step (unlimited dimension).  If I run a profile, I see that 98.2% of the program time is in the `nc_get_vara_float` call tree and most of that is in `find_var_dim_max_length` (94.8%).

There are 66,142 calls to `nc_get_vara_float` resulting in 107,307,290 calls to `find_var_dim_max_length` with twice that number of calls to `malloc/free` and calls to 5 HDF5 routines.  All of this, at least in my case, to return the same `41` each time.

The proof of concept patch here will check whether the file is read-only (or no_write) and if so, it will cache the value of the dim length the first time it is calculated.   With this change, my example run is sped up by a factor of 60.  The time for `NC4_inq_dim` and below drops from 97.2% down to 2.7%.

I'm not sure whether this is the correct fix, or if there is some behavior that I am overlooking, but my users would definitely like a 10 second run compared to a 10 minute run... 

This is on current Netcdf master branch.

I will try to attach some valgrind/callgrind profiles.
2020-04-30 11:01:10 -06:00
Ward Fisher
9393fd6fbc
Merge pull request #1707 from Unidata/ncdump-annotate-error.wif
Correcting a formatting error for scalars when dumping with ncdump -f
2020-04-28 16:36:40 -06:00
Ward Fisher
2417b973e4 Updated release notes. 2020-04-28 15:52:40 -06:00
Ward Fisher
ffa30d21c2 Correcting a formatting error for scalars when dumping with ncdump -f 2020-04-28 15:49:03 -06:00
Ward Fisher
3a9c192a83
Merge pull request #1703 from mhnsn/patch-1
Correcting dead link to installation
2020-04-27 15:56:09 -06:00
Ward Fisher
d772543a9b
Merge branch 'master' into dispnoop.dmh 2020-04-27 15:54:22 -06:00
Mark Hansen
70912ea830
Correcting dead link to installation 2020-04-24 16:44:07 -06:00
Ward Fisher
1d2fca9813
Merge pull request #1702 from brtnfld/master
Update H5Gget_objinfo and H5Dvlen_reclaim to newer HDF5 APIs
2020-04-24 14:38:54 -06:00
Scot Breitenfeld
1a6228f17f fixed missing declaration 2020-04-23 23:32:29 -05:00
Scot Breitenfeld
7b1b06b5ca Merge remote-tracking branch 'upstream/master' 2020-04-23 15:36:14 -05:00
Ward Fisher
525ab4c6c8
Merge pull request #1697 from NOAA-GSD/ejh_not_on
add test for nc_inq_var_chunking on classic files
2020-04-15 17:18:09 -06:00
Dennis Heimbigner
260d318d82 Update release notes 2020-04-15 15:48:44 -06:00
Dennis Heimbigner
f0cd7f8ec1 Support no-op dispatch functions
re: https://github.com/Unidata/netcdf-c/issues/1693

1. Add functions to libdispatch/dnotnc4.c to support
   dispatch table operations that should work for any
   dispatch table, even if they do not do anything.
   Functions such as nc_inq_var_filter.
2. Modify selected dispatch tables to utilize
   the noop functions.
3. Extend nc_test/tst_formats.c to test.

This is an extension of Ed's work to do this for
chunking and deflate and szip. See PRs
https://github.com/Unidata/netcdf-c/pull/1697
and
https://github.com/Unidata/netcdf-c/pull/1692

As a side effect, elide libdispatch/dnotnc3.c since
it is no longer used.
2020-04-15 14:44:58 -06:00
Edward Hartnett
4cdb6596b6 whitespace cleanup of test 2020-04-15 06:10:12 -06:00
Edward Hartnett
b9e16129c6 more testing after enddef 2020-04-15 06:07:27 -06:00
Edward Hartnett
2dda52efc9 checking nc_inq_var_chunking() with classic formats 2020-04-15 05:59:27 -06:00
Edward Hartnett
9ac441ad6a cleanup 2020-04-15 05:53:59 -06:00
Ward Fisher
a8732ca1e5
Merge pull request #1681 from neok-m4700/patch-1
Fix build bug in debug mode
2020-04-10 14:40:23 -06:00
Ward Fisher
867f8b5f20
Merge pull request #1695 from DennisHeimbigner/verifyhost.dmh
Use proper CURLOPT values for VERIFYHOST and VERIFYPEER
2020-04-10 14:39:43 -06:00
Dennis Heimbigner
313121a229 Use proper CURLOPT values for VERIFYHOST and VERIFYPEER
re: https://github.com/Unidata/netcdf-c/issues/1684
re: e-support VZL-904142

Two issues:
1. As of libcurl 7.66, the semantics of CURLOPT_SSL_VERIFYHOST
   changed so that the non-zero values affects certificate processing.
2. The current library was forcing the values of VERIFYPEER
   and VERIFYHOST to zero instead of leaving them to the default values.

Solution was first to leave the defaults in place for VERIFYPEER and VERIFYHOST
as long as they are not set in .ocrc/.dodsrc file.
Second, the value of HTTP.SSL.VERIFYPEER or HTTP.SSL.VERIFYHOST
as set in .ocrc/.dodrc is used to set the corresponding CURLOPT flags.
So for example, adding
> HTTP.SSL.VERIFYHOST=2
will set the value of CURLOPT_SSL_VERIFYHOST to 2, the default.
Using
> HTTP.SSL.VERIFYHOST=0
will set the value of CURLOPT_SSL_VERIFYHOST to 0, which disables it.
Similarly for VERIFYPEER.

Finally the semantics of HTTP.SSL.VALIDATE is now equivalent to
> HTTP.SSL.VERIFYPEER=1
> HTTP.SSL.VERIFYHOST=2
2020-04-10 13:42:27 -06:00
Ward Fisher
5a7cf26155
Merge pull request #1692 from NOAA-GSD/ejh_fix_nc3_deflate
now testing that nc_inq_var_deflate()/nc_inq_var_szip() work for all formats and returns settings consistent with no compression in use
2020-04-08 16:16:25 -06:00
Edward Hartnett
db8abfcc5e now testing nc_inq_var_deflate/nc_inq_var_szip after enddef too 2020-04-08 09:16:02 -06:00
Edward Hartnett
b76a0c8521 documentation improvements 2020-04-08 09:12:19 -06:00
Edward Hartnett
7366edb43f documentation improvements 2020-04-08 09:10:42 -06:00
Edward Hartnett
58e5d53e96 documentation improvements 2020-04-08 09:09:46 -06:00
Edward Hartnett
41ea23a8ac
Merge branch 'master' into ejh_fix_nc3_deflate 2020-04-08 08:54:50 -06:00
Edward Hartnett
1c189b2c56 dealing with nc_inq_var_szip(), testing, and release notes 2020-04-08 08:49:04 -06:00
Edward Hartnett
c3e415c7f0 updated release notes 2020-04-08 08:34:55 -06:00
Edward Hartnett
aab2f998b3 now testing that nc_inq_var_deflate() works for all formats and returns 0 deflate and deflate_level 2020-04-08 08:31:53 -06:00
Ward Fisher
b51767ebd4
Merge pull request #1688 from DennisHeimbigner/byteswap.dmh
Fix missing forward declarations
2020-04-07 16:05:05 -06:00
Dennis Heimbigner
3003e0b777 Update RELEASE_NOTES.md 2020-04-06 19:17:42 -06:00
Dennis Heimbigner
6f86660da8 Fix missing forward declarations
re: issue https://github.com/Unidata/netcdf-c/issues/1687

static functions are being used before decl and it causes
errors. Only occurs when BIG_ENDIAN is defined.
Solution is to add the forward declarations.
2020-04-03 20:15:34 -06:00
Ward Fisher
03b3b89097
Merge pull request #1686 from Unidata/mpich32_failure.wif
Fix CMake logic for Testing MPI-based builds
2020-04-02 16:03:16 -06:00
Ward Fisher
65a17399b9 Corrected parallel (mpi) testing on cmake builds. 2020-04-02 10:09:57 -06:00
Ward Fisher
b0e2d78ffa Corrected an issue with parallel filter test logic in cmake-based builds. 2020-04-01 17:08:24 -06:00