argmin/argmax to desc (#767)

Author: shssf

dpnp/dpnp_algo/dpnp_algo.pxd

@@ -323,8 +323,8 @@ cpdef dparray dpnp_sort(dpnp_descriptor array1)
 """
 Searching functions
 """
-cpdef dparray dpnp_argmax(dparray array1)
-cpdef dparray dpnp_argmin(dparray array1)
+cpdef dparray dpnp_argmax(dpnp_descriptor array1)
+cpdef dparray dpnp_argmin(dpnp_descriptor array1)
 
 """
 Trigonometric functions

dpnp/dpnp_algo/dpnp_algo_searching.pyx

@@ -44,9 +44,9 @@ __all__ += [
 ctypedef void(*custom_search_1in_1out_func_ptr_t)(void * , void * , size_t)
 
 
-cpdef dparray dpnp_argmax(dparray in_array1):
+cpdef dparray dpnp_argmax(utils.dpnp_descriptor in_array1):
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(in_array1.dtype)
-    cdef DPNPFuncType output_type = dpnp_dtype_to_DPNPFuncType(numpy.int64)
+    cdef DPNPFuncType output_type = dpnp_dtype_to_DPNPFuncType(dpnp.int64)
 
     cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_ARGMAX, param1_type, output_type)
 
@@ -60,9 +60,9 @@ cpdef dparray dpnp_argmax(dparray in_array1):
     return result
 
 
-cpdef dparray dpnp_argmin(dparray in_array1):
+cpdef dparray dpnp_argmin(utils.dpnp_descriptor in_array1):
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(in_array1.dtype)
-    cdef DPNPFuncType output_type = dpnp_dtype_to_DPNPFuncType(numpy.int64)
+    cdef DPNPFuncType output_type = dpnp_dtype_to_DPNPFuncType(dpnp.int64)
 
     cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_ARGMIN, param1_type, output_type)
 

dpnp/dpnp_iface_searching.py

@@ -54,7 +54,7 @@
 ]
 
 
-def argmax(in_array1, axis=None, out=None):
+def argmax(x1, axis=None, out=None):
     """
     Returns the indices of the maximum values along an axis.
 
@@ -94,23 +94,22 @@ def argmax(in_array1, axis=None, out=None):
 
     """
 
-    is_dparray1 = isinstance(in_array1, dparray)
-
-    if (not use_origin_backend(in_array1) and is_dparray1):
+    x1_desc = dpnp.get_dpnp_descriptor(x1)
+    if x1_desc:
         if axis is not None:
-            checker_throw_value_error("argmax", "axis", type(axis), None)
-        if out is not None:
-            checker_throw_value_error("argmax", "out", type(out), None)
-
-        result_obj = dpnp_argmax(in_array1)
-        result = dpnp.convert_single_elem_array_to_scalar(result_obj)
+            pass
+        elif out is not None:
+            pass
+        else:
+            result_obj = dpnp_argmax(x1_desc)
+            result = dpnp.convert_single_elem_array_to_scalar(result_obj)
 
-        return result
+            return result
 
-    return numpy.argmax(in_array1, axis, out)
+    return call_origin(numpy.argmax, x1, axis, out)
 
 
-def argmin(in_array1, axis=None, out=None):
+def argmin(x1, axis=None, out=None):
     """
     Returns the indices of the minimum values along an axis.
 
@@ -150,17 +149,16 @@ def argmin(in_array1, axis=None, out=None):
 
     """
 
-    is_dparray1 = isinstance(in_array1, dparray)
-
-    if (not use_origin_backend(in_array1) and is_dparray1):
+    x1_desc = dpnp.get_dpnp_descriptor(x1)
+    if x1_desc:
         if axis is not None:
-            checker_throw_value_error("argmin", "axis", type(axis), None)
-        if out is not None:
-            checker_throw_value_error("argmin", "out", type(out), None)
-
-        result_obj = dpnp_argmin(in_array1)
-        result = dpnp.convert_single_elem_array_to_scalar(result_obj)
+            pass
+        elif out is not None:
+            pass
+        else:
+            result_obj = dpnp_argmin(x1_desc)
+            result = dpnp.convert_single_elem_array_to_scalar(result_obj)
 
-        return result
+            return result
 
-    return numpy.argmin(in_array1, axis, out)
+    return call_origin(numpy.argmin, x1, axis, out)