Author: Maciej Fijalkowski <[email protected]>
Branch: numpy-refactor
Changeset: r57026:d1c35c04ec4e
Date: 2012-08-30 18:00 +0200
http://bitbucket.org/pypy/pypy/changeset/d1c35c04ec4e/
Log: fixes
diff --git a/pypy/module/micronumpy/arrayimpl/concrete.py
b/pypy/module/micronumpy/arrayimpl/concrete.py
--- a/pypy/module/micronumpy/arrayimpl/concrete.py
+++ b/pypy/module/micronumpy/arrayimpl/concrete.py
@@ -81,6 +81,9 @@
impl = ConcreteArray(self.shape, self.dtype, self.order)
return loop.setslice(impl, self)
+ def setslice(self, arr):
+ loop.setslice(self, arr)
+
def get_size(self):
return self.size // self.dtype.itemtype.get_element_size()
@@ -185,7 +188,7 @@
w_value = support.convert_to_array(space, w_value)
chunks = self._prepare_slice_args(space, w_index)
view = chunks.apply(self)
- view.setslice(space, w_value)
+ view.implementation.setslice(w_value.implementation)
def transpose(self):
if len(self.shape) < 2:
@@ -209,5 +212,5 @@
self.storage = parent.storage
self.order = parent.order
self.dtype = parent.dtype
- self.size = support.product(shape)
+ self.size = support.product(shape) *
self.dtype.itemtype.get_element_size()
self.start = start
diff --git a/pypy/module/micronumpy/iter.py b/pypy/module/micronumpy/iter.py
--- a/pypy/module/micronumpy/iter.py
+++ b/pypy/module/micronumpy/iter.py
@@ -87,7 +87,7 @@
arr.backstrides, self.l)
_, start, strides, backstrides = r
return slice_w(start, strides[:], backstrides[:],
- shape[:], arr)
+ shape[:], arr)
class Chunk(BaseChunk):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
