Author: Armin Rigo <[email protected]>
Branch:
Changeset: r58631:780e2e44a0fd
Date: 2012-10-30 12:46 +0100
http://bitbucket.org/pypy/pypy/changeset/780e2e44a0fd/
Log: merge heads
diff --git a/pypy/module/micronumpy/strides.py
b/pypy/module/micronumpy/strides.py
--- a/pypy/module/micronumpy/strides.py
+++ b/pypy/module/micronumpy/strides.py
@@ -110,6 +110,7 @@
i //= shape[s]
return coords, step, lngth
[email protected]_safe
def shape_agreement(space, shape1, w_arr2, broadcast_down=True):
if w_arr2 is None:
return shape1
@@ -132,6 +133,7 @@
)
return ret
[email protected]_safe
def _shape_agreement(shape1, shape2):
""" Checks agreement about two shapes with respect to broadcasting. Returns
the resulting shape.
diff --git a/pypy/module/micronumpy/support.py
b/pypy/module/micronumpy/support.py
--- a/pypy/module/micronumpy/support.py
+++ b/pypy/module/micronumpy/support.py
@@ -8,6 +8,7 @@
i *= x
return i
[email protected]_safe
def calc_strides(shape, dtype, order):
strides = []
backstrides = []
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
