summaryrefslogtreecommitdiff
path: root/numpy/linalg/linalg.py
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2017-10-18 22:23:56 -0700
committerEric Wieser <wieser.eric@gmail.com>2017-10-18 22:23:56 -0700
commit8948d651d2fd97ed6d1fad120c8619ed915df72c (patch)
tree5ec2fcd12feb5bdfbf7d03e554ec10e1becf4314 /numpy/linalg/linalg.py
parente657629bbc2bfb880a1b2fa24a39c5921c1f965e (diff)
downloadnumpy-8948d651d2fd97ed6d1fad120c8619ed915df72c.tar.gz
MAINT: Remove workarounds for gh-9527
The np.generic.astype method now accepts these keyword arguments
Diffstat (limited to 'numpy/linalg/linalg.py')
-rw-r--r--numpy/linalg/linalg.py15
1 files changed, 3 insertions, 12 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index bfd6ac28e..2f738c8a6 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -1815,14 +1815,8 @@ def slogdet(a):
real_t = _realType(result_t)
signature = 'D->Dd' if isComplexType(t) else 'd->dd'
sign, logdet = _umath_linalg.slogdet(a, signature=signature)
- if isscalar(sign):
- sign = sign.astype(result_t)
- else:
- sign = sign.astype(result_t, copy=False)
- if isscalar(logdet):
- logdet = logdet.astype(real_t)
- else:
- logdet = logdet.astype(real_t, copy=False)
+ sign = sign.astype(result_t, copy=False)
+ logdet = logdet.astype(real_t, copy=False)
return sign, logdet
def det(a):
@@ -1878,10 +1872,7 @@ def det(a):
t, result_t = _commonType(a)
signature = 'D->D' if isComplexType(t) else 'd->d'
r = _umath_linalg.det(a, signature=signature)
- if isscalar(r):
- r = r.astype(result_t)
- else:
- r = r.astype(result_t, copy=False)
+ r = r.astype(result_t, copy=False)
return r
# Linear Least Squares