move 2 argument functions to descriptor part2 (#747)

Author: shssf

dpnp/dpnp_algo/dpnp_algo_mathematical.pyx

@@ -106,7 +106,7 @@ cpdef dparray dpnp_add(object x1_obj, object x2_obj, object dtype=None, dparray
 
 
 cpdef dparray dpnp_arctan2(object x1_obj, object x2_obj, object dtype=None, dparray out=None, object where=True):
-    return call_fptr_2in_1out(DPNP_FN_ARCTAN2, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
+    return call_fptr_2in_1out_new(DPNP_FN_ARCTAN2, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
 cpdef dpnp_around(dparray x1, int decimals):
@@ -139,7 +139,7 @@ cpdef dparray dpnp_copysign(object x1_obj, object x2_obj, object dtype=None, dpa
 
 
 cpdef dparray dpnp_cross(object x1_obj, object x2_obj, object dtype=None, dparray out=None, object where=True):
-    return call_fptr_2in_1out(DPNP_FN_CROSS, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
+    return call_fptr_2in_1out_new(DPNP_FN_CROSS, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
 cpdef dparray dpnp_cumprod(dparray x1):
@@ -243,7 +243,7 @@ cpdef dparray dpnp_gradient(dparray y1, int dx=1):
 
 
 cpdef dparray dpnp_hypot(object x1_obj, object x2_obj, object dtype=None, dparray out=None, object where=True):
-    return call_fptr_2in_1out(DPNP_FN_HYPOT, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
+    return call_fptr_2in_1out_new(DPNP_FN_HYPOT, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
 cpdef dparray dpnp_maximum(object x1_obj, object x2_obj, object dtype=None, dparray out=None, object where=True):
@@ -379,7 +379,7 @@ cpdef dparray dpnp_sign(dparray x1):
 
 
 cpdef dparray dpnp_subtract(object x1_obj, object x2_obj, object dtype=None, dparray out=None, object where=True):
-    return call_fptr_2in_1out(DPNP_FN_SUBTRACT, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
+    return call_fptr_2in_1out_new(DPNP_FN_SUBTRACT, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
 cpdef dparray dpnp_sum(dparray input, object axis=None, object dtype=None, dparray out=None, cpp_bool keepdims=False, object initial=None, object where=True):

dpnp/dpnp_iface_mathematical.py

@@ -404,14 +404,13 @@ def cross(x1, x2, axisa=-1, axisb=-1, axisc=-1, axis=None):
 
     """
 
-    if not use_origin_backend(x1):
-        if not isinstance(x1, dparray):
-            pass
-        elif not isinstance(x2, dparray):
-            pass
-        elif x1.size != 3 or x2.size != 3:
+    x1_desc = dpnp.get_dpnp_descriptor(x1)
+    x2_desc = dpnp.get_dpnp_descriptor(x2)
+
+    if x1_desc and x2_desc:
+        if x1_desc.size != 3 or x2_desc.size != 3:
             pass
-        elif x1.shape != (3,) or x2.shape != (3,):
+        elif x1_desc.shape != (3,) or x2_desc.shape != (3,):
             pass
         elif axisa != -1:
             pass
@@ -422,7 +421,7 @@ def cross(x1, x2, axisa=-1, axisb=-1, axisc=-1, axis=None):
         elif axis is not None:
             pass
         else:
-            return dpnp_cross(x1, x2)
+            return dpnp_cross(x1_desc, x2_desc)
 
     return call_origin(numpy.cross, x1, x2, axisa, axisb, axisc, axis)
 
@@ -1497,23 +1496,26 @@ def subtract(x1, x2, dtype=None, out=None, where=True, **kwargs):
     [2, -4]
 
     """
-    x1_is_scalar, x2_is_scalar = dpnp.isscalar(x1), dpnp.isscalar(x2)
-    x1_is_dparray, x2_is_dparray = isinstance(x1, dparray), isinstance(x2, dparray)
 
-    if not use_origin_backend(x1) and not kwargs:
-        if not x1_is_dparray and not x1_is_scalar:
+    x1_is_scalar = dpnp.isscalar(x1)
+    x2_is_scalar = dpnp.isscalar(x2)
+    x1_desc = dpnp.get_dpnp_descriptor(x1)
+    x2_desc = dpnp.get_dpnp_descriptor(x2)
+
+    if x1_desc and x2_desc and not kwargs:
+        if not x1_desc and not x1_is_scalar:
             pass
-        elif not x2_is_dparray and not x2_is_scalar:
+        elif not x2_desc and not x2_is_scalar:
             pass
         elif x1_is_scalar and x2_is_scalar:
             pass
-        elif x1_is_dparray and x1.ndim == 0:
+        elif x1_desc and x1_desc.ndim == 0:
             pass
-        elif x1_is_dparray and x1.dtype == numpy.bool:
+        elif x1_desc and x1_desc.dtype == numpy.bool:
             pass
-        elif x2_is_dparray and x2.ndim == 0:
+        elif x2_desc and x2_desc.ndim == 0:
             pass
-        elif x2_is_dparray and x2.dtype == numpy.bool:
+        elif x2_desc and x2_desc.dtype == numpy.bool:
             pass
         elif dtype is not None:
             pass
@@ -1522,7 +1524,7 @@ def subtract(x1, x2, dtype=None, out=None, where=True, **kwargs):
         elif not where:
             pass
         else:
-            return dpnp_subtract(x1, x2, dtype=dtype, out=out, where=where)
+            return dpnp_subtract(x1_desc, x2_desc, dtype=dtype, out=out, where=where)
 
     return call_origin(numpy.subtract, x1, x2, dtype=dtype, out=out, where=where, **kwargs)
 

dpnp/dpnp_iface_trigonometric.py

@@ -354,19 +354,22 @@ def arctan2(x1, x2, dtype=None, out=None, where=True, **kwargs):
     [1.57079633, -1.57079633]
 
     """
-    x1_is_scalar, x2_is_scalar = dpnp.isscalar(x1), dpnp.isscalar(x2)
-    x1_is_dparray, x2_is_dparray = isinstance(x1, dparray), isinstance(x2, dparray)
 
-    if not use_origin_backend(x1) and not kwargs:
-        if not x1_is_dparray and not x1_is_scalar:
+    x1_is_scalar = dpnp.isscalar(x1)
+    x2_is_scalar = dpnp.isscalar(x2)
+    x1_desc = dpnp.get_dpnp_descriptor(x1)
+    x2_desc = dpnp.get_dpnp_descriptor(x2)
+
+    if x1_desc and x2_desc and not kwargs:
+        if not x1_desc and not x1_is_scalar:
             pass
-        elif not x2_is_dparray and not x2_is_scalar:
+        elif not x2_desc and not x2_is_scalar:
             pass
         elif x1_is_scalar and x2_is_scalar:
             pass
-        elif x1_is_dparray and x1.ndim == 0:
+        elif x1_desc and x1_desc.ndim == 0:
             pass
-        elif x2_is_dparray and x2.ndim == 0:
+        elif x2_desc and x2_desc.ndim == 0:
             pass
         elif out is not None and not isinstance(out, dparray):
             pass
@@ -377,7 +380,7 @@ def arctan2(x1, x2, dtype=None, out=None, where=True, **kwargs):
         elif not where:
             pass
         else:
-            return dpnp_arctan2(x1, x2, dtype=dtype, out=out, where=where)
+            return dpnp_arctan2(x1_desc, x2_desc, dtype=dtype, out=out, where=where)
 
     return call_origin(numpy.arctan2, x1, x2, dtype=dtype, out=out, where=where, **kwargs)
 
@@ -624,19 +627,22 @@ def hypot(x1, x2, dtype=None, out=None, where=True, **kwargs):
     [5.0, 5.0, 5.0]
 
     """
-    x1_is_scalar, x2_is_scalar = dpnp.isscalar(x1), dpnp.isscalar(x2)
-    x1_is_dparray, x2_is_dparray = isinstance(x1, dparray), isinstance(x2, dparray)
 
-    if not use_origin_backend(x1) and not kwargs:
-        if not x1_is_dparray and not x1_is_scalar:
+    x1_is_scalar = dpnp.isscalar(x1)
+    x2_is_scalar = dpnp.isscalar(x2)
+    x1_desc = dpnp.get_dpnp_descriptor(x1)
+    x2_desc = dpnp.get_dpnp_descriptor(x2)
+
+    if x1_desc and x2_desc and not kwargs:
+        if not x1_desc and not x1_is_scalar:
             pass
-        elif not x2_is_dparray and not x2_is_scalar:
+        elif not x2_desc and not x2_is_scalar:
             pass
         elif x1_is_scalar and x2_is_scalar:
             pass
-        elif x1_is_dparray and x1.ndim == 0:
+        elif x1_desc and x1_desc.ndim == 0:
             pass
-        elif x2_is_dparray and x2.ndim == 0:
+        elif x2_desc and x2_desc.ndim == 0:
             pass
         elif out is not None and not isinstance(out, dparray):
             pass
@@ -647,7 +653,7 @@ def hypot(x1, x2, dtype=None, out=None, where=True, **kwargs):
         elif not where:
             pass
         else:
-            return dpnp_hypot(x1, x2, dtype=dtype, out=out, where=where)
+            return dpnp_hypot(x1_desc, x2_desc, dtype=dtype, out=out, where=where)
 
     return call_origin(numpy.hypot, x1, x2, dtype=dtype, out=out, where=where, **kwargs)