Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r78888:c91e9f5f0bcd
Date: 2015-08-11 12:18 +0100
http://bitbucket.org/pypy/pypy/changeset/c91e9f5f0bcd/
Log: Must not use jitdriver.jit_merge_point() twice for the same
jitdriver instance!
diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py
--- a/pypy/module/micronumpy/loop.py
+++ b/pypy/module/micronumpy/loop.py
@@ -416,6 +416,9 @@
arg_driver = jit.JitDriver(name='numpy_' + op_name,
greens = ['shapelen', 'dtype'],
reds = 'auto')
+ arg_flat_driver = jit.JitDriver(name='numpy_flat_' + op_name,
+ greens = ['shapelen', 'dtype'],
+ reds = 'auto')
def argmin_argmax(space, w_arr, w_out, axis):
from pypy.module.micronumpy.descriptor import get_dtype_cache
@@ -457,7 +460,7 @@
state = iter.next(state)
shapelen = len(w_arr.get_shape())
while not iter.done(state):
- arg_driver.jit_merge_point(shapelen=shapelen, dtype=dtype)
+ arg_flat_driver.jit_merge_point(shapelen=shapelen, dtype=dtype)
w_val = iter.getitem(state)
new_best = getattr(dtype.itemtype, op_name)(cur_best, w_val)
if dtype.itemtype.ne(new_best, cur_best):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
