Fix bug in ravel_multi_index for big indices (Issue #7546) #8109
Conversation
This file contains 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
approved these changes
Oct 2, 2016
| s *= dimensions.ptr[i]; | ||
| if (npy_mul_with_overflow_intp(&s, s, dimensions.ptr[i])) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "invalid dims: array size defined by dims is larger " |
There was a problem hiding this comment.
Extra level of indentation would be nice.
There was a problem hiding this comment.
I modified indentation here by editing 2nd commit (git rebase -i).
There was a problem hiding this comment.
Thanks, will merge soon unless someone else wants to chime in I think. Remind me if I forget ;).
|
Thanks @skwbc . |
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.
I fixed bug on Issue #7546 .
1st commit:
As @jaimefrio said, I just changed type of variable
sfrominttonpy_intp.2nd commit (not confident):
I added checking for array size overflow using npy_mul_with_overflow_intp, similar to PR #7463 .
It's my understanding that in PR #7463 @seberg checked wheather
arr.size * arr.dtype.itemsizeis greater thannp.iinfo(np.intp).max.However, in ravel_multi_index we don't know the type of the array defined by
dimsargument.So, I just checked whether
arr.sizeis greater thannp.iinfo(np.intp).max. Is this fix okay?