[pypy-commit] pypy numpy-dtype: add interp_dtype.py and its test file

[justinpeel]

Author: Justin Peel <notmuchtotell at gmail.com>
Branch: numpy-dtype
Changeset: r46175:e563185b1051
Date: 2011-08-01 23:21 -0600
http://bitbucket.org/pypy/pypy/changeset/e563185b1051/

Log:	add interp_dtype.py and its test file

diff --git a/pypy/module/micronumpy/interp_dtype.py b/pypy/module/micronumpy/interp_dtype.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -0,0 +1,97 @@
+from pypy.interpreter.baseobjspace import Wrappable
+from pypy.interpreter.error import OperationError
+from pypy.interpreter.gateway import interp2app
+from pypy.interpreter.typedef import TypeDef
+
+_letters_to_nums = [-1]*128
+
+_letters_to_nums[ord('?')] = 0 # bool
+_letters_to_nums[ord('b')] = 1 # int8
+_letters_to_nums[ord('B')] = 2 # uint8
+_letters_to_nums[ord('h')] = 3 # int16
+_letters_to_nums[ord('H')] = 4 # uint16
+_letters_to_nums[ord('i')] = 5 # int32
+_letters_to_nums[ord('I')] = 6 # uint32
+_letters_to_nums[ord('l')] = 7 # long
+_letters_to_nums[ord('L')] = 8 # ulong
+_letters_to_nums[ord('q')] = 9 # longlong
+_letters_to_nums[ord('Q')] = 10 # ulonglong
+_letters_to_nums[ord('f')] = 11 # float (float32)
+_letters_to_nums[ord('d')] = 12 # double (float64)
+_letters_to_nums[ord('g')] = 13 # longdouble (float128)
+# need to put in the rest of the type letters
+
+# typenums
+Bool_num = 0
+Int32_num = 5
+UInt32_num = 6
+Float64_num = 12
+
+# dtype 'kinds'. Used to determine which operations can be performed on array
+BOOLLTR = 'b'
+FLOATINGLTR = 'f'
+SIGNEDLTR = 'i'
+UNSIGNEDLTR = 'u'
+
+class Dtype(Wrappable):
+    # attributes: type, kind, typeobj?(I think it should point to np.float64 or
+    # the like), byteorder, flags, type_num, elsize, alignment, subarray,
+    # fields, names, f?, metadata. I'll just implement the base minimum for 
+    # now. This will include type, kind, typeobj?, byteorder, type_num, elsize,
+    # 
+    def __init__(self, convfunc, wrapfunc, typenum, kind):
+        # doesn't handle align and copy parameters yet
+        # only deals with simple strings e.g., 'uint32', and type objects
+        self.convfunc = convfunc
+        self.wrapfunc = wrapfunc
+        self.typenum = typenum
+        self.kind = kind
+
+def conv_float(space, val):
+    return space.float(val)
+
+def wrap_float(space, val):
+    return space.float_w(val)
+
+def conv_int(space, val):
+    return space.int(val)
+
+def wrap_int(space, val):
+    return space.int_w(val)
+
+Float64_dtype = Dtype(conv_float, wrap_float, Float64_num,
+                        FLOATINGLTR)
+Int32_dtype = Dtype(conv_int, wrap_int, Int32_num, SIGNEDLTR)
+
+_dtype_list = [None] * 14
+_dtype_list[Float64_num] = Float64_dtype
+_dtype_list[Int32_num] = Int32_dtype
+
+def get_dtype(space, w_type, w_string_or_type):
+    if space.is_true(space.isinstance(w_string_or_type, space.gettypeobject(Dtype.typedef))):
+        return w_string_or_type
+    if space.is_true(space.isinstance(w_string_or_type, space.w_str)):
+        s = space.str_w(w_string_or_type)
+        if len(s) == 1:
+            typenum = _letters_to_nums[ord(s)]
+            dtype = _dtype_list[typenum]
+            if typenum != -1 and dtype is not None:
+                return _dtype_list[typenum]
+        # XXX: need to put in 2 letters strings
+        raise OperationError(space.w_ValueError,
+                            space.wrap("type not recognized"))
+    elif space.is_true(space.isinstance(w_string_or_type, space.w_type)):
+        # XXX: need to implement this
+        return Float64_dtype
+    else:
+        raise OperationError(space.w_TypeError,
+                            space.wrap("data type not understood"))
+
+
+def descr_new_dtype(space, w_type, w_string_or_type):
+    return space.wrap(get_dtype(space, w_type, w_string_or_type))
+
+Dtype.typedef = TypeDef(
+    'numpy.dtype',
+    __new__  = interp2app(descr_new_dtype),
+)
diff --git a/pypy/module/micronumpy/test/test_dtypes.py b/pypy/module/micronumpy/test/test_dtypes.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -0,0 +1,8 @@
+import py
+
+from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
+
+class AppTestDtype(BaseNumpyAppTest):
+    def test_dtype(self):
+        from numpy import dtype
+        d = dtype('i')