-
-
Notifications
You must be signed in to change notification settings - Fork 265
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
Merge PR #274 to 1.12 Branch #283
Conversation
Merge from Canonical
…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.
…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.
I don't know why this PR is including the merge for #270 , which was already merged to hdf5_1_12 |
Improve performance of multiple calls to H5Sget_select_elem_pointlist…
Ok I think it's fixed now. |
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. |
There was a problem hiding this 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.
Yes, that has to be fixed in this PR because it doesn't exist yet for me to fix. |
You fixed it in PR #282 which has been merged to develop, but I guess not to hdf5_1_12?
From: Allen Byrne <notifications@github.com>
Sent: Wednesday, January 27, 2021 1:52 PM
To: HDFGroup/hdf5 <hdf5@noreply.github.com>
Cc: Larry Knox <lrknox@hdfgroup.org>; Review requested <review_requested@noreply.github.com>
Subject: Re: [HDFGroup/hdf5] Merge PR #274 to 1.12 Branch (#283)
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.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub<#283 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ADGMWCS5BNQBERHIN7SYHATS4BVHHANCNFSM4WSK22ZQ>.
|
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. |
He said it had to be in the PR because the line was new for 1_12 except for the PR.
It provided me an opportunity to try committing from a suggestion in the PR on github, which I’d noticed in the spack repo but hadn’t known how to do. For a minor change (1 missing character in this case) it was much easier than making a change in a clone and pushing it to the fork/branch.
From: Neil Fortner <notifications@github.com>
Sent: Wednesday, January 27, 2021 5:06 PM
To: HDFGroup/hdf5 <hdf5@noreply.github.com>
Cc: Larry Knox <lrknox@hdfgroup.org>; Review requested <review_requested@noreply.github.com>
Subject: Re: [HDFGroup/hdf5] Merge PR #274 to 1.12 Branch (#283)
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.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub<#283 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ADGMWCXVUM7WGQL5NYZII6LS4CL5RANCNFSM4WSK22ZQ>.
|
So how did you do it, Larry?
…________________________________________
From: Larry Knox <notifications@github.com>
Sent: Wednesday, January 27, 2021 6:03 PM
To: HDFGroup/hdf5
Cc: Allen Byrne; Review requested
Subject: Re: [HDFGroup/hdf5] Merge PR #274 to 1.12 Branch (#283)
He said it had to be in the PR because the line was new for 1_12 except for the PR.
It provided me an opportunity to try committing from a suggestion in the PR on github, which I’d noticed in the spack repo but hadn’t known how to do. For a minor change (1 missing character in this case) it was much easier than making a change in a clone and pushing it to the fork/branch.
From: Neil Fortner <notifications@github.com>
Sent: Wednesday, January 27, 2021 5:06 PM
To: HDFGroup/hdf5 <hdf5@noreply.github.com>
Cc: Larry Knox <lrknox@hdfgroup.org>; Review requested <review_requested@noreply.github.com>
Subject: Re: [HDFGroup/hdf5] Merge PR #274 to 1.12 Branch (#283)
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.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub<#283 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ADGMWCXVUM7WGQL5NYZII6LS4CL5RANCNFSM4WSK22ZQ>.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub<#283 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AL77KBT7AEOJIFXAKSF4LRDS4CSVBANCNFSM4WSK22ZQ>.
|
* Select line/lines of code and click ‘+’ for comment.
* Click “+/-“ (above “Leave a comment”, to right of “Preview”)
* Edit code in suggestion block
* “Add single comment” adds suggested change, which has a “commit” button. I think anyone who has permissions to commit to the branch that the PR is coming from would be able to commit the change. I assume also that “Start a review” instead of “Add single comment” would also add the suggestion.
From: Allen Byrne <notifications@github.com>
Sent: Thursday, January 28, 2021 6:53 AM
To: HDFGroup/hdf5 <hdf5@noreply.github.com>
Cc: Larry Knox <lrknox@hdfgroup.org>; State change <state_change@noreply.github.com>
Subject: Re: [HDFGroup/hdf5] Merge PR #274 to 1.12 Branch (#283)
So how did you do it, Larry?
…________________________________________
From: Larry Knox <notifications@github.com<mailto:notifications@github.com>>
Sent: Wednesday, January 27, 2021 6:03 PM
To: HDFGroup/hdf5
Cc: Allen Byrne; Review requested
Subject: Re: [HDFGroup/hdf5] Merge PR #274 to 1.12 Branch (#283)
He said it had to be in the PR because the line was new for 1_12 except for the PR.
It provided me an opportunity to try committing from a suggestion in the PR on github, which I’d noticed in the spack repo but hadn’t known how to do. For a minor change (1 missing character in this case) it was much easier than making a change in a clone and pushing it to the fork/branch.
From: Neil Fortner <notifications@github.com<mailto:notifications@github.com>>
Sent: Wednesday, January 27, 2021 5:06 PM
To: HDFGroup/hdf5 <hdf5@noreply.github.com<mailto:hdf5@noreply.github.com>>
Cc: Larry Knox <lrknox@hdfgroup.org<mailto:lrknox@hdfgroup.org>>; Review requested <review_requested@noreply.github.com<mailto:review_requested@noreply.github.com>>
Subject: Re: [HDFGroup/hdf5] Merge PR #274 to 1.12 Branch (#283)
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.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub<#283 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ADGMWCXVUM7WGQL5NYZII6LS4CL5RANCNFSM4WSK22ZQ>.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub<#283 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AL77KBT7AEOJIFXAKSF4LRDS4CSVBANCNFSM4WSK22ZQ>.
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub<#283 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ADGMWCWUAZSIIHVX53G3BXDS4FMZVANCNFSM4WSK22ZQ>.
|
Fix problems with vlens and refs inside compound using H5VLget_file_type()