move dparray from algo.pxd (#855)

Author: shssf

dpnp/dparray.pyx

@@ -42,6 +42,7 @@ from dpnp.dpnp_iface import *
 # to avoid interference with Python internal functions
 from dpnp.dpnp_iface import sum as iface_sum
 from dpnp.dpnp_iface import prod as iface_prod
+from dpnp.dpnp_iface import get_dpnp_descriptor as iface_get_dpnp_descriptor
 
 from dpnp.dpnp_algo cimport *
 from dpnp.dpnp_iface_statistics import min, max  # TODO do the same as for iface_sum
@@ -514,7 +515,8 @@ cdef class dparray:
                 if order == 'F':
                     return self.transpose().reshape(self.size)
 
-                return dpnp_flatten(self)
+                self_desc = iface_get_dpnp_descriptor(self)
+                return dpnp_flatten(self_desc).get_pyobj()
 
         result = utils.dp2nd_array(self).flatten(order=order)
 
@@ -799,7 +801,8 @@ cdef class dparray:
         elif self.dtype == numpy.complex64 or dtype == numpy.complex64:
             pass
         else:
-            return dpnp_astype(self, dtype)
+            self_desc = iface_get_dpnp_descriptor(self)
+            return dpnp_astype(self_desc, dtype).get_pyobj()
 
         result = utils.dp2nd_array(self).astype(dtype=dtype, order=order, casting=casting, subok=subok, copy=copy)
 

dpnp/dpnp_algo/dpnp_algo.pxd

@@ -27,7 +27,7 @@
 
 from libcpp.vector cimport vector
 from libcpp cimport bool as cpp_bool
-from dpnp.dparray cimport dparray
+
 from dpnp.dpnp_utils.dpnp_algo_utils cimport dpnp_descriptor
 
 
@@ -235,8 +235,8 @@ ctypedef void(*fptr_2in_1out_t)(void * , const void * , const size_t, const long
 ctypedef void(*fptr_blas_gemm_2in_1out_t)(void *, void * , void * , size_t, size_t, size_t)
 ctypedef void(*dpnp_reduction_c_t)(void *, const void * , const size_t*, const size_t, const long*, const size_t, const void * , const long*)
 
-cpdef dparray dpnp_astype(dparray array1, dtype_target)
-cpdef dparray dpnp_flatten(dparray array1)
+cpdef dpnp_descriptor dpnp_astype(dpnp_descriptor array1, dtype)
+cpdef dpnp_descriptor dpnp_flatten(dpnp_descriptor array1)
 
 
 """

dpnp/dpnp_algo/dpnp_algo.pyx

@@ -39,6 +39,7 @@ import dpnp.dpnp_utils as utils_py
 import numpy
 
 cimport cpython
+from dpnp.dparray cimport dparray
 cimport dpnp.dpnp_utils as utils
 cimport numpy
 
@@ -123,28 +124,30 @@ cpdef utils.dpnp_descriptor dpnp_array(object obj, object dtype=None):
     return result
 
 
-cpdef dparray dpnp_astype(dparray array1, dtype_target):
+cpdef utils.dpnp_descriptor dpnp_astype(utils.dpnp_descriptor array1, dtype):
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(array1.dtype)
-    cdef DPNPFuncType param2_type = dpnp_dtype_to_DPNPFuncType(dtype_target)
+    cdef DPNPFuncType param2_type = dpnp_dtype_to_DPNPFuncType(dtype)
 
     cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_ASTYPE, param1_type, param2_type)
 
-    result_type = dpnp_DPNPFuncType_to_dtype( < size_t > kernel_data.return_type)
-    cdef dparray result = dparray(array1.shape, dtype=result_type)
+    # ceate result array with type given by FPTR data
+    cdef shape_type_c result_shape = array1.shape
+    cdef utils.dpnp_descriptor result = utils.create_output_descriptor(result_shape, kernel_data.return_type, None)
 
     cdef fptr_dpnp_astype_t func = <fptr_dpnp_astype_t > kernel_data.ptr
     func(array1.get_data(), result.get_data(), array1.size)
 
     return result
 
 
-cpdef dparray dpnp_flatten(dparray array_):
+cpdef utils.dpnp_descriptor dpnp_flatten(utils.dpnp_descriptor array_):
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(array_.dtype)
 
     cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_FLATTEN, param1_type, param1_type)
 
-    result_type = dpnp_DPNPFuncType_to_dtype( < size_t > kernel_data.return_type)
-    cdef dparray result = dparray(array_.size, dtype=result_type)
+    # ceate result array with type given by FPTR data
+    cdef shape_type_c result_shape = (array_.size,)
+    cdef utils.dpnp_descriptor result = utils.create_output_descriptor(result_shape, kernel_data.return_type, None)
 
     cdef fptr_dpnp_flatten_t func = <fptr_dpnp_flatten_t > kernel_data.ptr
     func(array_.get_data(), result.get_data(), array_.size)

dpnp/dpnp_iface_manipulation.py

@@ -419,7 +419,7 @@ def ravel(x1, order='C'):
 
     x1_desc = dpnp.get_dpnp_descriptor(x1)
     if x1_desc:
-        return dpnp_flatten(x1)
+        return dpnp_flatten(x1_desc).get_pyobj()
 
     return call_origin(numpy.ravel, x1, order=order)