Author: mattip <[email protected]>
Branch: nditer-external_loop
Changeset: r74321:418e458600c7
Date: 2014-10-31 08:27 +0200
http://bitbucket.org/pypy/pypy/changeset/418e458600c7/
Log: cleanup, document branch to be merged
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -39,3 +39,7 @@
.. branch: kill-multimethod
Kill multimethod machinery, all multimethods were removed earlier.
+
+.. branch nditer-external_loop
+
+Implement `external_loop` arguement to numpy's nditer
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
@@ -197,11 +197,8 @@
astrides = op_it.array.strides[:indx]
# does op_it iters over array "naturally"
if astrides != op_it.strides:
- print 'cannot coalesce array strides', op_it.array.strides,
- print 'with iter strides', op_it.strides
can_coalesce = False
break
- # is the resulting slice array contiguous
if can_coalesce:
for i in range(len(it.iters)):
old_iter = it.iters[i][0]
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
