move container_copy() to container specific place (#884)

Author: shssf

dpnp/dpnp_algo/dpnp_algo.pyx

@@ -36,6 +36,8 @@ from libc.time cimport time, time_t
 import dpnp
 import dpnp.config as config
 import dpnp.dpnp_utils as utils_py
+from dpnp.dpnp_container import container_copy
+
 import numpy
 
 cimport cpython
@@ -118,7 +120,7 @@ cpdef utils.dpnp_descriptor dpnp_array(object obj, object dtype=None):
         else:
             result = utils_py.create_output_descriptor_py(obj_shape, obj_dtype, None)
 
-    utils.container_copy(result.get_pyobj(), obj)
+    container_copy(result.get_pyobj(), obj)
 
     return result
 

dpnp/dpnp_container.py

@@ -85,3 +85,20 @@ def create_output_container(shape, type):
         result = dparray(shape, dtype=type)
 
     return result    
+
+
+def container_copy(dst_obj, src_obj, dst_idx = 0):
+    """
+    Copy values to `dst` by iterating element by element in `input_obj`
+    """
+
+    for elem_value in src_obj:
+        if isinstance(elem_value, (list, tuple)):
+            dst_idx = container_copy(dst_obj, elem_value, dst_idx)
+        elif issubclass(type(elem_value), (numpy.ndarray, dparray)):
+            dst_idx = container_copy(dst_obj, elem_value, dst_idx)
+        else:
+            dst_obj.flat[dst_idx] = elem_value
+            dst_idx += 1
+
+    return dst_idx

dpnp/dpnp_utils/dpnp_algo_utils.pxd

@@ -98,10 +98,6 @@ cpdef find_common_type(object x1_obj, object x2_obj)
 Find common type of 2 input objects
 """
 
-cdef long container_copy(object dst_obj, object src_obj, size_t dst_idx=*) except -1
-"""
-Copy values to `dst` by iterating element by element in `input_obj`
-"""
 
 cpdef long _get_linear_index(key, tuple shape, int ndim)
 """

dpnp/dpnp_utils/dpnp_algo_utils.pyx

@@ -35,12 +35,10 @@ import numpy
 import dpnp.config as config
 import dpnp
 from dpnp.dpnp_algo cimport dpnp_DPNPFuncType_to_dtype, dpnp_dtype_to_DPNPFuncType, get_dpnp_function_ptr
-from dpnp.dpnp_container import create_output_container
+from dpnp.dpnp_container import create_output_container, container_copy
 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
@@ -194,21 +192,6 @@ cpdef dpnp_descriptor create_output_descriptor_py(shape_type_c output_shape, obj
     return create_output_descriptor(output_shape, c_type, requested_out)
 
 
-cdef long container_copy(object dst_obj, object src_obj, size_t dst_idx = 0) except -1:
-    cdef elem_dtype = dst_obj.dtype
-
-    for elem_value in src_obj:
-        if isinstance(elem_value, (list, tuple)):
-            dst_idx = container_copy(dst_obj, elem_value, dst_idx)
-        elif issubclass(type(elem_value), (numpy.ndarray, dparray)):
-            dst_idx = container_copy(dst_obj, elem_value, dst_idx)
-        else:
-            dst_obj.flat[dst_idx] = elem_value
-            dst_idx += 1
-
-    return dst_idx
-
-
 cpdef tuple get_axis_indeces(idx, shape):
     """
     Compute axis indices of an element in array from array linear index