[pypy-commit] pypy matrixmath-dot: cleanup after merge, all tests pass

[mattip]

Author: mattip
Branch: matrixmath-dot
Changeset: r51924:cb8369cbce6f
Date: 2012-01-28 19:44 +0200
http://bitbucket.org/pypy/pypy/changeset/cb8369cbce6f/

Log:	cleanup after merge, all tests pass

diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -7,6 +7,7 @@
 from pypy.module.micronumpy.strides import (calculate_slice_strides,
     shape_agreement, find_shape_and_elems, get_shape_from_iterable,
     calc_new_strides, to_coords)
+from dot import multidim_dot, match_dot_shapes
 from pypy.rlib import jit
 from pypy.rpython.lltypesystem import lltype, rffi
 from pypy.tool.sourcetools import func_with_new_name
@@ -786,7 +787,7 @@
     def __init__(self, child, chunks, shape):
         self.child = child
         self.chunks = chunks
-        self.size = size
+        self.size = support.product(shape)
         VirtualArray.__init__(self, 'slice', shape, child.find_dtype())
 
     def create_sig(self):
diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py
--- a/pypy/module/micronumpy/test/test_zjit.py
+++ b/pypy/module/micronumpy/test/test_zjit.py
@@ -467,7 +467,7 @@
     def test_dot(self):
         result = self.run("dot")
         assert result == 184
-        self.check_simple_loop({{'arraylen_gc': 9,
+        self.check_simple_loop({'arraylen_gc': 9,
                                 'float_add': 1,
                                 'float_mul': 1,
                                 'getinteriorfield_raw': 3,
@@ -477,7 +477,7 @@
                                 'int_lt': 6,
                                 'int_sub': 3,
                                 'jump': 1,
-                                'setinteriorfield_raw': 1}})
+                                'setinteriorfield_raw': 1})
 
 
 class TestNumpyOld(LLJitMixin):