Author: Matti Picus <[email protected]>
Branch: numpypy-disable-longdouble
Changeset: r61689:3963e0671b45
Date: 2013-02-23 21:51 +0200
http://bitbucket.org/pypy/pypy/changeset/3963e0671b45/
Log: use flag ENABLED_LONG_DOUBLE instead of '0'
diff --git a/pypy/module/micronumpy/__init__.py
b/pypy/module/micronumpy/__init__.py
--- a/pypy/module/micronumpy/__init__.py
+++ b/pypy/module/micronumpy/__init__.py
@@ -1,5 +1,5 @@
from pypy.interpreter.mixedmodule import MixedModule
-from pypy.module.micronumpy.interp_boxes import long_double_size
+from pypy.module.micronumpy.interp_boxes import long_double_size,
ENABLED_LONG_DOUBLE
class Module(MixedModule):
@@ -59,8 +59,6 @@
'float16': 'interp_boxes.W_Float16Box',
'float32': 'interp_boxes.W_Float32Box',
'float64': 'interp_boxes.W_Float64Box',
- # 'longdouble': 'interp_boxes.W_LongDoubleBox',
- # 'longfloat': 'interp_boxes.W_LongDoubleBox',
'intp': 'types.IntP.BoxType',
'uintp': 'types.UIntP.BoxType',
'flexible': 'interp_boxes.W_FlexibleBox',
@@ -73,8 +71,6 @@
'complex_': 'interp_boxes.W_Complex128Box',
'complex128': 'interp_boxes.W_Complex128Box',
'complex64': 'interp_boxes.W_Complex64Box',
- # 'clongdouble': 'interp_boxes.W_CLongDoubleBox',
- # 'clongfloat': 'interp_boxes.W_CLongDoubleBox',
}
# ufuncs
@@ -171,9 +167,22 @@
w_all = space.wrap(all_list)
space.setitem(self.w_dict, space.new_interned_str('__all__'), w_all)
-if 0 and long_double_size == 16:
- Module.interpleveldefs['float128'] = 'interp_boxes.W_Float128Box'
- Module.interpleveldefs['complex256'] = 'interp_boxes.W_Complex256Box'
-elif 0 and long_double_size == 12:
- Module.interpleveldefs['float96'] = 'interp_boxes.W_Float96Box'
- Module.interpleveldefs['complex192'] = 'interp_boxes.W_Complex192Box'
+if ENABLED_LONG_DOUBLE:
+ long_double_dtypes = [
+ ('longdouble', 'interp_boxes.W_LongDoubleBox'),
+ ('longfloat', 'interp_boxes.W_LongDoubleBox'),
+ ('clongdouble', 'interp_boxes.W_CLongDoubleBox'),
+ ('clongfloat', 'interp_boxes.W_CLongDoubleBox'),
+ ]
+ if long_double_size == 16:
+ long_double_dtypes += [
+ ('float128', 'interp_boxes.W_Float128Box'),
+ ('complex256', 'interp_boxes.W_Complex256Box'),
+ ]
+ elif long_double_size == 12:
+ long_double_dtypes += [
+ ('float96', 'interp_boxes.W_Float96Box'),
+ ('complex192', 'interp_boxes.W_Complex192Box'),
+ ]
+ for dt, box in long_double_dtypes:
+ Module.interpleveldefs[dt] = box
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -16,10 +16,12 @@
MIXIN_64 = (int_typedef,) if LONG_BIT == 64 else ()
# Is this the proper place for this?
+ENABLED_LONG_DOUBLE = False
long_double_size = rffi.sizeof_c_type('long double', ignore_errors=True)
+
import os
if long_double_size == 8 and os.name == 'nt':
- # this is a lie, or maybe a wish
+ # this is a lie, or maybe a wish, MS fakes longdouble math with double
long_double_size = 12
@@ -335,7 +337,7 @@
descr__new__, _get_dtype = new_dtype_getter("complex128")
_COMPONENTS_BOX = W_Float64Box
-if 0 and long_double_size == 12:
+if ENABLED_LONG_DOUBLE and long_double_size == 12:
class W_Float96Box(W_FloatingBox, PrimitiveBox):
descr__new__, _get_dtype = new_dtype_getter("float96")
@@ -347,7 +349,7 @@
W_CLongDoubleBox = W_Complex192Box
-elif 0 and long_double_size == 16:
+elif ENABLED_LONG_DOUBLE and long_double_size == 16:
class W_Float128Box(W_FloatingBox, PrimitiveBox):
descr__new__, _get_dtype = new_dtype_getter("float128")
W_LongDoubleBox = W_Float128Box
@@ -358,7 +360,7 @@
W_CLongDoubleBox = W_Complex256Box
-elif 0:
+elif ENABLED_LONG_DOUBLE:
W_LongDoubleBox = W_Float64Box
W_CLongDoubleBox = W_Complex64Box
@@ -526,7 +528,7 @@
__new__ = interp2app(W_Float64Box.descr__new__.im_func),
)
-if 0 and long_double_size == 12:
+if ENABLED_LONG_DOUBLE and long_double_size == 12:
W_Float96Box.typedef = TypeDef("float96", (W_FloatingBox.typedef),
__module__ = "numpypy",
@@ -540,7 +542,7 @@
imag = GetSetProperty(W_ComplexFloatingBox.descr_get_imag),
)
-elif 0 and long_double_size == 16:
+elif ENABLED_LONG_DOUBLE and long_double_size == 16:
W_Float128Box.typedef = TypeDef("float128", (W_FloatingBox.typedef),
__module__ = "numpypy",
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
@@ -474,7 +474,7 @@
aliases=["complex"],
float_type = self.w_float64dtype,
)
- if 0 and interp_boxes.long_double_size == 12:
+ if interp_boxes.ENABLED_LONG_DOUBLE and interp_boxes.long_double_size
== 12:
self.w_float96dtype = W_Dtype(
types.Float96(),
num=13,
@@ -497,7 +497,7 @@
)
self.w_longdouble = self.w_float96dtype
self.w_clongdouble = self.w_complex192dtype
- elif 0 and interp_boxes.long_double_size == 16:
+ elif interp_boxes.ENABLED_LONG_DOUBLE and
interp_boxes.long_double_size == 16:
self.w_float128dtype = W_Dtype(
types.Float128(),
num=13,
@@ -520,7 +520,7 @@
)
self.w_longdouble = self.w_float128dtype
self.w_clongdouble = self.w_complex256dtype
- elif 0:
+ elif interp_boxes.ENABLED_LONG_DOUBLE:
self.w_float64dtype.aliases += ["longdouble", "longfloat"]
self.w_complex128dtype.aliases += ["clongdouble", "clongfloat"]
self.w_longdouble = self.w_float64dtype
@@ -596,27 +596,27 @@
char=UINTPLTR,
w_box_type = space.gettypefor(uintp_box),
)
+ float_dtypes = [self.w_float16dtype,
+ self.w_float32dtype, self.w_float64dtype,
+ ]
+ complex_dtypes = [self.w_complex64dtype, self.w_complex128dtype]
+ if interp_boxes.ENABLED_LONG_DOUBLE:
+ float_dtypes.append(self.w_longdouble)
+ complex_dtypes.append(self.w_clongdouble)
self.builtin_dtypes = [
self.w_booldtype,
self.w_int8dtype, self.w_uint8dtype,
self.w_int16dtype, self.w_uint16dtype,
self.w_longdtype, self.w_ulongdtype,
self.w_int32dtype, self.w_uint32dtype,
- self.w_int64dtype, self.w_uint64dtype,
- self.w_float16dtype,
- self.w_float32dtype, self.w_float64dtype,
- # self.w_longdouble,
- self.w_complex64dtype, self.w_complex128dtype,
- # self.w_clongdouble,
+ self.w_int64dtype, self.w_uint64dtype] + \
+ float_dtypes + complex_dtypes + [
self.w_stringdtype, self.w_unicodedtype, self.w_voiddtype,
self.w_intpdtype, self.w_uintpdtype,
]
self.float_dtypes_by_num_bytes = sorted(
(dtype.itemtype.get_element_size(), dtype)
- for dtype in [self.w_float16dtype, self.w_float32dtype,
- self.w_float64dtype,
- # self.w_longdouble,
- ]
+ for dtype in float_dtypes
)
self.dtypes_by_num = {}
self.dtypes_by_name = {}
@@ -659,7 +659,6 @@
'LONGLONG': self.w_int64dtype,
'SHORT': self.w_int16dtype,
'VOID': self.w_voiddtype,
- #'LONGDOUBLE': self.w_longdouble,
'UBYTE': self.w_uint8dtype,
'UINTP': self.w_ulongdtype,
'ULONG': self.w_ulongdtype,
@@ -682,8 +681,11 @@
'USHORT': self.w_uint16dtype,
'FLOAT': self.w_float32dtype,
'BOOL': self.w_booldtype,
- #'CLONGDOUBLE': self.w_clongdouble,
}
+ if interp_boxes.ENABLED_LONG_DOUBLE:
+ typeinfo_full['LONGDOUBLE'] = self.w_longdouble
+ typeinfo_full['CLONGDOUBLE'] = self.w_clongdouble
+
typeinfo_partial = {
'Generic': interp_boxes.W_GenericBox,
'Character': interp_boxes.W_CharacterBox,
diff --git a/pypy/module/micronumpy/interp_ufuncs.py
b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -400,7 +400,7 @@
return interp_dtype.get_dtype_cache(space).w_complex64dtype
elif dt2.num == 15:
return interp_dtype.get_dtype_cache(space).w_complex128dtype
- elif 0 and dt2.num == 16:
+ elif interp_boxes.ENABLED_LONG_DOUBLE and dt2.num == 16:
return interp_dtype.get_dtype_cache(space).w_clongdouble
else:
raise OperationError(space.w_TypeError, space.wrap("Unsupported
types"))
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1515,7 +1515,7 @@
NonNativeComplex128 = Complex128
-if 0 and interp_boxes.long_double_size == 12:
+if interp_boxes.ENABLED_LONG_DOUBLE and interp_boxes.long_double_size == 12:
class Float96(BaseType, Float):
_attrs_ = ()
@@ -1545,7 +1545,7 @@
NonNativeComplex192 = Complex192
-elif 0 and interp_boxes.long_double_size == 16:
+elif interp_boxes.ENABLED_LONG_DOUBLE and interp_boxes.long_double_size == 16:
class Float128(BaseType, Float):
_attrs_ = ()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
