MAINT: delegate ndarray unary dunders to their ufuncs

Author: ev-br

torch_np/_ndarray.py

@@ -247,6 +247,7 @@ def __rpow__(self, exponent):
     def __ipow__(self, exponent):
         return _ufunc_impl.float_power(self, asarray(exponent), out=self)
 
+
     # remainder, self % other
     def __mod__(self, other):
         return _ufunc_impl.remainder(self, asarray(other))
@@ -270,17 +271,19 @@ def __ior__(self, other):
         other_tensor = asarray(other).get()
         return asarray(self._tensor.__ior__(other_tensor))
 
+
+    # unary ops
     def __invert__(self):
-        return asarray(self._tensor.__invert__())
+        return _ufunc_impl.invert(self)
 
     def __abs__(self):
-        return asarray(self._tensor.__abs__())
+        return _ufunc_impl.absolute(self)
+
+    def __pos__(self):
+        return _ufunc_impl.positive(self)
 
     def __neg__(self):
-        try:
-            return asarray(self._tensor.__neg__())
-        except RuntimeError as e:
-            raise TypeError(e.args)
+        return _ufunc_impl.negative(self)
 
 
 

torch_np/_unary_ufuncs.py

@@ -9,7 +9,7 @@
 
 from . import _ufunc_impl
 
-__all__ = ['abs', 'absolute', 'arccos', 'arccosh', 'arcsin', 'arcsinh', 'arctan', 'arctanh', 'asarray', 'cbrt', 'ceil', 'conj', 'conjugate', 'cos', 'cosh', 'deg2rad', 'degrees', 'exp', 'exp2', 'expm1', 'fabs', 'floor', 'isfinite', 'isinf', 'isnan', 'log', 'log10', 'log1p', 'log2', 'logical_not', 'negative', 'positive', 'rad2deg', 'radians', 'reciprocal', 'rint', 'sign', 'signbit', 'sin', 'sinh', 'sqrt', 'square', 'tan', 'tanh', 'trunc']
+__all__ = ['abs', 'absolute', 'arccos', 'arccosh', 'arcsin', 'arcsinh', 'arctan', 'arctanh', 'asarray', 'cbrt', 'ceil', 'conj', 'conjugate', 'cos', 'cosh', 'deg2rad', 'degrees', 'exp', 'exp2', 'expm1', 'fabs', 'floor', 'isfinite', 'isinf', 'isnan', 'log', 'log10', 'log1p', 'log2', 'logical_not', 'negative', 'positive', 'rad2deg', 'radians', 'reciprocal', 'rint', 'sign', 'signbit', 'sin', 'sinh', 'sqrt', 'square', 'tan', 'tanh', 'trunc', 'invert']
 
 
 

torch_np/tests/numpy_tests/core/test_scalarmath.py

@@ -626,7 +626,8 @@ def __array__(self):
 class TestNegative:
     def test_exceptions(self):
         a = np.ones((), dtype=np.bool_)[()]
-        assert_raises(TypeError, operator.neg, a)
+        # XXX: TypeError from numpy, RuntimeError from torch
+        assert_raises((TypeError, RuntimeError), operator.neg, a)
 
     def test_result(self):
             types = np.typecodes['AllInteger'] + np.typecodes['AllFloat']