Author: Timo Paulssen <timona...@perpetuum-immobile.de>
Branch: numpy-data-buffer
Changeset: r47782:d4bb282ba363
Date: 2011-10-03 07:58 +0200
http://bitbucket.org/pypy/pypy/changeset/d4bb282ba363/
Log: more tests for floats, setslice, setitem, ...
diff --git a/pypy/module/_numpy/test/test_buffer.py
b/pypy/module/_numpy/test/test_buffer.py
--- a/pypy/module/_numpy/test/test_buffer.py
+++ b/pypy/module/_numpy/test/test_buffer.py
@@ -36,9 +36,13 @@
buf = br.data
assert len(buf) == 5 * (64 / 8)
+ for idx in range(8):
+ assert buf[idx] == pack("d", 5)[idx]
assert buf[:8] == pack("d", 5)
br[0] = 100
+ for idx in range(8):
+ assert buf[idx] == pack("d", 100)[idx]
assert buf[:8] == pack("d", 100)
def test_slice_view(self):
@@ -67,10 +71,13 @@
assert len(viewbuf) == len(buf) - 2 * (64 / 8)
assert viewbuf[:8] == buf[8:16] == pack("d", 6)
+ for idx in range(8):
+ assert viewbuf[idx] == buf[8+idx] == pack("d", 6)[idx]
def test_buffer_set(self):
from _numpy import array
from _numpy import dtype
+ from struct import pack
ar = array(range(5), dtype=dtype("int8"))
buf = ar.data
@@ -82,9 +89,19 @@
raises(IndexError, "buf[5] = '\\9'")
+ br = array(range(5), dtype=float)
+ buf = br.data
+
+ for idx in range(8):
+ buf[idx] = pack("d", 99)[idx]
+ assert br[0] == 99
+ buf[:8] = pack("d", 23.42)
+ assert br[0] == 23.42
+
def test_slice_set(self):
from _numpy import array
from _numpy import dtype
+ from struct import pack
ar = array(range(5), dtype=dtype("int8"))
view = ar[1:-1]
@@ -101,6 +118,21 @@
raises(IndexError, "view[4] = '\\5'")
+ br = array(range(5), dtype=float)
+
+ view = br[1:-1]
+ buf = br.data
+ viewbuf = view.data
+
+ viewbuf[:8] = pack("d", 9000)
+ assert buf[8:16] == viewbuf[:8]
+ assert br[1] == view[0] == 9000
+
+ for idx in range(8):
+ viewbuf[idx] = pack("d", -9000)[idx]
+ assert buf[8:16] == viewbuf[:8]
+ assert br[1] == view[0] == -9000
+
def test_buffer_setslice(self):
from _numpy import array
from _numpy import dtype
@@ -113,6 +145,8 @@
assert ar[2] == 1
assert ar[3] == 1
+ # tests for float dtype already done above
+
def test_view_setslice(self):
from _numpy import array
from _numpy import dtype
@@ -125,3 +159,5 @@
assert ar[2] == 1
assert ar[3] == 1
assert ar[4] == 1
+
+ # tests for float dtype already done above
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
