Using descriptor in output results (#789)

Author: shssf

dpnp/dpnp_algo/dpnp_algo_mathematical.pyx

@@ -331,7 +331,7 @@ cpdef dpnp_nansum(object x1):
     # return dpnp_sum(result)
 
     result_desc = dpnp.get_dpnp_descriptor(result)  # TODO remove it later
-    sum_result = dpnp_sum(result_desc)
+    sum_result = dpnp_sum(result_desc).get_pyobj()
     return x1.dtype.type(sum_result[0])
 
 
@@ -387,7 +387,7 @@ cpdef dparray dpnp_subtract(object x1_obj, object x2_obj, object dtype=None, dpa
     return call_fptr_2in_1out(DPNP_FN_SUBTRACT, x1_obj, x2_obj, dtype=dtype, out=out, where=where)
 
 
-cpdef dparray dpnp_sum(utils.dpnp_descriptor input, object axis=None, object dtype=None, dparray out=None, cpp_bool keepdims=False, object initial=None, object where=True):
+cpdef utils.dpnp_descriptor dpnp_sum(utils.dpnp_descriptor input, object axis=None, object dtype=None, dparray out=None, cpp_bool keepdims=False, object initial=None, object where=True):
 
     cdef dparray_shape_type input_shape = input.shape
     cdef DPNPFuncType input_c_type = dpnp_dtype_to_DPNPFuncType(input.dtype)
@@ -401,10 +401,10 @@ cpdef dparray dpnp_sum(utils.dpnp_descriptor input, object axis=None, object dty
     cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_SUM, input_c_type, result_c_type)
 
     """ Create result array """
-    cdef dparray result = utils.create_output_array(result_shape, result_c_type, out)
-    cdef dpnp_reduction_c_t func = <dpnp_reduction_c_t > kernel_data.ptr
+    cdef utils.dpnp_descriptor result = utils.create_output_descriptor(result_shape, result_c_type, out)
 
     """ Call FPTR interface function """
+    cdef dpnp_reduction_c_t func = <dpnp_reduction_c_t > kernel_data.ptr
     func(result.get_data(), input.get_data(), < size_t * >input_shape.data(), input_shape.size(), axis_shape.data(), axis_shape.size(), NULL, NULL)
 
     return result

dpnp/dpnp_algo/dpnp_algo_statistics.pyx

@@ -84,7 +84,7 @@ cdef dparray call_fptr_custom_std_var_1in_1out(DPNPFuncName fptr_name, utils.dpn
 
 
 cpdef dpnp_average(utils.dpnp_descriptor x1):
-    array_sum = dpnp_sum(x1)
+    array_sum = dpnp_sum(x1).get_pyobj()
 
     """ Numpy interface inconsistency """
     return_type = numpy.float32 if (x1.dtype == numpy.float32) else numpy.float64

dpnp/dpnp_iface_mathematical.py

@@ -1538,7 +1538,7 @@ def sum(x1, axis=None, dtype=None, out=None, keepdims=False, initial=None, where
         elif where is not True:
             pass
         else:
-            result_obj = dpnp_sum(x1_desc, axis, dtype, out, keepdims, initial, where)
+            result_obj = dpnp_sum(x1_desc, axis, dtype, out, keepdims, initial, where).get_pyobj()
             result = dpnp.convert_single_elem_array_to_scalar(result_obj, keepdims)
 
             return result

dpnp/dpnp_utils/dpnp_algo_utils.pxd

@@ -130,6 +130,7 @@ cdef class dpnp_descriptor:
     """array DPNP descriptor"""
 
     cdef public:  # TODO remove "public" as python accessible attribute
+        object origin_pyobj
         dict descriptor
         Py_ssize_t dpnp_descriptor_data_size
         cpp_bool dpnp_descriptor_is_scalar
@@ -159,3 +160,8 @@ cdef dparray create_output_array(dparray_shape_type output_shape, DPNPFuncType c
 """
 Create output array based on shape, type and 'out' parameters
 """
+
+cdef dpnp_descriptor create_output_descriptor(dparray_shape_type output_shape, DPNPFuncType c_type, object requested_out)
+"""
+Same as "create_output_array" but output is "dpnp_descriptor"
+"""

dpnp/dpnp_utils/dpnp_algo_utils.pyx

@@ -342,6 +342,13 @@ cdef dparray create_output_array(dparray_shape_type output_shape, DPNPFuncType c
 
     return result
 
+cdef dpnp_descriptor create_output_descriptor(dparray_shape_type output_shape, DPNPFuncType c_type, object requested_out):
+    result = create_output_array(output_shape, c_type, requested_out)
+
+    cdef dpnp_descriptor result_desc = dpnp_descriptor(result)
+
+    return result_desc
+
 
 cpdef nd2dp_array(arr):
     """Convert ndarray to dparray"""
@@ -440,6 +447,7 @@ cpdef cpp_bool use_origin_backend(input1=None, size_t compute_size=0):
 cdef class dpnp_descriptor:
     def __init__(self, obj):
         """ Initialze variables """
+        self.origin_pyobj = None
         self.descriptor = None
         self.dpnp_descriptor_data_size = 0
         self.dpnp_descriptor_is_scalar = True
@@ -452,6 +460,8 @@ cdef class dpnp_descriptor:
         if self.descriptor["version"] != 3:
             return
 
+        self.origin_pyobj = obj
+
         """ array size calculation """
         cdef Py_ssize_t shape_it = 0
         self.dpnp_descriptor_data_size = 1
@@ -461,7 +471,7 @@ cdef class dpnp_descriptor:
                 raise ValueError(f"{ERROR_PREFIX} dpnp_descriptor::__init__() invalid value {shape_it} in 'shape'")
             self.dpnp_descriptor_data_size *= shape_it
 
-        """ set scalar propery """
+        """ set scalar property """
         self.dpnp_descriptor_is_scalar = False
 
     @property
@@ -536,6 +546,9 @@ cdef class dpnp_descriptor:
 
         return interface_dict
 
+    def get_pyobj(self):
+        return self.origin_pyobj
+
     cdef void * get_data(self):
         cdef long val = self.data
         return < void * > val