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.

Sign up for GitHub

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

Jump to bottom

Merge PR #274 to 1.12 Branch #283

Merged
merged 6 commits into from
Jan 27, 2021
Merged

Merge PR #274 to 1.12 Branch #283

merged 6 commits into from
Jan 27, 2021

Conversation

fortnern
Copy link
Member

Fix problems with vlens and refs inside compound using H5VLget_file_type()

fortnern and others added 3 commits January 22, 2021 14:57
@fortnern
Merge pull request #3 from HDFGroup/hdf5_1_12
4354e76 
Merge from Canonical
@fortnern
Improve performance of multiple calls to H5Sget_select_elem_pointlist (…
06b85b8 
…HDFGroup#270)

* Cache the pointer to the next point to process after the last call to
H5S__get_select_elem_pointlist.  This allows the normal process of
iterating over the points in batches to be much more efficient, as the
library does not need to traverse the entirety of the preceding points
every time the funciton is re-entered.

* Update RELEASE.txt for point selection iteration performance fix.
@fortnern
Fix problems with vlens and refs inside compound using H5VLget_file_t…
9f8e89b 
…ype() (HDFGroup#274)

* Fixed problems with vlens and refs inside compound using H5VLget_file_type()

* Fix date in RELEASE.txt

* Add assertions

* Move some manipulation of H5VL_object_t struct fields into the H5VL
package.
@fortnern
Copy link
Member Author

I don't know why this PR is including the merge for #270 , which was already merged to hdf5_1_12

@fortnern
Merge pull request #7 from HDFGroup/hdf5_1_12
24455db 
Improve performance of multiple calls to H5Sget_select_elem_pointlist…
@fortnern
Copy link
Member Author

Ok I think it's fixed now.

byrnHDF
byrnHDF reviewed Jan 25, 2021
View reviewed changes
src/H5Tprivate.h Outdated Show resolved Hide resolved
@fortnern
Copy link
Member Author

fortnern commented Jan 27, 2021 •
edited
Loading

So turns out a different mistake was the culprit - I forgot to "add" a fix to the original merge commit that was present in my working directory. I think it makes sense to just let the other issue be fixed when Allen's change is merged to 1.12 since it isn't breaking anything right now.

lrknox
lrknox approved these changes Jan 27, 2021
View reviewed changes
Copy link
Collaborator

@lrknox lrknox left a comment

Choose a reason for hiding this comment

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

Approved provided the correction to line 44 of H5Tprivate.h is preserved in hdf5_1_12.

@byrnHDF
Copy link
Contributor

byrnHDF commented Jan 27, 2021

Approved provided the correction to line 44 of H5Tprivate.h is preserved in hdf5_1_12.

Yes, that has to be fixed in this PR because it doesn't exist yet for me to fix.

@lrknox
Copy link
Collaborator

lrknox commented Jan 27, 2021 via email

lrknox
lrknox reviewed Jan 27, 2021
View reviewed changes
src/H5Tprivate.h Outdated Show resolved Hide resolved
@fortnern
Copy link
Member Author

I figured it would save Allen the headache of merge conflicts if I didn't fix it here, but it doesn't matter to me.

@lrknox lrknox merged commit 98a27f1 into HDFGroup:hdf5_1_12 Jan 27, 2021
@lrknox
Copy link
Collaborator

lrknox commented Jan 28, 2021 via email

@byrnHDF
Copy link
Contributor

byrnHDF commented Jan 28, 2021 via email

@lrknox
Copy link
Collaborator

lrknox commented Jan 28, 2021 via email

lrknox pushed a commit that referenced this pull request Dec 20, 2024
@hyoklee
Fix h5py CI failure. (#5186)
f264298 
Close #283
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@byrnHDF byrnHDF byrnHDF left review comments

@lrknox lrknox lrknox approved these changes

@bljhdf bljhdf Awaiting requested review from bljhdf

@derobins derobins Awaiting requested review from derobins derobins is a code owner

@jhendersonHDF jhendersonHDF Awaiting requested review from jhendersonHDF jhendersonHDF is a code owner

@jrmainzer jrmainzer Awaiting requested review from jrmainzer

@qkoziol qkoziol Awaiting requested review from qkoziol qkoziol is a code owner

@soumagne soumagne Awaiting requested review from soumagne

@vchoi-hdfgroup vchoi-hdfgroup Awaiting requested review from vchoi-hdfgroup vchoi-hdfgroup is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fortnern @byrnHDF @lrknox