silx.io.h5py_utils: Fixed support of libhdf5 v1.14.4 #4177
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
t20100
changed the title
t20100
force-pushed
the
fix-hdf5-1.14.4-support
branch
from
2fdc9e3
to
1ca125f
Compare
t20100
commented
Oct 4, 2024
Comment on lines
+105
to
+106
| if locking is None and mode == "r" and not swmr: | ||
| locking = False |
There was a problem hiding this comment.
That's the main change: keep None or set to False
| if not locking: | ||
| if locking is None and mode == "r" and not swmr: | ||
| locking = False | ||
| if locking in (False, "false"): |
There was a problem hiding this comment.
This is to accomodate all possible values of h5py.File's locking:
locking – The file locking behavior. One of:
False (or “false”) – Disable file locking
True (or “true”) – Enable file locking
”best-effort” – Enable file locking but ignore some errors
None – Use HDF5 defaults
I left the former way to disable locking with HDF5_USE_FILE_LCOKING env. var. as it is, so it only supports True, False, None.
woutdenolf
reviewed
Oct 8, 2024
woutdenolf
reviewed
Oct 8, 2024
woutdenolf
approved these changes
Oct 8, 2024
t20100
commented
Oct 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist:
<Module or Topic>: <Action> <Summary>(see contributing guidelines)This PR keeps
locking=Noneinstead of forcing it toTruewhen checking if it can disable it so that it uses libhdf5 default locking mode (eitherbest-effort- the default - orTrue- which can be set as default at compile time...).libhdf5 v1.14.4 (that comes in h5py v3.12.1 wheel) fixed an issue with retrieving the file locking information from opened files in order to fix the opening of external links (that was not respecting the file locking).
It seems that beforehand, the compatibility of the ignore locking errors (the difference between
locking=Trueandlocking="best-effort") was not tested when opening already opened files while it is tested now.See https://github.com/HDFGroup/hdf5/blob/57948148dbcb275c9a39212eebc62e071b11a00d/release_docs/RELEASE.txt#L917-L940
It also adds typing on the modified functions.