Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

ENH: Use array indexing preparation routines for flatiter objects#28590

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
lysnikolaou wants to merge10 commits intonumpy:main
base:main
Choose a base branch
Loading
fromlysnikolaou:use-prepare-index-flatiter

Conversation

lysnikolaou
Copy link
Member

  • Useprepare_index initer_subscript anditer_ass_subscript. This fixes various cases that were broken before:
    • arr.flat[[True, True]]
    • arr.flat[[1.0, 1.0]]
    • arr.flat[()] = 0
  • Add more extensive tests forflatiter indexing operations

Closes#28314.

ngoldbaum reacted with rocket emoji
@lysnikolaoulysnikolaou changed the title[ENH] Use array indexing preparation routines for flatiter objectsENH: Use array indexing preparation routines for flatiter objectsMar 26, 2025
@lysnikolaoulysnikolaouforce-pushed theuse-prepare-index-flatiter branch from198df6b to75aaed0CompareMarch 26, 2025 10:23
@lysnikolaoulysnikolaouforce-pushed theuse-prepare-index-flatiter branch from75aaed0 to9f2d51fCompareMarch 26, 2025 10:30
assert_raises(ValueError, ia, x.flat, s, np.zeros(9, dtype=float))
assert_raises(ValueError, ia, x.flat, s, np.zeros(11, dtype=float))
assert_raises(IndexError, ia, x.flat, s, np.zeros(9, dtype=float))
assert_raises(IndexError, ia, x.flat, s, np.zeros(11, dtype=float))
Copy link
Member

Choose a reason for hiding this comment

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

While this is certainly more consistent and I'd even call it a bugfix, it is a behavior change and someone might have code relying on the old behavior. Needs a release note at least. You also need another release note for the new features.

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Agreed. Added a release note that lists all the most important changes.

@lysnikolaoulysnikolaouforce-pushed theuse-prepare-index-flatiter branch from8f2b322 to33109ddCompareMarch 28, 2025 13:52
@ngoldbaum
Copy link
Member

This is a big refactor, so I think we'll need at least two experienced developers to go over the C code changes, so that might take a while. I'll try to do a pass focusing on the correctness of the C code soon. On a first, high-level pass this looks like mostly simplification and cleanup.

I think you should also try running the indexing benchmarks to see if there are any significant regressions in existing benchmarks. I thinkbench_indexing already captures several workflows that go through the changed low-level C code path.

It would also be nice to get new entries in theFlatIterIndexing benchmark for newly added functionality.

lysnikolaou reacted with thumbs up emoji

@ngoldbaumngoldbaum self-assigned thisMar 28, 2025
@lysnikolaou
Copy link
MemberAuthor

lysnikolaou commentedMar 28, 2025
edited
Loading

These are the results of running the (old & new) benchmarks:

| Change   | Before [93898621] <main>   | After [cfcdabf0] <use-prepare-index-flatiter>   |     Ratio | Benchmark (Parameter)                                       ||----------|----------------------------|-------------------------------------------------|-----------|-------------------------------------------------------------|| +        | 87.0±0.4ns                 | 43.0±0.2ms                                      | 494276    | bench_indexing.FlatIterIndexing.time_flat_empty_tuple_index || +        | 115±3ns                    | 479±8ns                                         |      4.15 | bench_indexing.FlatIterIndexing.time_flat_bool_index_0d     || +        | 39.4±0.3ms                 | 42.8±0.3ms                                      |      1.09 | bench_indexing.FlatIterIndexing.time_flat_ellipsis_index    || +        | 3.95±0.04ms                | 4.29±0.07ms                                     |      1.09 | bench_indexing.FlatIterIndexing.time_flat_slice_index       |

It looks like having special cases for tuple, ellipses etc. (instead of going throughprepare_index) did have an impact on performance. Should we try and keep those special cases in?

@ngoldbaum
Copy link
Member

Should we try and keep those special cases in?

Probably

@lysnikolaou
Copy link
MemberAuthor

Should we try and keep those special cases in?

Probably

I added a couple of special cases for an empty tuple and boolean indexes. This fixes the two worst performance regressions. I feel that the rest are acceptable, since this goes through a much more complex code path to make sure that everything is set up correctly.

@ngoldbaumngoldbaum added this to the2.3.0 release milestoneApr 23, 2025
@ngoldbaum
Copy link
Member

I added the 2.3 milestone to make sure we don't drop reviewing this before cutting the release.

lysnikolaou reacted with thumbs up emoji

@charris
Copy link
Member

I added the 2.3 milestone

@ngoldbaum I am about to push this off to 2.4 unless you want to put it in very soon.

@ngoldbaum
Copy link
Member

I spoke with Lysandros and he said it's OK to push this off. We'll coordinate on getting this reviewed soon.

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@ngoldbaumngoldbaumngoldbaum left review comments

Assignees

@ngoldbaumngoldbaum

Labels
None yet
Projects
None yet
Milestone
2.4.0 release
Development

Successfully merging this pull request may close these issues.

BUG: Fix flatiter indexing
3 participants
@lysnikolaou@ngoldbaum@charris

[8]ページ先頭

©2009-2025 Movatter.jp