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

Sync develop branch changes since 2/16 to hdf5_1_14 branch #4058

Merged
merged 26 commits into from
Mar 5, 2024

Conversation

lrknox
Copy link
Collaborator

@lrknox lrknox commented Mar 4, 2024

No description provided.

hyoklee and others added 24 commits March 4, 2024 09:27
* Replaced last sprintf with snprintf

To have the size of the buffer, it was required to change a function signature, and change all users of it.

In most cases, determining the buffer size wasn't  trivial and so SIZE_MAX is passed. But at least this improves the infrastructure. Someone can later figure out the correct sizes.
…4031)

With MPI 4.1 the use of the mpif.h include file has been deprecated. Codes
should transition to USE mpi or USE mpi_f08.

Signed-off-by: Christoph Niethammer <[email protected]>
H5F_get_access_plist previously did not copy over the file locking settings
from a file into the new File Access Property List that it creates. This would
make it difficult to match the file locking settings between an external file
and its parent file.
)

Add a new testing function to verify C_BOOL values.
Improve performance of flushing a single object, and remove metadata
cache flush markers
… flag is used (HDFGroup#4021)

When the H5LT_FILE_IMAGE_DONT_COPY flag is passed to H5LTopen_file_image, the internally-allocated
udata structure gets leaked as the core file driver doesn't have a way to determine when or if it
needs to call the 'udata_free' callback. This has been fixed by freeing the udata structure when
the 'image_free' callback gets made during file close, where the file is holding the last reference
to the udata structure.
The Autools Classic Intel compiler configuration attempts to load a file
named `general-19` from the intel-warnings/classic directory, which does
not exist.

This removes the attempted load of the file.
The ibm-aix Autotools config file had some unmaintained and unnecessary
Autoconf cache overrides. These have been removed.
There are many architecture-specific linux files in the config
directory, all of which simply redirect to linux-gnulibc1.

This change renames linux-gnulibc1 to linux-gnu and deletes the more
specific files.
Fixes an issue where the HDF5_USE_FILE_LOCKING environment variable being
set can interfere with the file locking setting that the test expects to
be returned.
@derobins derobins added Merge Use this label when a PR is for a downstream merge Priority - 0. Blocker ⛔ This MUST be merged for the release to happen Type - Task Actions that don't fit into any other type category Branch - 1.14 labels Mar 4, 2024
@@ -213,7 +213,7 @@ Notes: This short set of instructions is written for users who want to
cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.14."X"

On Windows 64 bit
cmake -G "Visual Studio 16 2019 Win64" -A x64 -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.14."X"
cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.15."X"
Copy link
Collaborator

Choose a reason for hiding this comment

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

1.14

4.3.11. Backward compatibility
The 1.14 version of the HDF5 library can be configured to operate
3.11. Backward compatibility
The 1.15 version of the HDF5 library can be configured to operate
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should this sentence be in the 1.14 branch?

Copy link
Contributor

Choose a reason for hiding this comment

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

Of course not it should be 1.14 and the next two lines for 1.14 api should be removed

Copy link
Contributor

Choose a reason for hiding this comment

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

Better make sure there are no other 1.15 refs in the PR!

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There are 3 more of them in HDF5Examples/CMakeUserPresets.json lines 22 - 27:

  "environment": {
    "HDF5_ROOT": "${sourceParentDir}/temp/HDF_Group/HDF5/1.15.0",
    "HDF5_PLUGIN_PATH": "${sourceParentDir}/temp/HDF_Group/HDF5/1.15.0/lib/plugin"
  },
  "cacheVariables": {
    "HDF5_ROOT": {"type": "STRING", "value": "${sourceParentDir}/temp/HDF_Group/HDF5/1.15.0"},

They were already there in the hdf5_1_14 branch. I'll change them to 1.14.4, but @byrnHDF do we need to add the file/lines to h5vers?

@lrknox lrknox merged commit 7741170 into HDFGroup:hdf5_1_14 Mar 5, 2024
47 checks passed
@lrknox lrknox deleted the 1_14_dev_sync1_lrk branch March 8, 2024 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge Use this label when a PR is for a downstream merge Priority - 0. Blocker ⛔ This MUST be merged for the release to happen Type - Task Actions that don't fit into any other type category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants