Move dparray specific function into dparray specific place (#877)

Author: shssf

dpnp/dparray.pyx

@@ -387,7 +387,7 @@ cdef class dparray:
 
         if key_is_slice or key_has_slice:
             # fallback to numpy in case of slicing
-            return utils.nd2dp_array(utils.dp2nd_array(self)[key])
+            return nd2dp_array(dp2nd_array(self)[key])
 
         lin_idx = utils._get_linear_index(key, self.shape, self.ndim)
 
@@ -518,9 +518,9 @@ cdef class dparray:
                 self_desc = iface_get_dpnp_descriptor(self)
                 return dpnp_flatten(self_desc).get_pyobj()
 
-        result = utils.dp2nd_array(self).flatten(order=order)
+        result = dp2nd_array(self).flatten(order=order)
 
-        return utils.nd2dp_array(result)
+        return nd2dp_array(result)
 
     def ravel(self, order='C'):
         """
@@ -804,9 +804,9 @@ cdef class dparray:
             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)
+        result = dp2nd_array(self).astype(dtype=dtype, order=order, casting=casting, subok=subok, copy=copy)
 
-        return utils.nd2dp_array(result)
+        return nd2dp_array(result)
 
     def conj(self):
         """
@@ -1273,3 +1273,20 @@ cdef class dparray:
         """
 
         return asnumpy(self).tostring(order)
+
+
+def dp2nd_array(arr):
+    """Convert dparray to ndarray"""
+    return asnumpy(arr) if isinstance(arr, dparray) else arr
+
+
+def nd2dp_array(arr):
+    """Convert ndarray to dparray"""
+    if not isinstance(arr, numpy.ndarray):
+        return arr
+
+    result = dparray(arr.shape, dtype=arr.dtype)
+    for i in range(result.size):
+        result._setitem_scalar(i, arr.item(i))
+
+    return result

dpnp/dpnp_utils/dpnp_algo_utils.pxd

@@ -28,7 +28,6 @@
 from libcpp cimport bool as cpp_bool
 from libcpp.vector cimport vector
 
-from dpnp.dparray cimport dparray
 from dpnp.dpnp_algo.dpnp_algo cimport DPNPFuncType, DPNPFuncName
 
 
@@ -87,7 +86,7 @@ Conversion of the transformation shape axis [-1, 0, 1] into [2, 0, 1] where numb
 
 cdef tuple get_shape_dtype(object input_obj)
 """
-input_obj: Complex object with lists, scalars and dparrays
+input_obj: Complex object with lists, scalars and numpy-like arrays
 
 Returns a tuple of:
 1. concatenated shape, empty `shape_type_c` if unsuccessful.
@@ -119,16 +118,6 @@ cpdef tuple get_axis_offsets(shape)
 Compute axis offsets in the linear array memory
 """
 
-cpdef dp2nd_array(arr)
-"""
-Convert dparray to ndarray
-"""
-
-cpdef nd2dp_array(arr)
-"""
-Convert ndarray to dparray
-"""
-
 cdef class dpnp_descriptor:
     """array DPNP descriptor"""
 

dpnp/dpnp_utils/dpnp_algo_utils.pyx

@@ -38,6 +38,8 @@ from dpnp.dpnp_algo cimport dpnp_DPNPFuncType_to_dtype, dpnp_dtype_to_DPNPFuncTy
 from libcpp cimport bool as cpp_bool
 from libcpp.complex cimport complex as cpp_complex
 
+from dpnp.dparray import dparray
+
 cimport cpython
 cimport cython
 cimport numpy
@@ -69,12 +71,10 @@ __all__ = [
     "checker_throw_type_error",
     "checker_throw_value_error",
     "create_output_descriptor_py",
-    "dp2nd_array",
     "dpnp_descriptor",
     "get_axis_indeces",
     "get_axis_offsets",
     "_get_linear_index",
-    "nd2dp_array",
     "normalize_axis",
     "_object_to_tuple",
     "use_origin_backend"
@@ -208,10 +208,6 @@ cpdef dpnp_descriptor create_output_descriptor_py(shape_type_c output_shape, obj
     return create_output_descriptor(output_shape, c_type, requested_out)
 
 
-cpdef dp2nd_array(arr):
-    """Convert dparray to ndarray"""
-    return dpnp.asnumpy(arr) if isinstance(arr, dparray) else arr
-
 cdef long container_copy(object dst_obj, object src_obj, size_t dst_idx = 0) except -1:
     cdef elem_dtype = dst_obj.dtype
 
@@ -421,18 +417,6 @@ cdef dpnp_descriptor create_output_descriptor(shape_type_c output_shape,
     return result_desc
 
 
-cpdef nd2dp_array(arr):
-    """Convert ndarray to dparray"""
-    if not isinstance(arr, numpy.ndarray):
-        return arr
-
-    result = dparray(arr.shape, dtype=arr.dtype)
-    for i in range(result.size):
-        result._setitem_scalar(i, arr.item(i))
-
-    return result
-
-
 cpdef shape_type_c normalize_axis(object axis_obj, size_t shape_size_inp):
     """
     Conversion of the transformation shape axis [-1, 0, 1] into [2, 0, 1] where numbers are `id`s of array shape axis