Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r66004:000f4bb7328b
Date: 2013-08-07 23:48 +0200
http://bitbucket.org/pypy/pypy/changeset/000f4bb7328b/
Log: Merged in w31rd0/pypy/numpypy-inplace-op (pull request #177)
issue 1539, added inplace array operations
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
@@ -737,6 +737,27 @@
descr_gt = _binop_comp_impl(_binop_impl("greater"))
descr_ge = _binop_comp_impl(_binop_impl("greater_equal"))
+ def _binop_inplace_impl(ufunc_name):
+ def impl(self, space, w_other):
+ w_out = self
+ ufunc = getattr(interp_ufuncs.get(space), ufunc_name)
+ return ufunc.call(space, [self, w_other, w_out])
+ return func_with_new_name(impl, "binop_inplace_%s_impl" % ufunc_name)
+
+ descr_iadd = _binop_inplace_impl("add")
+ descr_isub = _binop_inplace_impl("subtract")
+ descr_imul = _binop_inplace_impl("multiply")
+ descr_idiv = _binop_inplace_impl("divide")
+ descr_itruediv = _binop_inplace_impl("true_divide")
+ descr_ifloordiv = _binop_inplace_impl("floor_divide")
+ descr_imod = _binop_inplace_impl("mod")
+ descr_ipow = _binop_inplace_impl("power")
+ descr_ilshift = _binop_inplace_impl("left_shift")
+ descr_irshift = _binop_inplace_impl("right_shift")
+ descr_iand = _binop_inplace_impl("bitwise_and")
+ descr_ior = _binop_inplace_impl("bitwise_or")
+ descr_ixor = _binop_inplace_impl("bitwise_xor")
+
def _binop_right_impl(ufunc_name):
def impl(self, space, w_other, w_out=None):
w_other = convert_to_array(space, w_other)
@@ -1007,6 +1028,20 @@
__ror__ = interp2app(W_NDimArray.descr_ror),
__rxor__ = interp2app(W_NDimArray.descr_rxor),
+ __iadd__ = interp2app(W_NDimArray.descr_iadd),
+ __isub__ = interp2app(W_NDimArray.descr_isub),
+ __imul__ = interp2app(W_NDimArray.descr_imul),
+ __idiv__ = interp2app(W_NDimArray.descr_idiv),
+ __itruediv__ = interp2app(W_NDimArray.descr_itruediv),
+ __ifloordiv__ = interp2app(W_NDimArray.descr_ifloordiv),
+ __imod__ = interp2app(W_NDimArray.descr_imod),
+ __ipow__ = interp2app(W_NDimArray.descr_ipow),
+ __ilshift__ = interp2app(W_NDimArray.descr_ilshift),
+ __irshift__ = interp2app(W_NDimArray.descr_irshift),
+ __iand__ = interp2app(W_NDimArray.descr_iand),
+ __ior__ = interp2app(W_NDimArray.descr_ior),
+ __ixor__ = interp2app(W_NDimArray.descr_ixor),
+
__eq__ = interp2app(W_NDimArray.descr_eq),
__ne__ = interp2app(W_NDimArray.descr_ne),
__lt__ = interp2app(W_NDimArray.descr_lt),
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
@@ -789,6 +789,49 @@
r = [1, 2] + array([1, 2])
assert (r == [2, 4]).all()
+ def test_inline_op_scalar(self):
+ from numpypy import array
+ for op in [
+ '__iadd__',
+ '__isub__',
+ '__imul__',
+ '__idiv__',
+ '__ifloordiv__',
+ '__imod__',
+ '__ipow__',
+ '__ilshift__',
+ '__irshift__',
+ '__iand__',
+ '__ior__',
+ '__ixor__']:
+ a = b = array(range(3))
+ getattr(a, op).__call__(2)
+ assert id(a) == id(b)
+
+ def test_inline_op_array(self):
+ from numpypy import array
+ for op in [
+ '__iadd__',
+ '__isub__',
+ '__imul__',
+ '__idiv__',
+ '__ifloordiv__',
+ '__imod__',
+ '__ipow__',
+ '__ilshift__',
+ '__irshift__',
+ '__iand__',
+ '__ior__',
+ '__ixor__']:
+ a = b = array(range(5))
+ c = array(range(5))
+ d = array(5 * [2])
+ getattr(a, op).__call__(d)
+ assert id(a) == id(b)
+ reg_op = op.replace('__i', '__')
+ for i in range(5):
+ assert a[i] == getattr(c[i], reg_op).__call__(d[i])
+
def test_add_list(self):
from numpypy import array, ndarray
a = array(range(5))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
