Author: Matti Picus <[email protected]>
Branch: indexing-by-array
Changeset: r62402:47a587edf829
Date: 2013-03-18 11:49 -0700
http://bitbucket.org/pypy/pypy/changeset/47a587edf829/
Log: wip
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
@@ -307,7 +307,7 @@
index_dtype = index.get_dtype()
# XXX length of shape of index as well?
while not index_iter.done():
- print 'res,arr,index', res_iter.get_index(), arr.get_index(),
index.get_index()
+ print 'res,arr,index', res_iter.offset, arr_iter.offset,
index_iter.offset, index_iter.getitem_bool()
getitem_filter_driver.jit_merge_point(shapelen=shapelen,
index_dtype=index_dtype,
arr_dtype=arr_dtype,
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
@@ -1612,7 +1612,9 @@
raises(ValueError, "b[array([[True, False], [True, False]])]")
a = array([[1,2,3],[4,5,6],[7,8,9]],int)
c = array([True,False,True],bool)
+ print 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
b = a[c]
+ print 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
assert (a[c] == [[1, 2, 3], [7, 8, 9]]).all()
def test_bool_array_index_setitem(self):
@@ -2064,7 +2066,6 @@
assert isinstance(i['data'][0], int)
def test_array_indexing_one_elem(self):
- skip("not yet")
from numpypy import array, arange
raises(IndexError, 'arange(3)[array([3.5])]')
a = arange(3)[array([1])]
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
