summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Jordan-Squire <cjordan1@uw.edu>2011-08-01 10:58:35 -0500
committerCharles Harris <charlesr.harris@gmail.com>2011-08-13 11:00:44 -0600
commit51a096bcbc86d372c3568e721acc11c3c8e92676 (patch)
tree129f7abed7e738c72de4090ea66bbc4191c68805
parentdba98cc143687bcb9ab25403b5d51fdefd582370 (diff)
downloadpython-numpy-51a096bcbc86d372c3568e721acc11c3c8e92676.tar.gz
python-numpy-51a096bcbc86d372c3568e721acc11c3c8e92676.tar.bz2
python-numpy-51a096bcbc86d372c3568e721acc11c3c8e92676.zip
ENH: Faster asarray_chkfinite
-rw-r--r--numpy/lib/function_base.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 8a0c0b37d..caef5c709 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -585,8 +585,7 @@ def asarray_chkfinite(a, dtype=None, order=None):
"""
a = asarray(a, dtype=dtype, order=order)
- if (a.dtype.char in typecodes['AllFloat']) \
- and (_nx.isnan(a).any() or _nx.isinf(a).any()):
+ if a.dtype.char in typecodes['AllFloat'] and not np.isfinite(a).all():
raise ValueError(
"array must not contain infs or NaNs")
return a