summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorJoscha Reimer <jor@informatik.uni-kiel.de>2018-07-26 10:16:00 +0200
committerJoscha Reimer <jor@informatik.uni-kiel.de>2018-07-26 10:16:00 +0200
commit18e138c6b5a169750b995d826a8bee8e4918c9af (patch)
tree62239bd32d66a66a2eef0d9a7c9366d0fb5108be /numpy/lib
parentc9b61a3f2599826d17f8a667837b0663be0ce6d0 (diff)
downloadnumpy-18e138c6b5a169750b995d826a8bee8e4918c9af.tar.gz
Revert "BUG: isposinf and isneginf now also work with complex values"
This reverts commit 4e2dd4140e2a7220ef645665a7ce6381493d273d.
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/ufunclike.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/numpy/lib/ufunclike.py b/numpy/lib/ufunclike.py
index fc059d2f7..e0bd95182 100644
--- a/numpy/lib/ufunclike.py
+++ b/numpy/lib/ufunclike.py
@@ -81,21 +81,6 @@ def fix(x, out=None):
res = res[()]
return res
-
-def _isinf(x, sign, out=None):
- if nx.isscalar(x):
- if out is not None:
- raise ValueError('out has to be None if x is scalar.')
- return nx.isinf(x) and nx.sign(x) == sign
- else:
- x = nx.asanyarray(x)
- out = nx.isinf(x, out)
- if x.ndim == 0:
- out = nx.asanyarray(out)
- out_b = out.astype(bool, copy=False)
- out[out_b] = nx.sign(x[out_b]) == sign
- return out
-
@_deprecate_out_named_y
def isposinf(x, out=None):
"""
@@ -153,7 +138,7 @@ def isposinf(x, out=None):
array([0, 0, 1])
"""
- return _isinf(x, 1, out=out)
+ return nx.logical_and(nx.isinf(x), ~nx.signbit(x), out)
@_deprecate_out_named_y
@@ -214,4 +199,4 @@ def isneginf(x, out=None):
array([1, 0, 0])
"""
- return _isinf(x, -1, out=out)
+ return nx.logical_and(nx.isinf(x), nx.signbit(x), out)