[pypy-commit] pypy default: oops ldexp breaks translation, remove for now

bdkearns noreply at buildbot.pypy.org
Thu Oct 17 09:36:30 CEST 2013


Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r67455:c3f5e0155683
Date: 2013-10-17 03:31 -0400
http://bitbucket.org/pypy/pypy/changeset/c3f5e0155683/

Log:	oops ldexp breaks translation, remove for now

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
@@ -104,7 +104,6 @@
         ('floor_divide', 'floor_divide'),
         ('logaddexp', 'logaddexp'),
         ('logaddexp2', 'logaddexp2'),
-        ('ldexp', 'ldexp'),
         ('real', 'real'),
         ('imag', 'imag'),
         ('ones_like', 'ones_like'),
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
@@ -702,7 +702,6 @@
                                        "allow_complex": False}),
             ("logaddexp2", "logaddexp2", 2, {"promote_to_float": True,
                                        "allow_complex": False}),
-            ("ldexp", "ldexp", 2, {"int_only": True}),
 
             ("ones_like", "ones_like", 1),
             ("zeros_like", "zeros_like", 1),
diff --git a/pypy/module/micronumpy/test/test_ufuncs.py b/pypy/module/micronumpy/test/test_ufuncs.py
--- a/pypy/module/micronumpy/test/test_ufuncs.py
+++ b/pypy/module/micronumpy/test/test_ufuncs.py
@@ -94,11 +94,11 @@
         assert find_uncallable_ufuncs('bool') == set(['sign'])
         assert find_uncallable_ufuncs('float') == set(
                 ['bitwise_and', 'bitwise_not', 'bitwise_or', 'bitwise_xor',
-                 'left_shift', 'right_shift', 'invert', 'ldexp'])
+                 'left_shift', 'right_shift', 'invert'])
         assert find_uncallable_ufuncs('complex') == set(
                 ['bitwise_and', 'bitwise_not', 'bitwise_or', 'bitwise_xor',
                  'arctan2', 'deg2rad', 'degrees', 'rad2deg', 'radians',
-                 'fabs', 'fmod', 'invert', 'ldexp', 'mod',
+                 'fabs', 'fmod', 'invert', 'mod',
                  'logaddexp', 'logaddexp2', 'left_shift', 'right_shift',
                  'copysign', 'signbit', 'ceil', 'floor', 'trunc'])
 
@@ -961,11 +961,6 @@
         assert logaddexp2(float('inf'), float('-inf')) == float('inf')
         assert logaddexp2(float('inf'), float('inf')) == float('inf')
 
-    def test_ldexp(self):
-        import numpypy as np
-        a = np.ldexp(2, 3)
-        assert type(a) is np.float64 and a == 16.0
-
     def test_ones_like(self):
         from numpypy import array, ones_like
 
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
@@ -312,10 +312,6 @@
         float64 = Float64()
         return float64.rint(float64.box(v))
 
-    @raw_binary_op
-    def ldexp(self, v1, v2):
-        return Float64().box(v1 * 2**v2)
-
 class NonNativePrimitive(Primitive):
     _mixin_ = True
 


More information about the pypy-commit mailing list