Author: Brian Kearns <[email protected]>
Branch:
Changeset: r68468:e66481e62e53
Date: 2013-12-18 05:15 -0500
http://bitbucket.org/pypy/pypy/changeset/e66481e62e53/
Log: these live at python-level in numpy also
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
@@ -106,8 +106,6 @@
('logaddexp2', 'logaddexp2'),
('real', 'real'),
('imag', 'imag'),
- ('ones_like', 'ones_like'),
- ('zeros_like', 'zeros_like'),
]:
interpleveldefs[exposed] = "interp_ufuncs.get(space).%s" % impl
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
@@ -690,9 +690,6 @@
"allow_complex": False}),
("logaddexp2", "logaddexp2", 2, {"promote_to_float": True,
"allow_complex": False}),
-
- ("ones_like", "ones_like", 1),
- ("zeros_like", "zeros_like", 1),
]:
self.add_ufunc(space, *ufunc_def)
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
@@ -1029,22 +1029,6 @@
assert logaddexp2(float('inf'), float('-inf')) == float('inf')
assert logaddexp2(float('inf'), float('inf')) == float('inf')
- def test_ones_like(self):
- from numpypy import array, ones_like
-
- assert ones_like(False) == array(True)
- assert ones_like(2) == array(1)
- assert ones_like(2.) == array(1.)
- assert ones_like(complex(2)) == array(complex(1))
-
- def test_zeros_like(self):
- from numpypy import array, zeros_like
-
- assert zeros_like(True) == array(False)
- assert zeros_like(2) == array(0)
- assert zeros_like(2.) == array(0.)
- assert zeros_like(complex(2)) == array(complex(0))
-
def test_accumulate(self):
from numpypy import add, multiply, arange
assert (add.accumulate([2, 3, 5]) == [2, 5, 10]).all()
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
@@ -300,14 +300,6 @@
def min(self, v1, v2):
return min(v1, v2)
- @simple_unary_op
- def ones_like(self, v):
- return 1
-
- @simple_unary_op
- def zeros_like(self, v):
- return 0
-
@raw_unary_op
def rint(self, v):
float64 = Float64()
@@ -1543,14 +1535,6 @@
except ValueError:
return rfloat.NAN, rfloat.NAN
- @complex_unary_op
- def ones_like(self, v):
- return 1, 0
-
- @complex_unary_op
- def zeros_like(self, v):
- return 0, 0
-
class Complex64(ComplexFloating, BaseType):
T = rffi.FLOAT
BoxType = interp_boxes.W_Complex64Box
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
