MANT: refactor unravel_index for code repetition #13446
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
mattip
commented
May 1, 2019
| npy_intp tmp = val / unravel_dims[idx]; | ||
| coords[idx] = val % unravel_dims[idx]; | ||
| val = tmp; | ||
| idx += idx_step; |
seberg
approved these changes
May 1, 2019
Co-Authored-By: mattip <[email protected]>
Co-Authored-By: mattip <[email protected]>
|
I used the "accept suggested changes" feature but now the PR has 3 commits, some with strange messages. Probably need to squash-merge |
|
Hmmm, so the feature is not perfect ;) (but there is not much it can do I guess, except possibly auto-squash multiple suggestions)... Will have another quick pass after lunch and wait |
|
Thanks Matti, and of course also Jaime! |
lijunzh
added a commit
to lijunzh/numpy
that referenced
this pull request
May 2, 2019
* master: (25 commits) BUG: fix unravel_index when dimension is greater than 'intp' MANT: refactor unravel_index for code repetition (numpy#13446) BLD, TST: implicit func errors DOC: document existance of linalg backends BLD: streamlined library names in site.cfg sections (numpy#13157) MAINT: fixed typo 'wtihout' from numpy/core/shape_base.py BUG: fixing bugs in AVX exp/log while handling special value floats (numpy#13415) update sequence Add analysis check BUG: blindly add TypeError to accepted exceptions MAINT: fixed several PYTHONOPTIMIZE=2 failures BUG: fixed PYTHONOPTIMIZE run MAINT: fixed typo 'Mismacth' from numpy.core.setup_common.py MAINT: fixed last issues and questions according to numpy#13132 MAINT: improve efficiency of pad by avoiding use of apply_along_axis DOC: dimension sizes are non-negative, not positive BUILD, BUG: fix from review, fix bug in git_version MAINT: mention 'make dist' in error messsage BUILD: allow version-check to pass if GITVER is Unknown (sdist build) BUILD: fail documentation build if numpy version does not match ...
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.
Replaces #6219 which opened with the comment
"Adding a little bit of extra accounting in the inner loop allows joining the two specialized branches into a single one. The performance loss, if any, is within the measurement error."
Additional comments were integrated into this PR, including a nice little compiler optimization for getting the quotient and remainder with a single divide (thanks godbolt )
@seberg asked for a better error to be raised, which was already implemented.
I made a new PR since I could not push the rebase to @jaimefrio 's repo. Of course we only need one of these, @jaimefrio if you wish to move forward on it feel free to close this one.