Author: Maciej Fijalkowski <fij...@gmail.com> Branch: Changeset: r54137:73cc3cc4b016 Date: 2012-04-02 09:36 +0200 http://bitbucket.org/pypy/pypy/changeset/73cc3cc4b016/
Log: grumble, of course you apply stuff in this order diff --git a/pypy/module/micronumpy/signature.py b/pypy/module/micronumpy/signature.py --- a/pypy/module/micronumpy/signature.py +++ b/pypy/module/micronumpy/signature.py @@ -211,7 +211,7 @@ def _create_iter(self, iterlist, arraylist, arr, transforms): from pypy.module.micronumpy.interp_numarray import VirtualSlice assert isinstance(arr, VirtualSlice) - transforms = transforms + [ViewTransform(arr.chunks)] + transforms = [ViewTransform(arr.chunks)] + transforms self.child._create_iter(iterlist, arraylist, arr.child, transforms) def eval(self, frame, arr): @@ -277,7 +277,7 @@ from pypy.module.micronumpy.interp_numarray import Call1 assert isinstance(arr, Call1) - vtransforms = transforms + [BroadcastTransform(arr.values.shape)] + vtransforms = [BroadcastTransform(arr.values.shape)] + transforms self.child._create_iter(iterlist, arraylist, arr.values, vtransforms) self.res._create_iter(iterlist, arraylist, arr.res, transforms) @@ -355,7 +355,7 @@ from pypy.module.micronumpy.interp_numarray import ResultArray assert isinstance(arr, ResultArray) - rtransforms = transforms + [BroadcastTransform(arr.left.shape)] + rtransforms = [BroadcastTransform(arr.left.shape)] + transforms self.left._create_iter(iterlist, arraylist, arr.left, transforms) self.right._create_iter(iterlist, arraylist, arr.right, rtransforms) @@ -382,7 +382,7 @@ from pypy.module.micronumpy.interp_numarray import Call2 assert isinstance(arr, Call2) - ltransforms = transforms + [BroadcastTransform(arr.shape)] + ltransforms = [BroadcastTransform(arr.shape)] + transforms self.left._create_iter(iterlist, arraylist, arr.left, ltransforms) self.right._create_iter(iterlist, arraylist, arr.right, transforms) @@ -395,7 +395,7 @@ from pypy.module.micronumpy.interp_numarray import Call2 assert isinstance(arr, Call2) - rtransforms = transforms + [BroadcastTransform(arr.shape)] + rtransforms = [BroadcastTransform(arr.shape)] + transforms self.left._create_iter(iterlist, arraylist, arr.left, transforms) self.right._create_iter(iterlist, arraylist, arr.right, rtransforms) @@ -408,8 +408,8 @@ from pypy.module.micronumpy.interp_numarray import Call2 assert isinstance(arr, Call2) - rtransforms = transforms + [BroadcastTransform(arr.shape)] - ltransforms = transforms + [BroadcastTransform(arr.shape)] + rtransforms = [BroadcastTransform(arr.shape)] + transforms + ltransforms = [BroadcastTransform(arr.shape)] + transforms self.left._create_iter(iterlist, arraylist, arr.left, ltransforms) self.right._create_iter(iterlist, arraylist, arr.right, rtransforms) @@ -455,7 +455,7 @@ from pypy.module.micronumpy.interp_numarray import SliceArray assert isinstance(arr, SliceArray) - rtransforms = transforms + [BroadcastTransform(arr.shape)] + rtransforms = [BroadcastTransform(arr.shape)] + transforms self.left._create_iter(iterlist, arraylist, arr.left, transforms) self.right._create_iter(iterlist, arraylist, arr.right, rtransforms) diff --git a/pypy/module/micronumpy/test/test_numarray.py b/pypy/module/micronumpy/test/test_numarray.py --- a/pypy/module/micronumpy/test/test_numarray.py +++ b/pypy/module/micronumpy/test/test_numarray.py @@ -407,8 +407,6 @@ for x in range(3): for y in range(2): expected[x, y] = math.cos(a[x]) * math.cos(b[y]) - print (cos(a)[:,newaxis] * cos(b).T) - print expected assert ((cos(a)[:,newaxis] * cos(b).T) == expected).all() def test_newaxis_slice(self): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit