Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67409:02e7f1444c7b
Date: 2013-10-16 04:58 -0400
http://bitbucket.org/pypy/pypy/changeset/02e7f1444c7b/
Log: cleanups for tests
diff --git a/pypy/module/micronumpy/test/test_complex.py
b/pypy/module/micronumpy/test/test_complex.py
--- a/pypy/module/micronumpy/test/test_complex.py
+++ b/pypy/module/micronumpy/test/test_complex.py
@@ -197,7 +197,6 @@
def test_reciprocal(self):
from numpypy import array, reciprocal, complex64, complex128,
clongdouble
- c_and_relerr = [(complex64, 2e-7), (complex128, 2e-15), (clongdouble,
2e-15)]
inf = float('inf')
nan = float('nan')
#complex
@@ -212,7 +211,7 @@
complex(-r, i),
-0j, 0j, cnan,
cnan, cnan, cnan]
- for c, rel_err in c_and_relerr:
+ for c, rel_err in ((complex64, 2e-7), (complex128, 2e-15),
(clongdouble, 2e-15)):
actual = reciprocal(array([orig], dtype=c))
for b, a, e in zip(orig, actual, expected):
assert (a[0].real - e.real) < rel_err
@@ -232,18 +231,12 @@
raises(TypeError, copysign, a, b)
def test_exp2(self):
- from numpypy import array, exp2, complex128, complex64
- c_and_relerr = [(complex64, 2e-7), (complex128, 2e-15)]
- try:
- from numpypy import clongdouble
- c_and_relerr.append((clongdouble, 2e-30))
- except:
- pass # no longdouble yet
+ from numpypy import array, exp2, complex128, complex64, clongdouble
inf = float('inf')
ninf = -float('inf')
nan = float('nan')
cmpl = complex
- for c,rel_err in c_and_relerr:
+ for c, rel_err in ((complex64, 2e-7), (complex128, 2e-15),
(clongdouble, 2e-15)):
a = [cmpl(-5., 0), cmpl(-5., -5.), cmpl(-5., 5.),
cmpl(0., -5.), cmpl(0., 0.), cmpl(0., 5.),
cmpl(-0., -5.), cmpl(-0., 0.), cmpl(-0., 5.),
@@ -274,12 +267,12 @@
def test_expm1(self):
import math, cmath
- from numpypy import array, expm1, complex128, complex64
+ from numpypy import array, expm1, complex128, complex64, clongdouble
inf = float('inf')
ninf = -float('inf')
nan = float('nan')
cmpl = complex
- for c,rel_err in ((complex128, 2e-15), (complex64, 1e-7)):
+ for c, rel_err in ((complex64, 2e-7), (complex128, 2e-15),
(clongdouble, 2e-15)):
a = [cmpl(-5., 0), cmpl(-5., -5.), cmpl(-5., 5.),
cmpl(0., -5.), cmpl(0., 0.), cmpl(0., 5.),
cmpl(-0., -5.), cmpl(-0., 0.), cmpl(-0., 5.),
@@ -503,15 +496,9 @@
def test_basic(self):
from numpypy import (complex128, complex64, add, array, dtype,
subtract as sub, multiply, divide, negative, absolute as abs,
- floor_divide, real, imag, sign)
+ floor_divide, real, imag, sign, clongdouble)
from numpypy import (equal, not_equal, greater, greater_equal, less,
less_equal, isnan)
- complex_dtypes = [complex64, complex128]
- try:
- from numpypy import clongfloat
- complex_dtypes.append(clongfloat)
- except:
- pass
assert real(4.0) == 4.0
assert imag(0.0) == 0.0
a = array([complex(3.0, 4.0)])
@@ -540,8 +527,7 @@
assert str(a.real) == 'abc'
# numpy imag for flexible types returns self
assert str(a.imag) == 'abc'
- for complex_ in complex_dtypes:
-
+ for complex_ in complex64, complex128, clongdouble:
O = complex(0, 0)
c0 = complex_(complex(2.5, 0))
c1 = complex_(complex(1, 2))
@@ -572,7 +558,6 @@
assert negative(complex(1,1)) == complex(-1, -1)
assert negative(complex(0, 0)) == 0
-
assert multiply(1, c1) == c1
assert multiply(2, c2) == complex(6, 8)
assert multiply(c1, c2) == complex(-5, 10)
diff --git a/pypy/module/micronumpy/test/test_dtypes.py
b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -45,6 +45,13 @@
raises(TypeError, lambda: dtype("int8") == 3)
assert dtype(bool) == bool
+ def test_dtype_aliases(self):
+ from numpypy import dtype
+ assert dtype('longfloat').num in (12, 13)
+ assert dtype('longdouble').num in (12, 13)
+ assert dtype('clongfloat').num in (15, 16)
+ assert dtype('clongdouble').num in (15, 16)
+
def test_dtype_with_types(self):
from numpypy import dtype
@@ -153,6 +160,8 @@
'?', 'b', 'B', 'h', 'H', 'i', 'I', 'l', 'L', 'q', 'Q', 'f', 'd',
'e'
]
+ if array([0], dtype='longdouble').itemsize > 8:
+ types += ['g', 'G']
a = array([True], '?')
for t in types:
assert (a + array([0], t)).dtype is dtype(t)
@@ -268,6 +277,7 @@
(numpy.float16, 10.),
(numpy.float32, 2.0),
(numpy.float64, 4.32),
+ (numpy.longdouble, 4.32),
]:
assert hash(tp(value)) == hash(value)
@@ -533,6 +543,20 @@
from math import isnan
assert isnan(numpy.float32(None))
assert isnan(numpy.float64(None))
+ assert isnan(numpy.longdouble(None))
+
+ def test_longfloat(self):
+ import numpypy as numpy
+ # it can be float96 or float128
+ if numpy.longfloat != numpy.float64:
+ assert numpy.longfloat.mro()[1:] == [numpy.floating,
+ numpy.inexact, numpy.number,
+ numpy.generic, object]
+ a = numpy.array([1, 2, 3], numpy.longdouble)
+ assert type(a[1]) is numpy.longdouble
+ assert numpy.float64(12) == numpy.longdouble(12)
+ assert numpy.float64(12) == numpy.longfloat(12)
+ raises(ValueError, numpy.longfloat, '23.2df')
def test_complex_floating(self):
import numpypy as numpy
@@ -896,6 +920,12 @@
a = array([1, 2, 3], dtype=self.non_native_prefix + 'f2')
assert a[0] == 1
assert (a + a)[1] == 4
+ a = array([1, 2, 3], dtype=self.non_native_prefix + 'g') # longdouble
+ assert a[0] == 1
+ assert (a + a)[1] == 4
+ a = array([1, 2, 3], dtype=self.non_native_prefix + 'G') # clongdouble
+ assert a[0] == 1
+ assert (a + a)[1] == 4
class AppTestPyPyOnly(BaseNumpyAppTest):
def setup_class(cls):
@@ -914,55 +944,6 @@
assert typeinfo['CDOUBLE'] == ('D', 15, 128, 8, complex128)
assert typeinfo['HALF'] == ('e', 23, 16, 2, float16)
-class AppTestLongDoubleDtypes(BaseNumpyAppTest):
- def test_longfloat(self):
- import numpypy as numpy
- # it can be float96 or float128
- if numpy.longfloat != numpy.float64:
- assert numpy.longfloat.mro()[1:] == [numpy.floating,
- numpy.inexact, numpy.number,
- numpy.generic, object]
- a = numpy.array([1, 2, 3], numpy.longdouble)
- assert type(a[1]) is numpy.longdouble
- assert numpy.float64(12) == numpy.longdouble(12)
- assert numpy.float64(12) == numpy.longfloat(12)
- raises(ValueError, numpy.longfloat, '23.2df')
-
- def test_dtype_aliases(self):
- from numpypy import dtype
- assert dtype('longfloat').num in (12, 13)
- assert dtype('longdouble').num in (12, 13)
- assert dtype('clongfloat').num in (15, 16)
- assert dtype('clongdouble').num in (15, 16)
-
- def test_bool_binop_types(self):
- from numpypy import array, dtype
- types = ['g', 'G']
- a = array([True], '?')
- for t in types:
- assert (a + array([0], t)).dtype is dtype(t)
-
- def test_hash(self):
- import numpypy as numpy
- for tp, value in [
- (numpy.longdouble, 4.32),
- ]:
- assert hash(tp(value)) == hash(value)
-
- def test_float_None(self):
- import numpypy as numpy
- from math import isnan
- assert isnan(numpy.longdouble(None))
-
- def test_non_native(self):
- from numpypy import array
- a = array([1, 2, 3], dtype=self.non_native_prefix + 'g') # longdouble
- assert a[0] == 1
- assert (a + a)[1] == 4
- a = array([1, 2, 3], dtype=self.non_native_prefix + 'G') # clongdouble
- assert a[0] == 1
- assert (a + a)[1] == 4
-
class AppTestObjectDtypes(BaseNumpyAppTest):
def test_scalar_from_object(self):
from numpypy import array
diff --git a/pypy/module/micronumpy/test/test_numarray.py
b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -365,6 +365,26 @@
assert b[0] == 1+0j
assert b.dtype is dtype(complex)
+ def test_arange(self):
+ from numpypy import arange, dtype
+ a = arange(3)
+ assert (a == [0, 1, 2]).all()
+ assert a.dtype is dtype(int)
+ a = arange(3.0)
+ assert (a == [0., 1., 2.]).all()
+ assert a.dtype is dtype(float)
+ a = arange(3, 7)
+ assert (a == [3, 4, 5, 6]).all()
+ assert a.dtype is dtype(int)
+ a = arange(3, 7, 2)
+ assert (a == [3, 5]).all()
+ a = arange(3, dtype=float)
+ assert (a == [0., 1., 2.]).all()
+ assert a.dtype is dtype(float)
+ a = arange(0, 0.8, 0.1)
+ assert len(a) == 8
+ assert arange(False, True, True).dtype is dtype(int)
+
def test_copy(self):
from numpypy import arange, array
a = arange(5)
@@ -430,24 +450,17 @@
def test_getitem_obj_index(self):
from numpypy import arange
-
a = arange(10)
-
assert a[self.CustomIndexObject(1)] == 1
def test_getitem_obj_prefer_index_to_int(self):
from numpypy import arange
-
a = arange(10)
-
-
assert a[self.CustomIndexIntObject(0, 1)] == 0
def test_getitem_obj_int(self):
from numpypy import arange
-
a = arange(10)
-
assert a[self.CustomIntObject(1)] == 1
def test_setitem(self):
@@ -469,7 +482,6 @@
assert a[1] == -0.005
assert a[2] == -0.005
-
def test_setitem_tuple(self):
from numpypy import array
a = array(range(5))
@@ -483,27 +495,20 @@
def test_setitem_obj_index(self):
from numpypy import arange
-
a = arange(10)
-
a[self.CustomIndexObject(1)] = 100
assert a[1] == 100
def test_setitem_obj_prefer_index_to_int(self):
from numpypy import arange
-
a = arange(10)
-
a[self.CustomIndexIntObject(0, 1)] = 100
assert a[0] == 100
def test_setitem_obj_int(self):
from numpypy import arange
-
a = arange(10)
-
a[self.CustomIntObject(1)] = 100
-
assert a[1] == 100
def test_access_swallow_exception(self):
@@ -1872,6 +1877,15 @@
i2 = (i+1) * a.dtype.itemsize
assert list(reversed(s1[i1:i2])) == s2[i1:i2]
+ a = array([1, -1, 10000], dtype='longfloat')
+ s1 = map(ord, a.tostring())
+ s2 = map(ord, a.byteswap().tostring())
+ assert a.dtype.itemsize >= 8
+ for i in range(a.size):
+ i1 = i * a.dtype.itemsize
+ i2 = (i+1) * a.dtype.itemsize
+ assert list(reversed(s1[i1:i2])) == s2[i1:i2]
+
def test_clip(self):
from numpypy import array
a = array([1, 2, 17, -3, 12])
@@ -2647,7 +2661,7 @@
def test_fromstring_types(self):
from numpypy import (fromstring, int8, int16, int32, int64, uint8,
- uint16, uint32, float16, float32, float64, array)
+ uint16, uint32, float16, float32, float64, longfloat, array)
a = fromstring('\xFF', dtype=int8)
assert a[0] == -1
b = fromstring('\xFF', dtype=uint8)
@@ -2670,6 +2684,18 @@
assert j[0] == 12
k = fromstring(self.float16val, dtype=float16)
assert k[0] == float16(5.)
+ dt = array([5],dtype=longfloat).dtype
+ if dt.itemsize == 12:
+ from numpypy import float96
+ m = fromstring('\x00\x00\x00\x00\x00\x00\x00\xa0\x01@\x00\x00',
dtype=float96)
+ elif dt.itemsize == 16:
+ from numpypy import float128
+ m =
fromstring('\x00\x00\x00\x00\x00\x00\x00\xa0\x01@\x00\x00\x00\x00\x00\x00',
dtype=float128)
+ elif dt.itemsize == 8:
+ skip('longfloat is float64')
+ else:
+ skip('unknown itemsize for longfloat')
+ assert m[0] == longfloat(5.)
def test_fromstring_invalid(self):
from numpypy import fromstring, uint16, uint8
@@ -2689,28 +2715,6 @@
assert array(0, dtype='i2').tostring() == '\x00\x00'
-class AppTestRanges(BaseNumpyAppTest):
- def test_arange(self):
- from numpypy import arange, dtype
- a = arange(3)
- assert (a == [0, 1, 2]).all()
- assert a.dtype is dtype(int)
- a = arange(3.0)
- assert (a == [0., 1., 2.]).all()
- assert a.dtype is dtype(float)
- a = arange(3, 7)
- assert (a == [3, 4, 5, 6]).all()
- assert a.dtype is dtype(int)
- a = arange(3, 7, 2)
- assert (a == [3, 5]).all()
- a = arange(3, dtype=float)
- assert (a == [0., 1., 2.]).all()
- assert a.dtype is dtype(float)
- a = arange(0, 0.8, 0.1)
- assert len(a) == 8
- assert arange(False, True, True).dtype is dtype(int)
-
-
class AppTestRepr(BaseNumpyAppTest):
def setup_class(cls):
if option.runappdirect:
@@ -3027,40 +3031,3 @@
assert x.__pypy_data__ is obj
del x.__pypy_data__
assert x.__pypy_data__ is None
-
-class AppTestLongDoubleDtypes(BaseNumpyAppTest):
- def setup_class(cls):
- from pypy.module.micronumpy import Module
- #print dir(Module.interpleveldefs)
- if not Module.interpleveldefs.get('longfloat', None):
- py.test.skip('no longdouble types yet')
- BaseNumpyAppTest.setup_class.im_func(cls)
-
- def test_byteswap(self):
- from numpypy import array
-
- a = array([1, -1, 10000], dtype='longfloat')
- s1 = map(ord, a.tostring())
- s2 = map(ord, a.byteswap().tostring())
- assert a.dtype.itemsize >= 8
- for i in range(a.size):
- i1 = i * a.dtype.itemsize
- i2 = (i+1) * a.dtype.itemsize
- assert list(reversed(s1[i1:i2])) == s2[i1:i2]
-
- def test_fromstring_types(self):
- from numpypy import (fromstring, longfloat, array)
- dt = array([5],dtype=longfloat).dtype
- if dt.itemsize == 12:
- from numpypy import float96
- m = fromstring('\x00\x00\x00\x00\x00\x00\x00\xa0\x01@\x00\x00',
dtype=float96)
- elif dt.itemsize==16:
- from numpypy import float128
- m =
fromstring('\x00\x00\x00\x00\x00\x00\x00\xa0\x01@\x00\x00\x00\x00\x00\x00',
dtype=float128)
- elif dt.itemsize == 8:
- skip('longfloat is float64')
- else:
- skip('unknown itemsize for longfloat')
- assert m[0] == longfloat(5.)
-
-
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
