move 1param functions to descriptor usage (#751)

* move 1param functions to descriptor usage

* use call_origin in old code

Author: shssf

dpnp/dpnp_algo/dpnp_algo.pxd

@@ -28,6 +28,8 @@
 from libcpp.vector cimport vector
 from libcpp cimport bool as cpp_bool
 from dpnp.dparray cimport dparray, dparray_shape_type
+from dpnp.dpnp_utils.dpnp_algo_utils cimport dpnp_descriptor
+
 
 cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName":  # need this namespace for Enum import
     cdef enum DPNPFuncName "DPNPFuncName":
@@ -245,7 +247,7 @@ Bitwise functions
 cpdef dparray dpnp_bitwise_and(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_bitwise_or(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_bitwise_xor(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
-cpdef dparray dpnp_invert(dparray arr)
+cpdef dparray dpnp_invert(dpnp_descriptor x1)
 cpdef dparray dpnp_left_shift(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_right_shift(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 
@@ -286,16 +288,14 @@ Mathematical functions
 """
 cpdef dparray dpnp_add(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_arctan2(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
-cpdef dparray dpnp_cos(dparray array1)
 cpdef dparray dpnp_divide(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_hypot(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_maximum(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_minimum(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_multiply(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
-cpdef dparray dpnp_negative(dparray array1)
+cpdef dparray dpnp_negative(dpnp_descriptor array1)
 cpdef dparray dpnp_power(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 cpdef dparray dpnp_remainder(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
-cpdef dparray dpnp_sin(dparray array1)
 cpdef dparray dpnp_subtract(object x1_obj, object x2_obj, object dtype=*, dparray out=*, object where=*)
 
 
@@ -317,8 +317,8 @@ cpdef dparray dpnp_min(dparray a, axis)
 """
 Sorting functions
 """
-cpdef dparray dpnp_argsort(dparray array1)
-cpdef dparray dpnp_sort(dparray array1)
+cpdef dparray dpnp_argsort(dpnp_descriptor array1)
+cpdef dparray dpnp_sort(dpnp_descriptor array1)
 
 """
 Searching functions
@@ -329,28 +329,28 @@ cpdef dparray dpnp_argmin(dparray array1)
 """
 Trigonometric functions
 """
-cpdef dparray dpnp_arccos(dparray array1)
-cpdef dparray dpnp_arccosh(dparray array1)
-cpdef dparray dpnp_arcsin(dparray array1)
-cpdef dparray dpnp_arcsinh(dparray array1)
-cpdef dparray dpnp_arctan(dparray array1)
-cpdef dparray dpnp_arctanh(dparray array1)
-cpdef dparray dpnp_cbrt(dparray array1)
-cpdef dparray dpnp_cos(dparray array1)
-cpdef dparray dpnp_cosh(dparray array1)
-cpdef dparray dpnp_degrees(dparray array1)
-cpdef dparray dpnp_exp(dparray array1)
-cpdef dparray dpnp_exp2(dparray array1)
-cpdef dparray dpnp_expm1(dparray array1)
-cpdef dparray dpnp_log(dparray array1)
-cpdef dparray dpnp_log10(dparray array1)
-cpdef dparray dpnp_log1p(dparray array1)
-cpdef dparray dpnp_log2(dparray array1)
-cpdef dparray dpnp_radians(dparray array1)
-cpdef dparray dpnp_recip(dparray array1)
-cpdef dparray dpnp_sin(dparray array1)
-cpdef dparray dpnp_sinh(dparray array1)
-cpdef dparray dpnp_sqrt(dparray array1)
-cpdef dparray dpnp_square(dparray array1)
-cpdef dparray dpnp_tan(dparray array1)
-cpdef dparray dpnp_tanh(dparray array1)
+cpdef dparray dpnp_arccos(dpnp_descriptor array1)
+cpdef dparray dpnp_arccosh(dpnp_descriptor array1)
+cpdef dparray dpnp_arcsin(dpnp_descriptor array1)
+cpdef dparray dpnp_arcsinh(dpnp_descriptor array1)
+cpdef dparray dpnp_arctan(dpnp_descriptor array1)
+cpdef dparray dpnp_arctanh(dpnp_descriptor array1)
+cpdef dparray dpnp_cbrt(dpnp_descriptor array1)
+cpdef dparray dpnp_cos(dpnp_descriptor array1)
+cpdef dparray dpnp_cosh(dpnp_descriptor array1)
+cpdef dparray dpnp_degrees(dpnp_descriptor array1)
+cpdef dparray dpnp_exp(dpnp_descriptor array1)
+cpdef dparray dpnp_exp2(dpnp_descriptor array1)
+cpdef dparray dpnp_expm1(dpnp_descriptor array1)
+cpdef dparray dpnp_log(dpnp_descriptor array1)
+cpdef dparray dpnp_log10(dpnp_descriptor array1)
+cpdef dparray dpnp_log1p(dpnp_descriptor array1)
+cpdef dparray dpnp_log2(dpnp_descriptor array1)
+cpdef dparray dpnp_radians(dpnp_descriptor array1)
+cpdef dparray dpnp_recip(dpnp_descriptor array1)
+cpdef dparray dpnp_sin(dpnp_descriptor array1, dparray out=*)
+cpdef dparray dpnp_sinh(dpnp_descriptor array1)
+cpdef dparray dpnp_sqrt(dpnp_descriptor array1)
+cpdef dparray dpnp_square(dpnp_descriptor array1)
+cpdef dparray dpnp_tan(dpnp_descriptor array1)
+cpdef dparray dpnp_tanh(dpnp_descriptor array1)

dpnp/dpnp_algo/dpnp_algo.pyx

@@ -258,7 +258,7 @@ cdef dparray call_fptr_1out(DPNPFuncName fptr_name, dparray_shape_type result_sh
     return result
 
 
-cdef dparray call_fptr_1in_1out(DPNPFuncName fptr_name, dparray x1, dparray_shape_type result_shape):
+cdef dparray call_fptr_1in_1out(DPNPFuncName fptr_name, utils.dpnp_descriptor x1, dparray_shape_type result_shape):
 
     """ Convert string type names (dparray.dtype) to C enum DPNPFuncType """
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(x1.dtype)

dpnp/dpnp_algo/dpnp_algo_arraycreation.pyx

@@ -62,7 +62,7 @@ ctypedef void(*custom_indexing_1out_func_ptr_t)(void * , const size_t , const si
 ctypedef void(*fptr_dpnp_trace_t)(const void *, void * , const size_t * , const size_t)
 
 
-cpdef dparray dpnp_copy(dparray x1, order, subok):
+cpdef dparray dpnp_copy(utils.dpnp_descriptor x1, order, subok):
     return call_fptr_1in_1out(DPNP_FN_COPY, x1, x1.shape)
 
 

dpnp/dpnp_algo/dpnp_algo_bitwise.pyx

@@ -56,7 +56,7 @@ cpdef dparray dpnp_bitwise_xor(object x1_obj, object x2_obj, object dtype=None,
     return call_fptr_2in_1out(DPNP_FN_BITWISE_XOR, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
-cpdef dparray dpnp_invert(dparray arr):
+cpdef dparray dpnp_invert(dpnp_descriptor arr):
     return call_fptr_1in_1out(DPNP_FN_INVERT, arr, arr.shape)
 
 

dpnp/dpnp_algo/dpnp_algo_mathematical.pyx

@@ -126,11 +126,11 @@ cpdef dpnp_around(dparray x1, int decimals):
     return result
 
 
-cpdef dparray dpnp_ceil(dparray x1):
+cpdef dparray dpnp_ceil(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_CEIL, x1, x1.shape)
 
 
-cpdef dparray dpnp_conjugate(dparray x1):
+cpdef dparray dpnp_conjugate(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_CONJIGUATE, x1, x1.shape)
 
 
@@ -142,7 +142,7 @@ cpdef dparray dpnp_cross(object x1_obj, object x2_obj, object dtype=None, dparra
     return call_fptr_2in_1out(DPNP_FN_CROSS, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
-cpdef dparray dpnp_cumprod(dparray x1):
+cpdef dparray dpnp_cumprod(utils.dpnp_descriptor x1):
     # instead of x1.shape, (x1.size, ) is passed to the function
     # due to the following:
     # >>> import numpy
@@ -154,7 +154,7 @@ cpdef dparray dpnp_cumprod(dparray x1):
     return call_fptr_1in_1out(DPNP_FN_CUMPROD, x1, (x1.size,))
 
 
-cpdef dparray dpnp_cumsum(dparray x1):
+cpdef dparray dpnp_cumsum(utils.dpnp_descriptor x1):
     # instead of x1.shape, (x1.size, ) is passed to the function
     # due to the following:
     # >>> import numpy
@@ -197,19 +197,19 @@ cpdef dparray dpnp_divide(object x1_obj, object x2_obj, object dtype=None, dparr
     return call_fptr_2in_1out(DPNP_FN_DIVIDE, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
-cpdef dparray dpnp_ediff1d(dparray x1):
+cpdef dparray dpnp_ediff1d(utils.dpnp_descriptor x1):
 
     if x1.size <= 1:
         return dpnp.empty(0, dtype=x1.dtype)
 
     return call_fptr_1in_1out(DPNP_FN_EDIFF1D, x1, (x1.size - 1,))
 
 
-cpdef dparray dpnp_fabs(dparray x1):
+cpdef dparray dpnp_fabs(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_FABS, x1, x1.shape)
 
 
-cpdef dparray dpnp_floor(dparray x1):
+cpdef dparray dpnp_floor(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_FLOOR, x1, x1.shape)
 
 
@@ -285,7 +285,8 @@ cpdef dparray dpnp_nancumprod(dparray x1):
         if dpnp.isnan(cur_x1[i]):
             cur_x1._setitem_scalar(i, 1)
 
-    return dpnp_cumprod(cur_x1)
+    x1_desc = dpnp.get_dpnp_descriptor(cur_x1)
+    return dpnp_cumprod(x1_desc)
 
 
 cpdef dparray dpnp_nancumsum(dparray x1):
@@ -296,7 +297,8 @@ cpdef dparray dpnp_nancumsum(dparray x1):
         if dpnp.isnan(cur_x1[i]):
             cur_x1._setitem_scalar(i, 0)
 
-    return dpnp_cumsum(cur_x1)
+    x1_desc = dpnp.get_dpnp_descriptor(cur_x1)
+    return dpnp_cumsum(x1_desc)
 
 
 cpdef dpnp_nanprod(dparray x1):
@@ -330,8 +332,8 @@ cpdef dpnp_nansum(dparray x1):
     return x1.dtype.type(sum_result[0])
 
 
-cpdef dparray dpnp_negative(dparray array1):
-    return call_fptr_1in_1out(DPNP_FN_NEGATIVE, array1, array1.shape)
+cpdef dparray dpnp_negative(dpnp_descriptor x1):
+    return call_fptr_1in_1out(DPNP_FN_NEGATIVE, x1, x1.shape)
 
 
 cpdef dparray dpnp_power(object x1_obj, object x2_obj, object dtype=None, dparray out=None, object where=True):
@@ -374,7 +376,7 @@ cpdef dparray dpnp_remainder(object x1_obj, object x2_obj, object dtype=None, dp
     return call_fptr_2in_1out(DPNP_FN_REMAINDER, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
-cpdef dparray dpnp_sign(dparray x1):
+cpdef dparray dpnp_sign(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_SIGN, x1, x1.shape)
 
 
@@ -421,5 +423,5 @@ cpdef dpnp_trapz(dparray y1, dparray x1, double dx):
     return result[0]
 
 
-cpdef dparray dpnp_trunc(dparray x1):
+cpdef dparray dpnp_trunc(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_TRUNC, x1, x1.shape)

dpnp/dpnp_algo/dpnp_algo_sorting.pyx

@@ -46,8 +46,8 @@ ctypedef void(*fptr_dpnp_partition_t)(void * , void * , void * , const size_t ,
 ctypedef void(*fptr_dpnp_searchsorted_t)(void * , const void * , const void * , bool , const size_t , const size_t )
 
 
-cpdef dparray dpnp_argsort(dparray in_array1):
-    return call_fptr_1in_1out(DPNP_FN_ARGSORT, in_array1, in_array1.shape)
+cpdef dparray dpnp_argsort(utils.dpnp_descriptor x1):
+    return call_fptr_1in_1out(DPNP_FN_ARGSORT, x1, x1.shape)
 
 
 cpdef dparray dpnp_partition(dparray arr, int kth, axis=-1, kind='introselect', order=None):
@@ -86,5 +86,5 @@ cpdef dparray dpnp_searchsorted(dparray arr, dparray v, side='left'):
     return result
 
 
-cpdef dparray dpnp_sort(dparray in_array1):
-    return call_fptr_1in_1out(DPNP_FN_SORT, in_array1, in_array1.shape)
+cpdef dparray dpnp_sort(utils.dpnp_descriptor x1):
+    return call_fptr_1in_1out(DPNP_FN_SORT, x1, x1.shape)

dpnp/dpnp_algo/dpnp_algo_special.pyx

@@ -39,5 +39,5 @@ __all__ += [
 ]
 
 
-cpdef dparray dpnp_erf(dparray x1):
+cpdef dparray dpnp_erf(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_ERF, x1, x1.shape)

dpnp/dpnp_algo/dpnp_algo_trigonometric.pyx

@@ -64,83 +64,83 @@ __all__ += [
 ]
 
 
-cpdef dparray dpnp_arccos(dparray x1):
+cpdef dparray dpnp_arccos(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_ARCCOS, x1, x1.shape)
 
 
-cpdef dparray dpnp_arccosh(dparray x1):
+cpdef dparray dpnp_arccosh(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_ARCCOSH, x1, x1.shape)
 
 
-cpdef dparray dpnp_arcsin(dparray x1):
+cpdef dparray dpnp_arcsin(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_ARCSIN, x1, x1.shape)
 
 
-cpdef dparray dpnp_arcsinh(dparray x1):
+cpdef dparray dpnp_arcsinh(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_ARCSINH, x1, x1.shape)
 
 
-cpdef dparray dpnp_arctan(dparray x1):
+cpdef dparray dpnp_arctan(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_ARCTAN, x1, x1.shape)
 
 
-cpdef dparray dpnp_arctanh(dparray x1):
+cpdef dparray dpnp_arctanh(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_ARCTANH, x1, x1.shape)
 
 
-cpdef dparray dpnp_cbrt(dparray x1):
+cpdef dparray dpnp_cbrt(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_CBRT, x1, x1.shape)
 
 
-cpdef dparray dpnp_cos(dparray x1):
+cpdef dparray dpnp_cos(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_COS, x1, x1.shape)
 
 
-cpdef dparray dpnp_cosh(dparray x1):
+cpdef dparray dpnp_cosh(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_COSH, x1, x1.shape)
 
 
-cpdef dparray dpnp_degrees(dparray x1):
+cpdef dparray dpnp_degrees(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_DEGREES, x1, x1.shape)
 
 
-cpdef dparray dpnp_exp(dparray x1):
+cpdef dparray dpnp_exp(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_EXP, x1, x1.shape)
 
 
-cpdef dparray dpnp_exp2(dparray x1):
+cpdef dparray dpnp_exp2(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_EXP2, x1, x1.shape)
 
 
-cpdef dparray dpnp_expm1(dparray x1):
+cpdef dparray dpnp_expm1(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_EXPM1, x1, x1.shape)
 
 
-cpdef dparray dpnp_log(dparray x1):
+cpdef dparray dpnp_log(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_LOG, x1, x1.shape)
 
 
-cpdef dparray dpnp_log10(dparray x1):
+cpdef dparray dpnp_log10(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_LOG10, x1, x1.shape)
 
 
-cpdef dparray dpnp_log1p(dparray x1):
+cpdef dparray dpnp_log1p(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_LOG1P, x1, x1.shape)
 
 
-cpdef dparray dpnp_log2(dparray x1):
+cpdef dparray dpnp_log2(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_LOG2, x1, x1.shape)
 
 
-cpdef dparray dpnp_recip(dparray x1):
+cpdef dparray dpnp_recip(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_RECIP, x1, x1.shape)
 
 
-cpdef dparray dpnp_radians(dparray x1):
+cpdef dparray dpnp_radians(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_RADIANS, x1, x1.shape)
 
 
-cpdef dparray dpnp_sin(dparray x1, dparray out=None):
+cpdef dparray dpnp_sin(utils.dpnp_descriptor x1, dparray out=None):
 
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(x1.dtype)
 
@@ -168,23 +168,23 @@ cpdef dparray dpnp_sin(dparray x1, dparray out=None):
     return result
 
 
-cpdef dparray dpnp_sinh(dparray x1):
+cpdef dparray dpnp_sinh(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_SINH, x1, x1.shape)
 
 
-cpdef dparray dpnp_sqrt(dparray x1):
+cpdef dparray dpnp_sqrt(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_SQRT, x1, x1.shape)
 
 
-cpdef dparray dpnp_square(dparray x1):
+cpdef dparray dpnp_square(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_SQUARE, x1, x1.shape)
 
 
-cpdef dparray dpnp_tan(dparray x1):
+cpdef dparray dpnp_tan(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_TAN, x1, x1.shape)
 
 
-cpdef dparray dpnp_tanh(dparray x1):
+cpdef dparray dpnp_tanh(utils.dpnp_descriptor x1):
     return call_fptr_1in_1out(DPNP_FN_TANH, x1, x1.shape)