Merge 49d4339 into ea718e3

Author: antonwolfy

dpnp/dpnp_algo/dpnp_elementwise_common.py

@@ -375,6 +375,13 @@ def __call__(
             return out
         return dpnp_array._create_from_usm_ndarray(res_usm)
 
+    def _inplace_op(self, x1, x2):
+        x1_usm = dpnp.get_usm_ndarray(x1)
+        x2_usm = dpnp.get_usm_ndarray_or_scalar(x2)
+
+        super()._inplace_op(x1_usm, x2_usm)
+        return x1
+
     def outer(
         self,
         x1,

dpnp/dpnp_array.py

@@ -347,22 +347,22 @@ def __gt__(self, other):
 
     def __iadd__(self, other):
         """Return ``self+=value``."""
-        dpnp.add(self, other, out=self)
+        dpnp.add._inplace_op(self, other)
         return self
 
     def __iand__(self, other):
         """Return ``self&=value``."""
-        dpnp.bitwise_and(self, other, out=self)
+        dpnp.bitwise_and._inplace_op(self, other)
         return self
 
     def __ifloordiv__(self, other):
         """Return ``self//=value``."""
-        dpnp.floor_divide(self, other, out=self)
+        dpnp.floor_divide._inplace_op(self, other)
         return self
 
     def __ilshift__(self, other):
         """Return ``self<<=value``."""
-        dpnp.left_shift(self, other, out=self)
+        dpnp.left_shift._inplace_op(self, other)
         return self
 
     def __imatmul__(self, other):
@@ -381,7 +381,7 @@ def __imatmul__(self, other):
             axes = [(-2, -1), (-2, -1), (-2, -1)]
 
         try:
-            dpnp.matmul(self, other, out=self, axes=axes)
+            dpnp.matmul(self, other, out=self, dtype=self.dtype, axes=axes)
         except AxisError:
             # AxisError should indicate that the axes argument didn't work out
             # which should mean the second operand not being 2 dimensional.
@@ -393,12 +393,12 @@ def __imatmul__(self, other):
 
     def __imod__(self, other):
         """Return ``self%=value``."""
-        dpnp.remainder(self, other, out=self)
+        dpnp.remainder._inplace_op(self, other)
         return self
 
     def __imul__(self, other):
         """Return ``self*=value``."""
-        dpnp.multiply(self, other, out=self)
+        dpnp.multiply._inplace_op(self, other)
         return self
 
     def __index__(self):
@@ -416,22 +416,22 @@ def __invert__(self):
 
     def __ior__(self, other):
         """Return ``self|=value``."""
-        dpnp.bitwise_or(self, other, out=self)
+        dpnp.bitwise_or._inplace_op(self, other)
         return self
 
     def __ipow__(self, other):
         """Return ``self**=value``."""
-        dpnp.power(self, other, out=self)
+        dpnp.power._inplace_op(self, other)
         return self
 
     def __irshift__(self, other):
         """Return ``self>>=value``."""
-        dpnp.right_shift(self, other, out=self)
+        dpnp.right_shift._inplace_op(self, other)
         return self
 
     def __isub__(self, other):
         """Return ``self-=value``."""
-        dpnp.subtract(self, other, out=self)
+        dpnp.subtract._inplace_op(self, other)
         return self
 
     def __iter__(self):
@@ -442,12 +442,12 @@ def __iter__(self):
 
     def __itruediv__(self, other):
         """Return ``self/=value``."""
-        dpnp.true_divide(self, other, out=self)
+        dpnp.true_divide._inplace_op(self, other)
         return self
 
     def __ixor__(self, other):
         """Return ``self^=value``."""
-        dpnp.bitwise_xor(self, other, out=self)
+        dpnp.bitwise_xor._inplace_op(self, other)
         return self
 
     def __le__(self, other):

dpnp/dpnp_iface_bitwise.py

@@ -208,6 +208,7 @@ def binary_repr(num, width=None):
     ti._bitwise_and_result_type,
     ti._bitwise_and,
     _BITWISE_AND_DOCSTRING,
+    binary_inplace_fn=ti._bitwise_and_inplace,
 )
 
 
@@ -285,6 +286,7 @@ def binary_repr(num, width=None):
     ti._bitwise_or_result_type,
     ti._bitwise_or,
     _BITWISE_OR_DOCSTRING,
+    binary_inplace_fn=ti._bitwise_or_inplace,
 )
 
 
@@ -366,6 +368,7 @@ def binary_repr(num, width=None):
     ti._bitwise_xor_result_type,
     ti._bitwise_xor,
     _BITWISE_XOR_DOCSTRING,
+    binary_inplace_fn=ti._bitwise_xor_inplace,
 )
 
 
@@ -518,6 +521,7 @@ def binary_repr(num, width=None):
     ti._bitwise_left_shift_result_type,
     ti._bitwise_left_shift,
     _LEFT_SHIFT_DOCSTRING,
+    binary_inplace_fn=ti._bitwise_left_shift_inplace,
 )
 
 bitwise_left_shift = left_shift  # bitwise_left_shift is an alias for left_shift
@@ -595,6 +599,7 @@ def binary_repr(num, width=None):
     ti._bitwise_right_shift_result_type,
     ti._bitwise_right_shift,
     _RIGHT_SHIFT_DOCSTRING,
+    binary_inplace_fn=ti._bitwise_right_shift_inplace,
 )
 
 # bitwise_right_shift is an alias for right_shift

dpnp/dpnp_iface_trigonometric.py

@@ -2450,7 +2450,5 @@ def unwrap(p, discont=None, axis=-1, *, period=2 * dpnp.pi):
 
     up = dpnp.astype(p, dtype=dt, copy=True)
     up[slice1] = p[slice1]
-    # TODO: replace, once dpctl-1757 resolved
-    # up[slice1] += ph_correct.cumsum(axis=axis)
-    up[slice1] += ph_correct.cumsum(axis=axis, dtype=dt)
+    up[slice1] += ph_correct.cumsum(axis=axis)
     return up