diff options
author | Julian Taylor <jtaylor.debian@googlemail.com> | 2013-06-07 00:12:13 +0200 |
---|---|---|
committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2013-06-07 19:52:08 +0200 |
commit | fc92221118b882c8efecce94d49da0ac126f8305 (patch) | |
tree | 1cae022b88adec8ebba6c4002a48ec61f88394d5 /numpy/linalg/linalg.py | |
parent | b5fd4296a21a7d580774996207d822200b893524 (diff) | |
download | numpy-fc92221118b882c8efecce94d49da0ac126f8305.tar.gz |
BUG: import longdouble instead of float128
i386 does not have 16 byte long double by default (only 12 byte/float96)
so the import prevents numpy startup.
Introduced in 1.8.0dev 40000f508
Diffstat (limited to 'numpy/linalg/linalg.py')
-rw-r--r-- | numpy/linalg/linalg.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index db3484604..5d632fed7 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -22,7 +22,7 @@ from numpy.core import array, asarray, zeros, empty, transpose, \ intc, single, double, csingle, cdouble, inexact, complexfloating, \ newaxis, ravel, all, Inf, dot, add, multiply, sqrt, maximum, \ fastCopyAndTranspose, sum, isfinite, size, finfo, errstate, \ - geterrobj, float128, rollaxis, amin, amax + geterrobj, longdouble, rollaxis, amin, amax from numpy.lib import triu, asfarray from numpy.linalg import lapack_lite, _umath_linalg from numpy.matrixlib.defmatrix import matrix_power @@ -2058,9 +2058,9 @@ def norm(x, ord=None, axis=None): ord + 1 except TypeError: raise ValueError("Invalid norm order for vectors.") - if x.dtype != float128: + if x.dtype.type is not longdouble: # Convert to a float type, so integer arrays give - # float results. Don't apply asfarray to float128 arrays, + # float results. Don't apply asfarray to longdouble arrays, # because it will downcast to float64. absx = asfarray(abs(x)) return add.reduce(absx**ord, axis=axis)**(1.0/ord) |