MAINT: do not use copyswap in flatiter internals #24176
Merged
Conversation
This file contains hidden or 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
seberg
reviewed
Jul 17, 2023
There was a problem hiding this comment.
Some nits, mostly leave or take (or probably just leave because the below comment makes them not matter anymore).
One larger comment. It seems to me we can pass in the function into iter_ass_sub_int, iter_ass_sub_Bool, etc. Which means we can liberate getting the transfer function to before the if (PySlice_Check(ind)).
That will mean we only to the code once rather than 3 times and the cleanup is fully outside of those helpers.
The same should work for the iter_subscript* paths, with the added finish: label and goto finish.
70d33bf to
e2259b2
Compare
|
Thanks for the review @seberg! Simplified so there's only one cast setup that is passed to the boolean and integer indexing helpers. Let me know if you spot any additional issues. |
seberg
approved these changes
Jul 18, 2023
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.
Fixes #23486.
Updates all the code paths used by the flatiter getter and setter to use single-element casts instead of copyswap. This allows new dtypes to use these code paths without seg faulting.
I ran the flatiter benchmarks and didn't see any significant performance changes, but there seem to only be benchmarks for boolean indexing. I could probably substantially improve performance by only using copyswap in situations where it's required but using a hand-unrolled
memcpylikefasttakeotherwise but only want to fix the seg faults for now.