Removing multiple definition of shape type in cython (#1098)

* Removing multiple definition of shape type in cython

Author: Alexander-Makaryev

dpnp/dparray.pxd

@@ -31,20 +31,18 @@ Represents multi-dimensional array using USM interface for an Intel GPU device.
 """
 
 
-from libcpp.vector cimport vector
+from dpnp.dpnp_algo cimport shape_type_c
 
 
-ctypedef vector.vector[long] dparray_shape_type
-
 cdef class dparray:
     """Multi-dimensional array using USM interface for an Intel GPU device.
 
     """
 
     cdef:
         readonly Py_ssize_t _dparray_size
-        public dparray_shape_type _dparray_shape
-        public dparray_shape_type _dparray_strides
+        public shape_type_c _dparray_shape
+        public shape_type_c _dparray_strides
         readonly object _dparray_dtype
         readonly char * _dparray_data
         size_t iter_idx

dpnp/dparray.pyx

@@ -577,7 +577,7 @@ cdef class dparray:
         cdef size_previous = self.size
 
         cdef long size_new = 1
-        cdef dparray_shape_type shape_new
+        cdef shape_type_c shape_new
         shape_new.reserve(len(shape_tup))
 
         for shape_it in shape_tup:

dpnp/dpnp_algo/__init__.pxd

@@ -25,4 +25,9 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 # *****************************************************************************
 
+from libcpp.vector cimport vector
+
+ctypedef long shape_elem_type
+ctypedef vector.vector[shape_elem_type] shape_type_c
+
 from dpnp.dpnp_algo.dpnp_algo cimport *

dpnp/dpnp_algo/dpnp_algo.pxd

@@ -25,15 +25,11 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 # *****************************************************************************
 
-from libcpp.vector cimport vector
 from libcpp cimport bool as cpp_bool
 
 from dpnp.dpnp_utils.dpnp_algo_utils cimport dpnp_descriptor
 
-
-ctypedef long shape_elem_type
-ctypedef vector.vector[shape_elem_type] shape_type_c
-
+from dpnp.dpnp_algo cimport shape_elem_type, shape_type_c
 
 cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName":  # need this namespace for Enum import
     cdef enum DPNPFuncName "DPNPFuncName":

dpnp/dpnp_utils/dpnp_algo_utils.pxd

@@ -26,12 +26,9 @@
 # *****************************************************************************
 
 from libcpp cimport bool as cpp_bool
-from libcpp.vector cimport vector
 
 from dpnp.dpnp_algo.dpnp_algo cimport DPNPFuncType, DPNPFuncName
-
-
-ctypedef vector.vector[long] shape_type_c
+from dpnp.dpnp_algo cimport shape_type_c
 
 
 cpdef checker_throw_runtime_error(function_name, message)

dpnp/dpnp_utils/dpnp_algo_utils.pyx

@@ -35,7 +35,7 @@ import numpy
 import dpnp.config as config
 import dpnp.dpnp_container as dpnp_container
 import dpnp
-from dpnp.dpnp_algo cimport dpnp_DPNPFuncType_to_dtype, dpnp_dtype_to_DPNPFuncType, get_dpnp_function_ptr
+from dpnp.dpnp_algo.dpnp_algo cimport dpnp_DPNPFuncType_to_dtype, dpnp_dtype_to_DPNPFuncType, get_dpnp_function_ptr
 from libcpp cimport bool as cpp_bool
 from libcpp.complex cimport complex as cpp_complex