manip module to desc completed (#868)

Author: shssf

dpnp/dpnp_algo/dpnp_algo_manipulation.pyx

@@ -51,39 +51,42 @@ ctypedef void(*fptr_custom_elemwise_transpose_1in_1out_t)(void * , size_t * , si
 ctypedef void(*fptr_dpnp_repeat_t)(const void *, void * , const size_t , const size_t)
 
 
-cpdef dparray dpnp_atleast_2d(dparray arr):
+cpdef utils.dpnp_descriptor dpnp_atleast_2d(utils.dpnp_descriptor arr):
+    # it looks like it should be dpnp.copy + dpnp.reshape
+    cdef utils.dpnp_descriptor result
     cdef size_t arr_ndim = arr.ndim
     cdef long arr_size = arr.size
     if arr_ndim == 1:
-        result = dparray((1, arr_size), dtype=arr.dtype)
+        result = utils_py.create_output_descriptor_py((1, arr_size), arr.dtype, None)
         for i in range(arr_size):
-            result[0, i] = arr[i]
+            result.get_pyobj()[0, i] = arr.get_pyobj()[i]
         return result
     else:
         return arr
 
 
-cpdef dparray dpnp_atleast_3d(dparray arr):
+cpdef utils.dpnp_descriptor dpnp_atleast_3d(utils.dpnp_descriptor arr):
+    # it looks like it should be dpnp.copy + dpnp.reshape
     cdef size_t arr_ndim = arr.ndim
     cdef shape_type_c arr_shape = arr.shape
     cdef long arr_size = arr.size
     if arr_ndim == 1:
-        result = dparray((1, 1, arr_size), dtype=arr.dtype)
+        result = utils_py.create_output_descriptor_py((1, 1, arr_size), arr.dtype, None)
         for i in range(arr_size):
-            result[0, 0, i] = arr[i]
+            result.get_pyobj()[0, 0, i] = arr.get_pyobj()[i]
         return result
     elif arr_ndim == 2:
-        result = dparray((1, arr_shape[0], arr_shape[1]), dtype=arr.dtype)
+        result = utils_py.create_output_descriptor_py((1, arr_shape[0], arr_shape[1]), arr.dtype, None)
         for i in range(arr_shape[0]):
             for j in range(arr_shape[1]):
-                result[0, i, j] = arr[i, j]
+                result.get_pyobj()[0, i, j] = arr.get_pyobj()[i, j]
         return result
     else:
         return arr
 
 
 cpdef dpnp_copyto(utils.dpnp_descriptor dst, utils.dpnp_descriptor src, where=True):
-    # Convert string type names (dparray.dtype) to C enum DPNPFuncType
+    # Convert string type names (array.dtype) to C enum DPNPFuncType
     cdef DPNPFuncType dst_type = dpnp_dtype_to_DPNPFuncType(dst.dtype)
     cdef DPNPFuncType src_type = dpnp_dtype_to_DPNPFuncType(src.dtype)
 
@@ -167,7 +170,7 @@ cpdef utils.dpnp_descriptor dpnp_transpose(utils.dpnp_descriptor array1, axes=No
         """ construct output shape """
         result_shape[i] = input_shape[permute_axes[i]]
 
-    # convert string type names (dparray.dtype) to C enum DPNPFuncType
+    # convert string type names (array.dtype) to C enum DPNPFuncType
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(array1.dtype)
 
     # get the FPTR data structure

dpnp/dpnp_iface_manipulation.py

@@ -43,7 +43,6 @@
 import collections.abc
 
 from dpnp.dpnp_algo import *
-from dpnp.dparray import dparray
 from dpnp.dpnp_utils import *
 from dpnp.dpnp_iface_arraycreation import array
 
@@ -128,16 +127,20 @@ def atleast_2d(*arys):
     Input arrays is supported as :obj:`dpnp.ndarray`.
     """
 
-    all_is_dparray = True
+    all_is_array = True
+    arys_desc = []
     for ary in arys:
-        if not isinstance(ary, dparray):
-            all_is_dparray = False
+        ary_desc = dpnp.get_dpnp_descriptor(ary)
+        if ary_desc:
+            arys_desc.append(ary_desc)
+        else:
+            all_is_array = False
             break
 
-    if not use_origin_backend(arys[0]) and all_is_dparray:
+    if not use_origin_backend(arys[0]) and all_is_array:
         result = []
-        for ary in arys:
-            res = dpnp_atleast_2d(ary)
+        for ary_desc in arys_desc:
+            res = dpnp_atleast_2d(ary_desc).get_pyobj()
             result.append(res)
 
         if len(result) == 1:
@@ -159,16 +162,20 @@ def atleast_3d(*arys):
     Input arrays is supported as :obj:`dpnp.ndarray`.
     """
 
-    all_is_dparray = True
+    all_is_array = True
+    arys_desc = []
     for ary in arys:
-        if not isinstance(ary, dparray):
-            all_is_dparray = False
+        ary_desc = dpnp.get_dpnp_descriptor(ary)
+        if ary_desc:
+            arys_desc.append(ary_desc)
+        else:
+            all_is_array = False
             break
 
-    if not use_origin_backend(arys[0]) and all_is_dparray:
+    if not use_origin_backend(arys[0]) and all_is_array:
         result = []
-        for ary in arys:
-            res = dpnp_atleast_3d(ary)
+        for ary_desc in arys_desc:
+            res = dpnp_atleast_3d(ary_desc).get_pyobj()
             result.append(res)
 
         if len(result) == 1:
@@ -206,11 +213,11 @@ def concatenate(arrs, axis=0, out=None, dtype=None, casting="same_kind"):
     """
 
     # TODO:
-    # `call_origin` cannot convert sequence of dparray to sequence of
+    # `call_origin` cannot convert sequence of array to sequence of
     # ndarrays
     arrs_new = []
     for arr in arrs:
-        arrx = dpnp.asnumpy(arr) if isinstance(arr, dparray) else arr
+        arrx = dpnp.asnumpy(arr) if not isinstance(arr, numpy.ndarray) else arr
         arrs_new.append(arrx)
 
     return call_origin(numpy.concatenate, arrs_new, axis=axis, out=out, dtype=dtype, casting=casting)
@@ -330,11 +337,11 @@ def hstack(tup):
     """
 
     # TODO:
-    # `call_origin` cannot convert sequence of dparray to sequence of
+    # `call_origin` cannot convert sequence of array to sequence of
     # nparrays
     tup_new = []
     for tp in tup:
-        tpx = dpnp.asnumpy(tp) if isinstance(tp, dparray) else tp
+        tpx = dpnp.asnumpy(tp) if not isinstance(tp, numpy.ndarray) else tp
         tup_new.append(tpx)
 
     return call_origin(numpy.hstack, tup_new)
@@ -686,11 +693,11 @@ def vstack(tup):
     """
 
     # TODO:
-    # `call_origin` cannot convert sequence of dparray to sequence of
+    # `call_origin` cannot convert sequence of array to sequence of
     # nparray
     tup_new = []
     for tp in tup:
-        tpx = dpnp.asnumpy(tp) if isinstance(tp, dparray) else tp
+        tpx = dpnp.asnumpy(tp) if not isinstance(tp, numpy.ndarray) else tp
         tup_new.append(tpx)
 
     return call_origin(numpy.vstack, tup_new)

dpnp/dpnp_iface_mathematical.py

@@ -1357,7 +1357,6 @@ def prod(x1, axis=None, dtype=None, out=None, keepdims=False, initial=None, wher
 
     Limitations
     -----------
-        Parameter ``x1`` is supported as :obj:`dpnp.dparray` only.
         Parameter ``where`` is unsupported.
         Input array data types are limited by DPNP :ref:`Data types`.
 
@@ -1560,7 +1559,6 @@ def sum(x1, axis=None, dtype=None, out=None, keepdims=False, initial=None, where
 
     Limitations
     -----------
-        Parameter ``x1`` is supported as :obj:`dpnp.dparray` only.
         Parameter `where`` is unsupported.
         Input array data types are limited by DPNP :ref:`Data types`.
 

dpnp/dpnp_iface_trigonometric.py

@@ -43,7 +43,6 @@
 import numpy
 
 from dpnp.dpnp_algo import *
-from dpnp.dparray import dparray
 from dpnp.dpnp_utils import *
 import dpnp