Commit Graph

944 Commits

Author SHA1 Message Date
Kyle Shores
f9e3247164 merging main, addressing some PR comments 2024-02-07 09:53:45 -06:00
Ward Fisher
e528c8b617
Merge pull request #2774 from ZedThree/export-targets-for-build-dir
CMake: Export targets so the build directory can be used directly
2024-02-06 11:18:20 -07:00
Greg Sjaardema
fc76a5a170
Minor -- fix UNset to unset
The #2842 PR changed most CMake keywords to lowercase, but missed (a portion) of the UNSET commands which were changed to `UNset`.  This follows on to that and pushes them all the way to `unset`
2024-02-01 12:37:06 -07:00
Kyle Shores
e31d535bed removing some compile things 2024-01-26 14:44:19 -06:00
Kyle Shores
5cd1f4e9b1 leaving HAVE_CONFIG_H as top level definition for now 2024-01-26 14:28:16 -06:00
Kyle Shores
d816309e53 targeting netcdf for compile definitions 2024-01-26 13:56:19 -06:00
Kyle Shores
207a70ef9a undoing packaging 2024-01-26 13:51:19 -06:00
Kyle Shores
ca182c0979 using target_sources 2024-01-26 13:29:38 -06:00
Peter Hill
25dc1faa60
Merge branch 'main' into export-targets-for-build-dir
* main: (110 commits)
  Escape a character causing a doxygen error.
  Updated release notes.
  Added a comment block for future reference.
  more syntax fixes
  Update CMakeLists.txt
  CMake: Find HDF5 header we can safely include for other checks
  moving functions and macros to new file, lowercase things
  Update release notes.
  lowercase
  lower case
  lowercase
  moving functions and macros to a file
  moving the dependencies inclusion
  CMake: Add support for UNITY_BUILD
  removing debug messages
  actually adding the dependencies file...
  putting dependencies into separate file
  Define USE_SZIP variable for nc-config.cmake.in
  matching cmake variables in autotools configuration
  moving the version into the project command in cmake
  ...
2024-01-24 11:26:44 +00:00
Peter Hill
3c59bf6f54
CMake: Tidy exporting targets
Fixes comments from review
2024-01-24 11:20:08 +00:00
Kyle Shores
887c479533 setting up packaging in its own directory, using netcdf as a target for compile options 2024-01-19 09:25:24 -06:00
Kyle Shores
05ce85be78 more syntax fixes 2024-01-18 15:07:13 -06:00
Kyle Shores
a40c7847f9
Update CMakeLists.txt
Co-authored-by: Peter Hill <zed.three@gmail.com>
2024-01-18 15:02:48 -06:00
Kyle Shores
5e487fd381 lowercase 2024-01-17 16:07:22 -06:00
Kyle Shores
e7c7221f28 moving functions and macros to a file 2024-01-17 15:17:50 -06:00
Kyle Shores
656fdbb374 moving the dependencies inclusion 2024-01-16 11:20:43 -06:00
Kyle Shores
2f794b7e7f merging main 2024-01-10 16:16:49 -06:00
Kyle Shores
330f911ecf removing debug messages 2024-01-10 16:12:04 -06:00
Kyle Shores
ca850af099 actually adding the dependencies file... 2024-01-10 16:11:00 -06:00
Kyle Shores
efc20c64d2 putting dependencies into separate file 2024-01-10 15:18:15 -06:00
Kyle Shores
e995c2e696 moving the version into the project command in cmake 2024-01-05 10:06:32 -06:00
Ward Fisher
489d978f63
Merge pull request #2595 from johnwparent/import-mpi-dep-on-export
CMake: Add improvements to MPI support
2023-12-12 13:57:20 -07:00
Ward Fisher
61c9a8641d Fix cmake syntax typo. 2023-12-12 10:06:55 -07:00
Ward Fisher
ed90d50078 Typo fix in support of gh2824.wif 2023-12-12 10:04:18 -07:00
Ward Fisher
8d422704ec Replace exec_program with execute_process 2023-10-27 12:20:46 -06:00
Ward Fisher
a5d15a5857
Merge pull request #2776 from ZedThree/cmake-optional-uninstall-target
CMake: Don't add uninstall target and CPack config if not top-level
2023-10-27 10:58:34 -06:00
Peter Hill
b41b79a8e5
CMake: Add backport of PROJECT_IS_TOP_LEVEL for CMake <3.21 2023-10-25 11:50:07 +01:00
Ward Fisher
d476629704 Replace accidental flag removal 2023-10-24 13:16:11 -06:00
Ward Fisher
347b2504bf Undo previous change. 2023-10-24 13:15:12 -06:00
Ward Fisher
dcad99082d Remove sensitive info being sent to standard output when using ctest scripts. 2023-10-24 11:13:04 -06:00
Peter Hill
523c648e5d
CMake: Don't add uninstall target and CPack config if not top-level
Fixes #2597
2023-10-23 10:20:29 +01:00
Peter Hill
5ee66e87ac
CMake: Export targets so the build directory can be used directly 2023-10-20 17:47:18 +01:00
Ward Fisher
17a7577701 Revert a change made in d3c2cf236 that is proving confounding in MSYS2-based bash environments. 2023-10-09 10:51:13 -06:00
Ward Fisher
b62da98420
Merge pull request #2757 from ZedThree/cmake-fix-hdf5-zlib-check
CMake: Change header in check for HDF5 zlib/szip support
2023-10-02 16:22:55 -06:00
Peter Hill
b6cb581cec
CMake: Change header in check for HDF5 zlib/szip support
H5public.h might require MPI headers which we haven't found at this
point

