Author: Brian Kearns <[email protected]>
Branch:
Changeset: r74852:b797c990f775
Date: 2014-12-06 15:03 -0500
http://bitbucket.org/pypy/pypy/changeset/b797c990f775/
Log: adjust test_zjit func name for clarity
diff --git a/pypy/module/micronumpy/compile.py
b/pypy/module/micronumpy/compile.py
--- a/pypy/module/micronumpy/compile.py
+++ b/pypy/module/micronumpy/compile.py
@@ -33,9 +33,9 @@
pass
-SINGLE_ARG_FUNCTIONS = ["sum", "prod", "max", "min", "all", "any", "xor",
+SINGLE_ARG_FUNCTIONS = ["sum", "prod", "max", "min", "all", "any",
"unegative", "flat", "tostring", "count_nonzero",
- "argsort", "cumsum"]
+ "argsort", "cumsum", "logical_xor_reduce"]
TWO_ARG_FUNCTIONS = ["dot", 'take', 'searchsorted']
TWO_ARG_FUNCTIONS_OR_NONE = ['view', 'astype']
THREE_ARG_FUNCTIONS = ['where']
@@ -561,9 +561,9 @@
w_res = arr.descr_all(interp.space)
elif self.name == "cumsum":
w_res = arr.descr_cumsum(interp.space)
- elif self.name == "xor":
- xor = ufuncs.get(interp.space).logical_xor
- w_res = xor.reduce(interp.space, arr, None)
+ elif self.name == "logical_xor_reduce":
+ logical_xor = ufuncs.get(interp.space).logical_xor
+ w_res = logical_xor.reduce(interp.space, arr, None)
elif self.name == "unegative":
neg = ufuncs.get(interp.space).negative
w_res = neg.call(interp.space, [arr])
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
@@ -416,7 +416,7 @@
def define_logical_xor_reduce():
return """
a = [1,1,1,1,1,1,1,1]
- xor(a)
+ logical_xor_reduce(a)
"""
def test_logical_xor_reduce(self):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
