summaryrefslogtreecommitdiff
path: root/numpy/lib/function_base.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-02-12 08:10:14 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-02-12 11:21:51 -0700
commit8552cd5fcbf52dee79bdade97ca36c18599e64b4 (patch)
tree6ab4748c181695e15fbf30bda24629a404784602 /numpy/lib/function_base.py
parent0a87823d048fca997684e86718be0d46459ad4fd (diff)
downloadnumpy-8552cd5fcbf52dee79bdade97ca36c18599e64b4.tar.gz
BUG: Make nansum work with booleans.
This broke when function_base._nannop tried to fill a boolean array with integer zeros, raising a 'safe_casting' error. It looks like nanargmax and nanargmin would also break, and were probably incorrect for booleans in any case. The fix is not to use fill values for boolean and integer dtypes. Previously that was only done for the integer dtypes.
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r--numpy/lib/function_base.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 65f4ecb05..320a8ec6c 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -1381,8 +1381,10 @@ def _nanop(op, fill, a, axis=None):
y = array(a, subok=True)
# We only need to take care of NaN's in floating point arrays
- if np.issubdtype(y.dtype, np.integer):
+ dt = y.dtype
+ if np.issubdtype(dt, np.integer) or np.issubdtype(dt, np.bool_):
return op(y, axis=axis)
+
mask = isnan(a)
# y[mask] = fill
# We can't use fancy indexing here as it'll mess w/ MaskedArrays