Author: mattip <[email protected]>
Branch: ufuncapi
Changeset: r74604:75e3444eb0a1
Date: 2014-11-19 21:35 +0200
http://bitbucket.org/pypy/pypy/changeset/75e3444eb0a1/
Log: pass cpyext ndarrayobject ufunc test
diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -1289,7 +1289,7 @@
space.wrap("cannot mix ndarray and %r (arg %d) in
call to ufunc" % (
arg_i, i)))
raw_storage_setitem(dataps, CCHARP_SIZE * i,
- rffi.cast(rffi.CCHARP, arg_i.implementation.storage))
+ rffi.cast(rffi.CCHARP,
arg_i.implementation.get_storage_as_int(space)))
#This assumes we iterate over the whole array (it should be a
view...)
raw_storage_setitem(self.dims, LONG_SIZE * i,
rffi.cast(rffi.LONG, arg_i.get_size()))
raw_storage_setitem(self.steps, LONG_SIZE * i,
rffi.cast(rffi.LONG, arg_i.get_dtype().elsize))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