Fixes #2742
2023-10-02 10:13:26 +01:00
Ward Fisher
3c013ce342 Merged in current state of https://github.com/Unidata/netcdf-c/pulls/2741 2023-09-29 15:05:43 -06:00
Dennis Heimbigner
2bb6013dfd Update S3 subtree 2023-09-27 18:53:45 -06:00
Dennis Heimbigner
df3636b959 Mitigate S3 test interference + Unlimited Dimensions in NCZarr
This PR started as an attempt to add unlimited dimensions to NCZarr.
It did that, but this exposed significant problems with test interference.
So this PR is mostly about fixing -- well mitigating anyway -- test
interference.

The problem of test interference is now documented in the document docs/internal.md.
The solutions implemented here are also describe in that document.
The solution is somewhat fragile but multiple cleanup mechanisms
are provided. Note that this feature requires that the
AWS command line utility must be installed.

## Unlimited Dimensions.
The existing NCZarr extensions to Zarr are modified to support unlimited dimensions.
NCzarr extends the Zarr meta-data for the ".zgroup" object to include netcdf-4 model extensions. This information is stored in ".zgroup" as dictionary named "_nczarr_group".
Inside "_nczarr_group", there is a key named "dims" that stores information about netcdf-4 named dimensions. The value of "dims" is a dictionary whose keys are the named dimensions. The value associated with each dimension name has one of two forms
Form 1 is a special case of form 2, and is kept for backward compatibility. Whenever a new file is written, it uses format 1 if possible, otherwise format 2.
* Form 1: An integer representing the size of the dimension, which is used for simple named dimensions.
* Form 2: A dictionary with the following keys and values"
   - "size" with an integer value representing the (current) size of the dimension.
   - "unlimited" with a value of either "1" or "0" to indicate if this dimension is an unlimited dimension.

For Unlimited dimensions, the size is initially zero, and as variables extend the length of that dimension, the size value for the dimension increases.
That dimension size is shared by all arrays referencing that dimension, so if one array extends an unlimited dimension, it is implicitly extended for all other arrays that reference that dimension.
This is the standard semantics for unlimited dimensions.

Adding unlimited dimensions required a number of other changes to the NCZarr code-base. These included the following.
* Did a partial refactor of the slice handling code in zwalk.c to clean it up.
* Added a number of tests for unlimited dimensions derived from the same test in nc_test4.
* Added several NCZarr specific unlimited tests; more are needed.
* Add test of endianness.

## Misc. Other Changes
* Modify libdispatch/ncs3sdk_aws.cpp to optionally support use of the
   AWS Transfer Utility mechanism. This is controlled by the
   ```#define TRANSFER```` command in that file. It defaults to being disabled.
* Parameterize both the standard Unidata S3 bucket (S3TESTBUCKET) and the netcdf-c test data prefix (S3TESTSUBTREE).
* Fixed an obscure memory leak in ncdump.
* Removed some obsolete unit testing code and test cases.
* Uncovered a bug in the netcdf-c handling of big-endian floats and doubles. Have not fixed yet. See tst_h5_endians.c.
* Renamed some nczarr_tests testcases to avoid name conflicts with nc_test4.
* Modify the semantics of zmap\#ncsmap_write to only allow total rewrite of objects.
* Modify the semantics of zodom to properly handle stride > 1.
* Add a truncate operation to the libnczarr zmap code.
2023-09-26 16:56:48 -06:00
Ward Fisher
99e8ff31d8 Add a missing include_directories invocation in CMakeLists.txt 2023-09-05 14:38:48 -06:00
Ward Fisher
af07326a6b Disable 'force internal S3 on Windows' 2023-08-30 10:17:00 -06:00
Ward Fisher
2e25cfc25a Added checks for -lssl and -lcrypto for cmake-based builds. We can't assume they are available. 2023-08-29 12:15:15 -05:00
Ward Fisher
ac4aade4f2 Add an explicit check for ctype.h to CMake so that S3_INTERNAL=TRUE works. 2023-08-29 10:12:14 -06:00
Ward Fisher
2f43247610 Adding a test which can be used to ensure that the AWSSDK which was discovered at configure time is functional. Still need to wire it into autotools. 2023-08-28 16:43:37 -06:00
Ward Fisher
0f7ebad42e Remove diagnostic print statement. 2023-08-23 15:29:42 -06:00
Ward Fisher
dd69bb8d28 Correct some logic so that S3 SDK is linked against if and when it is found. 2023-08-23 15:29:23 -06:00
Dennis Heimbigner
f1a3a64b65 Cleanup the handling of cache parameters.
re: https://github.com/Unidata/netcdf-c/issues/2733

When addressing the above issue, I noticed that there was a disconnect
in NCZarr between nc_set_chunk_cache and nc_set_var_chunk cache.
Specifically, setting nc_set_chunk_cache had no impact on the per-variable cache parameters when nc_set_var_chunk_cache was not used.

So, modified the NCZarr code so that the per-variable cache parameters are set in this order (#1 is first choice):
1. The values set by nc_set_var_chunk_cache
2. The values set by nc_set_chunk_cache
3. The defaults set by configure.ac
2023-08-10 16:57:57 -06:00
Ward Fisher
11e589d394 Merge branch 'gh2712-parity.wif' of github.com:WardF/netcdf-c into gh2712-parity.wif 2023-07-24 09:32:42 -06:00
Ward Fisher
b65bba0b79 Additional cmake-based logic. 2023-07-24 09:32:39 -06:00
Ward Fisher
c6b853a860 Logic to ensure libsz is searched for if Zarr is enabled but enable_filter_szip is false. 2023-07-21 14:46:45 -06:00
Ward Fisher
ae28dd36e6 Additional tweaking of search logic. 2023-07-21 14:32:25 -06:00