summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-06-04 13:45:23 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-06-04 13:45:23 -0700
commit7e92df5c483c4a466315be1df7ee077c956a32b0 (patch)
tree0c59b31788142c6ed628e3dc6a0e068f77583018
parentc2e531b97f0b8bfc7ba4cdbb4c2313b26a6226a8 (diff)
parenta32335e7026e3f04bcf627d3f6af57a9c78acf48 (diff)
downloadnumpy-7e92df5c483c4a466315be1df7ee077c956a32b0.tar.gz
Merge pull request #3400 from WarrenWeckesser/test-blasdot-failure
TST: linalg: loosen the requirements of some tests in test_blasdot.py. ...
-rw-r--r--numpy/core/tests/test_blasdot.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/numpy/core/tests/test_blasdot.py b/numpy/core/tests/test_blasdot.py
index fb215296f..2e99cf5b0 100644
--- a/numpy/core/tests/test_blasdot.py
+++ b/numpy/core/tests/test_blasdot.py
@@ -111,15 +111,15 @@ def test_dot_array_order():
dtype=arr_type, order=a_order)
assert_array_equal(np.dot(a, a), a.dot(a))
# (a.a)' = a'.a', note that mse~=1e-31 needs almost_equal
- assert_almost_equal(a.dot(a), a.T.dot(a.T).T, decimal=30)
+ assert_almost_equal(a.dot(a), a.T.dot(a.T).T, decimal=prec)
#
# Check with making explicit copy
#
a_T = a.T.copy(order=a_order)
- assert_array_equal(a_T.dot(a_T), a.T.dot(a.T))
- assert_array_equal(a.dot(a_T), a.dot(a.T))
- assert_array_equal(a_T.dot(a), a.T.dot(a))
+ assert_almost_equal(a_T.dot(a_T), a.T.dot(a.T), decimal=prec)
+ assert_almost_equal(a.dot(a_T), a.dot(a.T), decimal=prec)
+ assert_almost_equal(a_T.dot(a), a.T.dot(a), decimal=prec)
#
# Compare with multiarray dot
@@ -135,10 +135,10 @@ def test_dot_array_order():
b = np.asarray(np.random.randn(a_dim, b_dim),
dtype=arr_type, order=b_order)
b_T = b.T.copy(order=b_order)
- assert_array_equal(a_T.dot(b), a.T.dot(b))
- assert_array_equal(b_T.dot(a), b.T.dot(a))
+ assert_almost_equal(a_T.dot(b), a.T.dot(b), decimal=prec)
+ assert_almost_equal(b_T.dot(a), b.T.dot(a), decimal=prec)
# (b'.a)' = a'.b
- assert_almost_equal(b.T.dot(a), a.T.dot(b).T, decimal=30)
+ assert_almost_equal(b.T.dot(a), a.T.dot(b).T, decimal=prec)
assert_almost_equal(a.dot(b), _dot(a, b), decimal=prec)
assert_almost_equal(b.T.dot(a), _dot(b.T, a), decimal=prec)
@@ -147,7 +147,7 @@ def test_dot_array_order():
c = np.asarray(np.random.randn(b_dim, c_dim),
dtype=arr_type, order=c_order)
c_T = c.T.copy(order=c_order)
- assert_array_equal(c.T.dot(b.T), c_T.dot(b_T))
- assert_almost_equal(c.T.dot(b.T).T, b.dot(c), decimal=30)
+ assert_almost_equal(c.T.dot(b.T), c_T.dot(b_T), decimal=prec)
+ assert_almost_equal(c.T.dot(b.T).T, b.dot(c), decimal=prec)
assert_almost_equal(b.dot(c), _dot(b, c), decimal=prec)
assert_almost_equal(c.T.dot(b.T), _dot(c.T, b.T), decimal=prec)