Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macro usage #2618

Merged
merged 2 commits into from
Feb 28, 2023
Merged

Fix macro usage #2618

merged 2 commits into from
Feb 28, 2023

Conversation

skosukhin
Copy link
Contributor

This fixes configuration with --disable-parallel4 --enable-pnetcdf. It looks like NC_FILE_INFO has the comm member (i.e. grp->nc4_info->comm is valid) only if USE_PARALLEL4 is defined (see here).

@skosukhin
Copy link
Contributor Author

On the other hand, I read over the comment in the code and am not sure about the solution anymore.

@WardF
Copy link
Member

WardF commented Feb 27, 2023

Taking a look, I believe the inverse change (modifying the header file) should be made, but I am testing that now.

Copy link
Member

@WardF WardF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I've made the changes mentioned in the main comment thread. Thanks, will get this merged.

@WardF WardF merged commit 00a722b into Unidata:main Feb 28, 2023
@WardF WardF self-assigned this Feb 28, 2023
@WardF WardF added this to the 4.9.2 milestone Feb 28, 2023
ZedThree added a commit to ZedThree/netcdf-c that referenced this pull request Mar 7, 2023
* main: (1776 commits)
  Invert solution as discussed at Unidata#2618
  Correct a potential null pointer dereference.
  Fix a logic error that was resulting in an easy-to-miss error when running configure.
  Fix issue with dangling test file not getting cleaned up.
  Turn nczarr zip support off by default in cmake, add a status line indicating whether nczarr-zip-support is available, in libnetcdf.settings.
  Update the version of the cache action used by github action from v2 to v3.
  Explicit cast to unsigned char.
  More issues returned by sanitizer, related to attempts to assign MAX_UNSIGNED_CHAR (255) to a variable of type char.
  Fixed an issue where memcpy was potentially passed a null pointer.
  Correct another uninitialized issue.
  Correct undefined variable error.
  Fixing issues uncovered by compiling with '-fsanitize=undefined' and running nc_test/nc_test, in support of Unidata#1983, amongst others.  The cast as was being used was undefined behavior, and had to be worked around in a style approximating C++'s 'reinterpret_cast'
  Remove a stray character at the head file.
  Fix a distcheck failure with nczarr_test/run_interop.sh
  Turn benchmarks off by default. They require netcdf4, additional logic is required in order to have them on by default.
  Add execute bit to test scripts
  Fix missing endif statement
  Add generated parallel tests for nc_perf, cmake-based build system.
  Correct typo in CMakeLists.txt
  Wiring performance benchmarks into cmake, cleaned up serial compression performance test dependency on MPI.
  ...
clrpackages pushed a commit to clearlinux-pkgs/netcdf that referenced this pull request Mar 22, 2023
Dennis Heimbigner (9):
      Modify H5FDhttp.c to work with HDF5 1.14.0
      update release notes
      Enable ACCEPT_ENCODING on DAP requests
      Update Release notes
      Fix a distcheck failure with nczarr_test/run_interop.sh
      Extend the dispatch table for H5FD back to version 1.13.2
      update RELEASENOTES
      Missed one occurrence of 1,14,0
      Fix byterange handling of some URLS

Greg Sjaardema (1):
      Missing `goto`

Magnus Ulimoen (1):
      Fix setting dest for non-m4 path

Mathieu Westphal (1):
      Avoid optionnaly depends on zip for NCZarr

Sergey Kosukhin (1):
      Fix macro usage

Ward Fisher (35):
      Update release notes, prepare to merge back upstream into development branch.
      Escape command symbol in doxygen template.
      Incorporate fix in support of Unidata/netcdf-c#2437 (comment)
      Update nc-config in support of Unidata/netcdf-c#2274
      Added benchmarking option to cmake-based builds, turned on unit-testing by default
      Wiring performance benchmarks into cmake, cleaned up serial compression performance test dependency on MPI.
      Correct typo in CMakeLists.txt
      Add generated parallel tests for nc_perf, cmake-based build system.
      Fix missing endif statement
      Add execute bit to test scripts
      Turn benchmarks off by default. They require netcdf4, additional logic is required in order to have them on by default.
      Remove a stray character at the head file.
      Fixing issues uncovered by compiling with '-fsanitize=undefined' and running nc_test/nc_test, in support of Unidata/netcdf-c#1983, amongst others.  The cast as was being used was undefined behavior, and had to be worked around in a style approximating C++'s 'reinterpret_cast'
      Correct undefined variable error.
      Correct another uninitialized issue.
      Fixed an issue where memcpy was potentially passed a null pointer.
      More issues returned by sanitizer, related to attempts to assign MAX_UNSIGNED_CHAR (255) to a variable of type char.
      Explicit cast to unsigned char.
      Update the version of the cache action used by github action from v2 to v3.
      Turn nczarr zip support off by default in cmake, add a status line indicating whether nczarr-zip-support is available, in libnetcdf.settings.
      Fix issue with dangling test file not getting cleaned up.
      Fix a logic error that was resulting in an easy-to-miss error when running configure.
      Correct a potential null pointer dereference.
      Invert solution as discussed at Unidata/netcdf-c#2618
      Bumped SO version.
      Update release notes.
      Bump version strings to reflect next development version.
      Correct jsonconvention map with netcdf version.
      Add hdf5 1.14.0 to GitHub CI.
      Expand CI testing with HDF5 1.14.0
      Set version strings.
      Adjust reference nczarr file for v4.9.2 release.
      Update .gitignore to allow generated files into version control for 4.9.2 release.
      Added generated files for release.
      Added generated test files for a stand-alone release.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants