diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-28 16:27:56 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-28 16:27:56 -0800 |
| commit | 67e5476a4178de55451501cfb01794c22d340b7a (patch) | |
| tree | 2a24b021001658deb92230692f8fad62e9355791 /numpy/testing/tests/test_utils.py | |
| parent | cdac1209a517bf0808f12340d21ac9d334f69485 (diff) | |
| parent | aedce0eb9fa63e7dec3c865374a64e11374c284c (diff) | |
| download | numpy-67e5476a4178de55451501cfb01794c22d340b7a.tar.gz | |
Merge branch 'new_iterator' - new iterator, ufunc update, restore 1.5 ABI
New Iterator - Read doc/neps/new-iterator-ufunc.rst.
UFunc Update - Change all ufunc functions to use the new iterator. This
replaces the inline buffering with iterator buffering, except
for the reductions and generalized ufunc which use updateifcopy
at the moment. Also adds out= and order= parameters to
all ufuncs.
Restore 1.5 ABI - This was done by moving the new type numbers to the end
of the type enumeration, and replacing all type promotion
code with a table-based approach. The ArrFuncs was
restored by putting the new type cast functions into the
cast dictionary, originally designed just for custom
types.
Conflicts:
numpy/core/src/multiarray/ctors.c
numpy/core/tests/test_regression.py
Diffstat (limited to 'numpy/testing/tests/test_utils.py')
| -rw-r--r-- | numpy/testing/tests/test_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py index 5106c1184..9798a25be 100644 --- a/numpy/testing/tests/test_utils.py +++ b/numpy/testing/tests/test_utils.py @@ -413,7 +413,7 @@ class TestULP(unittest.TestCase): def test_double(self): # Generate 1 + small deviation, check that adding eps gives a few UNL - x = np.ones(10).astype(np.float32) + x = np.ones(10).astype(np.float64) x += 0.01 * np.random.randn(10).astype(np.float64) eps = np.finfo(np.float64).eps assert_array_max_ulp(x, x+eps, maxulp=200) |