Author: Ilya Osadchiy <osadchiy.i...@gmail.com>
Branch: numpy-comparison
Changeset: r47016:35292645eb01
Date: 2011-09-02 11:29 +0300
http://bitbucket.org/pypy/pypy/changeset/35292645eb01/
Log: post-merge fixes
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
@@ -74,12 +74,12 @@
descr_pow = _binop_impl("power")
descr_mod = _binop_impl("mod")
- descr_eq = _binop_impl(interp_ufuncs.equal)
- descr_ne = _binop_impl(interp_ufuncs.not_equal)
- descr_lt = _binop_impl(interp_ufuncs.less)
- descr_le = _binop_impl(interp_ufuncs.less_equal)
- descr_gt = _binop_impl(interp_ufuncs.greater)
- descr_ge = _binop_impl(interp_ufuncs.greater_equal)
+ descr_eq = _binop_impl("equal")
+ descr_ne = _binop_impl("not_equal")
+ descr_lt = _binop_impl("less")
+ descr_le = _binop_impl("less_equal")
+ descr_gt = _binop_impl("greater")
+ descr_ge = _binop_impl("greater_equal")
def _binop_right_impl(ufunc_name):
def impl(self, space, w_other):
diff --git a/pypy/module/micronumpy/interp_ufuncs.py
b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -141,12 +141,11 @@
rhs = w_rhs.value.convert_to(calc_dtype)
interm_res = self.func(calc_dtype, lhs, rhs)
return interm_res.convert_to(res_dtype).wrap(space)
- return self.func(res_dtype, w_lhs.value, w_rhs.value).wrap(space)
new_sig = signature.Signature.find_sig([
self.signature, w_lhs.signature, w_rhs.signature
])
- w_res = Call2(new_sig, res_dtype, res_dtype, calc_dtype, w_lhs, w_rhs)
+ w_res = Call2(new_sig, res_dtype, calc_dtype, w_lhs, w_rhs)
w_lhs.add_invalidates(w_res)
w_rhs.add_invalidates(w_res)
return w_res
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
