Author: mattip <[email protected]>
Branch: nditer-buffered
Changeset: r78600:abf5ad87eb45
Date: 2015-07-18 23:18 +0300
http://bitbucket.org/pypy/pypy/changeset/abf5ad87eb45/
Log: revive test, implementation of "buffered" keyword
diff --git a/pypy/module/micronumpy/nditer.py b/pypy/module/micronumpy/nditer.py
--- a/pypy/module/micronumpy/nditer.py
+++ b/pypy/module/micronumpy/nditer.py
@@ -108,9 +108,6 @@
if item == 'external_loop':
nditer.external_loop = True
elif item == 'buffered':
- raise oefmt(space.w_NotImplementedError,
- 'nditer buffered not implemented yet')
- # For numpy compatability
nditer.buffered = True
elif item == 'c_index':
nditer.tracked_index = 'C'
diff --git a/pypy/module/micronumpy/test/test_nditer.py
b/pypy/module/micronumpy/test/test_nditer.py
--- a/pypy/module/micronumpy/test/test_nditer.py
+++ b/pypy/module/micronumpy/test/test_nditer.py
@@ -152,9 +152,6 @@
from numpy import arange, nditer, array
a = arange(6).reshape(2,3)
import sys
- if '__pypy__' in sys.builtin_module_names:
- raises(NotImplementedError, nditer, a, flags=['buffered'])
- skip('nditer buffered not implmented')
r = []
for x in nditer(a, flags=['external_loop', 'buffered'], order='F'):
r.append(x)
@@ -188,9 +185,6 @@
from numpy import arange, nditer
import sys
a = arange(6.)
- if '__pypy__' in sys.builtin_module_names:
- raises(NotImplementedError, nditer, a, flags=['buffered'],
op_dtypes=['float32'])
- skip('nditer casting not implemented yet')
exc = raises(TypeError, nditer, a, flags=['buffered'],
op_dtypes=['float32'])
assert str(exc.value).startswith("Iterator operand 0 dtype could not
be cast")
r = []
@@ -232,9 +226,6 @@
return it.operands[1]
assert (square1([1, 2, 3]) == [1, 4, 9]).all()
- if '__pypy__' in sys.builtin_module_names:
- raises(NotImplementedError, nditer, [1, 2], flags=['buffered'])
- skip('nditer buffered not implmented')
def square2(a, out=None):
it = nditer([a, out], flags=['external_loop', 'buffered'],
op_flags=[['readonly'],
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
