Backport 4619, BUG: many functions silently drop keepdims kwarg#7736
Merged
charris merged 1 commit intonumpy:maintenance/1.11.xfrom Jun 13, 2016
Merged
Backport 4619, BUG: many functions silently drop keepdims kwarg#7736charris merged 1 commit intonumpy:maintenance/1.11.xfrom
keepdims kwarg#7736charris merged 1 commit intonumpy:maintenance/1.11.xfrom
Conversation
Member
Author
|
Not sure this enhancement/bugfix should be backported, but I am kind of thinking of 1.11.x as a long term release because it fits with many downstream release schedules, supports Python 2.6, and has been relatively trouble free. |
numpy/lib/nanfunctions.py
Outdated
Member
|
I think I am OK with backporting this, there was another PR which added this and some more to the masked values, which would probably be more dubious. Should have another look at it maybe though. |
change test from `type(a) is not mu.ndarray` to `not isinstance(a, mu.ndarray)` Because every sub-class of ndarray is not guaranteed to implement `keepdims` as a kwarg, when wrapping these methods care must be taken. The previous behavior was to silently eat the kwarg when dealing with a sub-class of ndarray. Now, if `keepdims=np._NoValue` (the new default) it is not passed through to the underlying function call (so the default value of `keepdims` is now controlled by the sub-class). If `keepdims` is not `np._NoValue` then it is passed through and will raise an exception if the sub-class does not support the kwarg. A special case in nanvar was required to deal with `matrix` that previously relied on `fromnumeric` silently dropping `keepdims`.
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
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.
change test from
type(a) is not mu.ndarraytonot isinstance(a, mu.ndarray)Because every sub-class of ndarray is not guaranteed to implement
keepdimsas a kwarg, when wrapping these methods care must be taken.The previous behavior was to silently eat the kwarg when dealing with
a sub-class of ndarray.
Now, if
keepdims=np._NoValue(the new default) it is not passedthrough to the underlying function call (so the default value of
keepdimsis now controlled by the sub-class). Ifkeepdimsis notnp._NoValuethen it is passed through and will raise an exception ifthe sub-class does not support the kwarg.
A special case in nanvar was required to deal with
matrixthat previouslyrelied on
fromnumericsilently droppingkeepdims.