Author: Justin Peel <notmuchtot...@gmail.com>
Branch: numpy-dtype
Changeset: r46716:d3b95f7ca4d2
Date: 2011-08-22 12:31 -0600
http://bitbucket.org/pypy/pypy/changeset/d3b95f7ca4d2/
Log: convert_to_array can handle scalars again.
diff --git a/pypy/module/micronumpy/interp_dtype.py
b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -239,10 +239,11 @@
def find_scalar_dtype(space, scalar):
if space.is_true(space.isinstance(scalar, space.w_int)):
return Long_dtype
- if space.is_true(space.isinstance(scalar, space.w_float)):
- return Float64_dtype
if space.is_true(space.isinstance(scalar, space.w_bool)):
return Bool_dtype
+ if space.is_true(space.isinstance(scalar, space.w_long)):
+ return Int64_dtype
+ return Float64_dtype
def find_result_dtype(d1, d2):
# this function is for determining the result dtype of bin ops, etc.
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
@@ -71,11 +71,11 @@
descr_pow = _binop_impl(interp_ufuncs.power)
descr_mod = _binop_impl(interp_ufuncs.mod)"""
- def _binop_right_impl(w_ufunc):
- def impl(self, space, w_other):
- w_other = wrap_scalar(space, w_other, self.dtype)
- return w_ufunc(space, w_other, self)
- return func_with_new_name(impl, "binop_right_%s_impl" %
w_ufunc.__name__)
+ #def _binop_right_impl(w_ufunc):
+ # def impl(self, space, w_other):
+ # w_other = wrap_scalar(space, w_other, self.dtype)
+ # return w_ufunc(space, w_other, self)
+ # return func_with_new_name(impl, "binop_right_%s_impl" %
w_ufunc.__name__)
"""descr_radd = _binop_right_impl(interp_ufuncs.add)
descr_rsub = _binop_right_impl(interp_ufuncs.subtract)
@@ -277,8 +277,6 @@
def descr_mean(self, space):
return
space.wrap(space.float_w(self.descr_sum(space))/self.find_size())
-
-
def convert_to_array (space, w_obj):
if isinstance(w_obj, BaseArray):
return w_obj
@@ -287,40 +285,46 @@
# XXX: Need to fill in the dtype
return new_numarray(space, w_obj, Float64_dtype)
else:
- raise OperationError(space.w_ValueError, space.wrap("no scalars"))
# If it's a scalar
- #return wrap_scalar(space, w_obj)
+ dtype = find_scalar_dtype(space, w_obj)
+ return wrap_scalar(space, w_obj, dtype)
-def wrap_scalar(space, scalar, dtype=None):
- if dtype is None:
- dtype = find_scalar_dtype(space, scalar)
- return ScalarWrapper(dtype.cast(dtype.unwrap(space, scalar)), dtype)
+def make_scalarwrapper(_dtype):
+ class ScalarWrapper(BaseArray):
+ """
+ Intermediate class representing a float literal.
+ """
+ _immutable_fields_ = ["value"]
+ signature = Signature()
-class ScalarWrapper(BaseArray):
- """
- Intermediate class representing a float literal.
- """
- _immutable_fields_ = ["value"]
- signature = Signature()
+ def __init__(self, space, value):
+ BaseArray.__init__(self)
+ self.value = _dtype.valtype(_dtype.unwrap(space, value))
+ self.dtype = _dtype
- def __init__(self, value, dtype):
- BaseArray.__init__(self)
- self.value = value
- self.dtype = dtype
+ def find_size(self):
+ raise ValueError
- def find_size(self):
- raise ValueError
+ def eval(self, i):
+ return self.value
- def eval(self, i):
- return self.value
+ def find_dtype(self):
+ return _dtype
+ ScalarWrapper.__name__ = "ScalarWrapper_" + _dtype.name
+ return ScalarWrapper
- def find_dtype(self):
- return self.dtype
+_scalarwrappers = [make_scalarwrapper(d) for d in _dtype_list]
+
+def wrap_scalar(space, scalar, dtype):
+ assert isinstance(dtype, Dtype)
+ return _scalarwrappers[dtype.num](space, scalar)
+ #return ScalarWrapper(dtype.cast(dtype.unwrap(space, scalar)), dtype)
# this is really only to simplify the tests. Maybe it should be moved?
-class FloatWrapper(ScalarWrapper):
- def __init__(self, value):
- ScalarWrapper.__init__(self, value, Float64_dtype)
+FloatWrapper = _scalarwrappers[12]
+#class FloatWrapper(ScalarWrapper):
+# def __init__(self, value):
+# ScalarWrapper.__init__(self, value, Float64_dtype)
def make_virtualarray(_dtype):
class VirtualArray(BaseArray):
@@ -450,12 +454,12 @@
return _call2_classes[dtype1.num]
return _call2_classes[find_result_dtype(dtype1, dtype2)]
-#class ViewArray(BaseArray):
-# """
-# Class for representing views of arrays, they will reflect changes of
parent
-# arrays. Example: slices
-# """
-""" _immutable_fields_ = ["parent"]
+class ViewArray(BaseArray):
+ """
+ Class for representing views of arrays, they will reflect changes of parent
+ arrays. Example: slices
+ """
+ _immutable_fields_ = ["parent"]
def __init__(self, parent, signature):
BaseArray.__init__(self)
@@ -520,13 +524,10 @@
if stop != -1:
stop = self.calc_index(stop)
step = self.step * step
- if step > 0:
- self._sliceloop1(start, stop, step, arr, self.parent)
- else:
- self._sliceloop2(start, stop, step, arr, self.parent)
+ self.parent.setslice(space, start, stop, step, slice_length, arr)
def calc_index(self, item):
- return (self.start + item * self.step)"""
+ return (self.start + item * self.step)
class SingleDimArray(BaseArray):
def __init__(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
