diff options
author | Matti Picus <matti.picus@gmail.com> | 2019-01-04 10:38:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 10:38:48 +0200 |
commit | b60b58359eef967ce1e557fd8437a37b68330be9 (patch) | |
tree | 224d819ab8a7d2e80a460648f1e8cb231bd4d237 /numpy/core/_methods.py | |
parent | fd89a4137969b676d4449e2b61ecd7f4c5811d7a (diff) | |
parent | 5afe650403bdb3aa1a3189c1b8c3233501208521 (diff) | |
download | numpy-b60b58359eef967ce1e557fd8437a37b68330be9.tar.gz |
Merge pull request #12644 from mhvk/ufunc-reduce-where-simple
ENH: where for ufunc reductions
Diffstat (limited to 'numpy/core/_methods.py')
-rw-r--r-- | numpy/core/_methods.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/numpy/core/_methods.py b/numpy/core/_methods.py index 33f6d01a8..51362c761 100644 --- a/numpy/core/_methods.py +++ b/numpy/core/_methods.py @@ -24,20 +24,20 @@ umr_all = um.logical_and.reduce # avoid keyword arguments to speed up parsing, saves about 15%-20% for very # small reductions def _amax(a, axis=None, out=None, keepdims=False, - initial=_NoValue): - return umr_maximum(a, axis, None, out, keepdims, initial) + initial=_NoValue, where=True): + return umr_maximum(a, axis, None, out, keepdims, initial, where) def _amin(a, axis=None, out=None, keepdims=False, - initial=_NoValue): - return umr_minimum(a, axis, None, out, keepdims, initial) + initial=_NoValue, where=True): + return umr_minimum(a, axis, None, out, keepdims, initial, where) def _sum(a, axis=None, dtype=None, out=None, keepdims=False, - initial=_NoValue): - return umr_sum(a, axis, dtype, out, keepdims, initial) + initial=_NoValue, where=True): + return umr_sum(a, axis, dtype, out, keepdims, initial, where) def _prod(a, axis=None, dtype=None, out=None, keepdims=False, - initial=_NoValue): - return umr_prod(a, axis, dtype, out, keepdims, initial) + initial=_NoValue, where=True): + return umr_prod(a, axis, dtype, out, keepdims, initial, where) def _any(a, axis=None, dtype=None, out=None, keepdims=False): return umr_any(a, axis, dtype, out, keepdims) |