MAINT: deduplicate check_nonreorderable_axes #10309
Merged
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
mhvk
reviewed
Jan 2, 2018
numpy/core/src/umath/reduction.c
Outdated
| @@ -496,30 +487,29 @@ PyUFunc_ReduceWrapper(PyArrayObject *operand, PyArrayObject *out, | |||
| goto fail; | |||
| } | |||
|
|
|||
| /* | |||
There was a problem hiding this comment.
I think this can be moved one if-statement further up, so that it goes together with the sanity check on wheremask (and then one can just return NULL instead of goto fail).
Actually, it might even make more sense in ufunc_object, before we even get here (right after getting the identity, which reorderable depends on), so that one doesn't have to pass reorderable in at all, but that is perhaps too much of a change, and may be better left for when/if we unify reduction and single-axis ufuncs.
eric-wieser
force-pushed
the
check_nonreorderable_axes-deduplicate
branch
from
e6f4a2a
to
1a09222
Compare
|
Updated with a little more cleanup |
eric-wieser
force-pushed
the
check_nonreorderable_axes-deduplicate
branch
from
1a09222
to
4693e68
Compare
mhvk
approved these changes
Jan 3, 2018
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.
Call was present in both branches of the
ifstatementFound while looking at #834