Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: numpy-record-dtypes
Changeset: r52614:2644ecaa4fc2
Date: 2012-02-18 18:47 +0200
http://bitbucket.org/pypy/pypy/changeset/2644ecaa4fc2/
Log: fix the merge point in flat_set_driver
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
@@ -47,7 +47,7 @@
)
flat_set_driver = jit.JitDriver(
greens=['shapelen', 'base'],
- reds=['step', 'ai', 'lngth', 'arr', 'basei'],
+ reds=['step', 'ai', 'ri', 'lngth', 'arr', 'basei'],
name='numpy_flatset',
)
@@ -1370,8 +1370,7 @@
basei=basei,
step=step,
res=res,
- ri=ri,
- )
+ ri=ri)
w_val = base.getitem(basei.offset)
res.setitem(ri.offset, w_val)
basei = basei.next_skip_x(shapelen, step)
@@ -1394,13 +1393,13 @@
basei = basei.next_skip_x(shapelen, start)
while lngth > 0:
flat_set_driver.jit_merge_point(shapelen=shapelen,
- basei=basei,
- base=base,
- step=step,
- arr=arr,
- ai=ai,
- lngth=lngth,
- )
+ basei=basei,
+ base=base,
+ step=step,
+ arr=arr,
+ ai=ai,
+ lngth=lngth,
+ ri=ri)
v = arr.getitem(ri.offset).convert_to(base.dtype)
base.setitem(basei.offset, v)
# need to repeat input values until all assignments are done
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
