summaryrefslogtreecommitdiff
path: root/numpy/lib/tests
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-06-22 13:44:33 -0400
committerCharles Harris <charlesr.harris@gmail.com>2015-06-22 13:44:33 -0400
commitd2d1dd5accbd6bbd5a2d8f3fac0dbfc6fb9b4e18 (patch)
tree3339b7421095daaf91e3f1585f26d7468fd0e302 /numpy/lib/tests
parenta43e86b0d9d567c7abb9478d5bff90905d3f70ec (diff)
parent157e396673c4992e97a522dd9f350b480c4cb6c6 (diff)
downloadnumpy-d2d1dd5accbd6bbd5a2d8f3fac0dbfc6fb9b4e18.tar.gz
Merge pull request #6004 from mhvk/lib-type-check-float16
BUG: np.float16 not recognized in np.common_type
Diffstat (limited to 'numpy/lib/tests')
-rw-r--r--numpy/lib/tests/test_type_check.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py
index 7afd1206c..f7430c27d 100644
--- a/numpy/lib/tests/test_type_check.py
+++ b/numpy/lib/tests/test_type_check.py
@@ -18,11 +18,13 @@ def assert_all(x):
class TestCommonType(TestCase):
def test_basic(self):
ai32 = np.array([[1, 2], [3, 4]], dtype=np.int32)
+ af16 = np.array([[1, 2], [3, 4]], dtype=np.float16)
af32 = np.array([[1, 2], [3, 4]], dtype=np.float32)
af64 = np.array([[1, 2], [3, 4]], dtype=np.float64)
acs = np.array([[1+5j, 2+6j], [3+7j, 4+8j]], dtype=np.csingle)
acd = np.array([[1+5j, 2+6j], [3+7j, 4+8j]], dtype=np.cdouble)
assert_(common_type(ai32) == np.float64)
+ assert_(common_type(af16) == np.float16)
assert_(common_type(af32) == np.float32)
assert_(common_type(af64) == np.float64)
assert_(common_type(acs) == np.csingle)
@@ -186,7 +188,7 @@ class TestIsnan(TestCase):
class TestIsfinite(TestCase):
- # Fixme, wrong place, isfinite now ufunc
+ # Fixme, wrong place, isfinite now ufunc
def test_goodvalues(self):
z = np.array((-1., 0., 1.))
@@ -217,7 +219,7 @@ class TestIsfinite(TestCase):
class TestIsinf(TestCase):
- # Fixme, wrong place, isinf now ufunc
+ # Fixme, wrong place, isinf now ufunc
def test_goodvalues(self):
z = np.array((-1., 0., 1.))