Author: Justin Peel <[email protected]>
Branch: unsigned-dtypes
Changeset: r47657:de20c133f822
Date: 2011-09-28 14:32 +0000
http://bitbucket.org/pypy/pypy/changeset/de20c133f822/
Log: Fix numpy.sign
diff --git a/pypy/jit/metainterp/test/support.py
b/pypy/jit/metainterp/test/support.py
--- a/pypy/jit/metainterp/test/support.py
+++ b/pypy/jit/metainterp/test/support.py
@@ -90,6 +90,7 @@
blackholeinterp.setarg_r(count_r, value)
count_r += 1
elif T == lltype.Float:
+ print 'ohyes!!'
value = longlong.getfloatstorage(value)
blackholeinterp.setarg_f(count_f, value)
count_f += 1
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
@@ -149,7 +149,7 @@
return self.adapt_val(func(self, self.for_computation(self.unbox(v))))
return impl
-class ArithmaticTypeMixin(object):
+class ArithmeticTypeMixin(object):
_mixin_ = True
@binop
@@ -204,7 +204,7 @@
return v1 >= v2
-class FloatArithmeticDtype(ArithmaticTypeMixin):
+class FloatArithmeticDtype(ArithmeticTypeMixin):
_mixin_ = True
def unwrap(self, space, w_item):
@@ -272,7 +272,7 @@
def arctan(self, v):
return math.atan(v)
-class IntegerArithmeticDtype(ArithmaticTypeMixin):
+class IntegerArithmeticDtype(ArithmeticTypeMixin):
_mixin_ = True
def unwrap(self, space, w_item):
@@ -288,6 +288,9 @@
def mod(self, v1, v2):
return v1 % v2
+class SignedIntegerArithmeticDtype(IntegerArithmeticDtype):
+ _mixin_ = True
+
@unaryop
def sign(self, v):
if v > 0:
@@ -298,6 +301,17 @@
assert v == 0
return 0
+class UnsignedIntegerArithmeticDtype(IntegerArithmeticDtype):
+ _mixin_ = True
+
+ @unaryop
+ def sign(self, v):
+ if v != 0:
+ return 1
+ else:
+ assert v == 0
+ return 0
+
W_BoolDtype = create_low_level_dtype(
num = 0, kind = BOOLLTR, name = "bool",
@@ -306,7 +320,7 @@
T = lltype.Bool,
valtype = bool,
)
-class W_BoolDtype(IntegerArithmeticDtype, W_BoolDtype):
+class W_BoolDtype(SignedIntegerArithmeticDtype, W_BoolDtype):
def unwrap(self, space, w_item):
return self.adapt_val(space.is_true(w_item))
@@ -325,7 +339,7 @@
valtype = rffi.SIGNEDCHAR._type,
expected_size = 1,
)
-class W_Int8Dtype(IntegerArithmeticDtype, W_Int8Dtype):
+class W_Int8Dtype(SignedIntegerArithmeticDtype, W_Int8Dtype):
pass
W_UInt8Dtype = create_low_level_dtype(
@@ -336,7 +350,7 @@
valtype = rffi.UCHAR._type,
expected_size = 1,
)
-class W_UInt8Dtype(IntegerArithmeticDtype, W_UInt8Dtype):
+class W_UInt8Dtype(UnsignedIntegerArithmeticDtype, W_UInt8Dtype):
pass
W_Int16Dtype = create_low_level_dtype(
@@ -347,7 +361,7 @@
valtype = rffi.SHORT._type,
expected_size = 2,
)
-class W_Int16Dtype(IntegerArithmeticDtype, W_Int16Dtype):
+class W_Int16Dtype(SignedIntegerArithmeticDtype, W_Int16Dtype):
pass
W_UInt16Dtype = create_low_level_dtype(
@@ -358,7 +372,7 @@
valtype = rffi.USHORT._type,
expected_size = 2,
)
-class W_UInt16Dtype(IntegerArithmeticDtype, W_UInt16Dtype):
+class W_UInt16Dtype(UnsignedIntegerArithmeticDtype, W_UInt16Dtype):
pass
W_Int32Dtype = create_low_level_dtype(
@@ -369,7 +383,7 @@
valtype = rffi.INT._type,
expected_size = 4,
)
-class W_Int32Dtype(IntegerArithmeticDtype, W_Int32Dtype):
+class W_Int32Dtype(SignedIntegerArithmeticDtype, W_Int32Dtype):
pass
W_UInt32Dtype = create_low_level_dtype(
@@ -380,7 +394,7 @@
valtype = rffi.UINT._type,
expected_size = 4,
)
-class W_UInt32Dtype(IntegerArithmeticDtype, W_UInt32Dtype):
+class W_UInt32Dtype(UnsignedIntegerArithmeticDtype, W_UInt32Dtype):
pass
W_Int64Dtype = create_low_level_dtype(
@@ -391,7 +405,7 @@
valtype = rffi.LONGLONG._type,
expected_size = 8,
)
-class W_Int64Dtype(IntegerArithmeticDtype, W_Int64Dtype):
+class W_Int64Dtype(SignedIntegerArithmeticDtype, W_Int64Dtype):
pass
W_UInt64Dtype = create_low_level_dtype(
@@ -402,7 +416,7 @@
valtype = rffi.ULONGLONG._type,
expected_size = 8,
)
-class W_UInt64Dtype(IntegerArithmeticDtype, W_UInt64Dtype):
+class W_UInt64Dtype(UnsignedIntegerArithmeticDtype, W_UInt64Dtype):
pass
if LONG_BIT == 32:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
