dpnp.array() to desc (#852)

Author: shssf

dpnp/dpnp_algo/dpnp_algo.pxd

@@ -305,8 +305,8 @@ cpdef dpnp_descriptor dpnp_matmul(dpnp_descriptor in_array1, dpnp_descriptor in_
 Array creation routines
 """
 cpdef dpnp_descriptor dpnp_arange(start, stop, step, dtype)
-cpdef dparray dpnp_array(object obj, object dtype=*)
-cpdef dparray dpnp_init_val(shape, dtype, value)
+cpdef dpnp_descriptor dpnp_array(object obj, object dtype=*)
+cpdef dpnp_descriptor dpnp_init_val(shape, dtype, value)
 cpdef dpnp_descriptor dpnp_full(result_shape, value_in, result_dtype)  # same as dpnp_init_val
 cpdef dpnp_descriptor dpnp_copy(dpnp_descriptor x1)
 

dpnp/dpnp_algo/dpnp_algo.pyx

@@ -96,30 +96,29 @@ cpdef utils.dpnp_descriptor dpnp_arange(start, stop, step, dtype):
     return result
 
 
-cpdef dparray dpnp_array(object obj, object dtype=None):
-    cdef dparray result
-    cdef elem_dtype
+cpdef utils.dpnp_descriptor dpnp_array(object obj, object dtype=None):
+    cdef utils.dpnp_descriptor result
     cdef shape_type_c obj_shape
 
     # convert scalar to tuple
     if dpnp.isscalar(obj):
         obj = (obj, )
 
     if not cpython.PySequence_Check(obj):
-        raise TypeError(f"DPNP array(): Unsupported non-sequence obj={type(obj)}")
+        raise TypeError(f"DPNP dpnp_array(): Unsupported non-sequence obj={type(obj)}")
 
     obj_shape, elem_dtype = utils.get_shape_dtype(obj)
     if dtype is not None:
         """ Set type from parameter. result might be empty array """
-        result = dparray(obj_shape, dtype=dtype)
+        result = utils_py.create_output_descriptor_py(obj_shape, dtype, None)
     else:
         if obj_shape.empty():
             """ Empty object (ex. empty list) and no type provided """
-            result = dparray(obj_shape)
+            result = utils_py.create_output_descriptor_py(obj_shape, None, None)
         else:
-            result = dparray(obj_shape, dtype=elem_dtype)
+            result = utils_py.create_output_descriptor_py(obj_shape, elem_dtype, None)
 
-    utils.copy_values_to_dparray(result, obj)
+    utils.copy_values_to_dparray(result.get_pyobj(), obj)
 
     return result
 
@@ -153,20 +152,19 @@ cpdef dparray dpnp_flatten(dparray array_):
     return result
 
 
-cpdef dparray dpnp_init_val(shape, dtype, value):
+cpdef utils.dpnp_descriptor dpnp_init_val(shape, dtype, value):
     """
     same as dpnp_full(). TODO remove code dumplication
     """
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
 
     cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_INITVAL, param1_type, param1_type)
 
-    result_type = dpnp_DPNPFuncType_to_dtype( < size_t > kernel_data.return_type)
-    cdef dparray result = dparray(shape, dtype=dtype)
+    cdef utils.dpnp_descriptor result = utils_py.create_output_descriptor_py(shape, dtype, None)
 
     # TODO: find better way to pass single value with type conversion
-    cdef dparray val_arr = dparray((1, ), dtype=dtype)
-    val_arr[0] = value
+    cdef utils.dpnp_descriptor val_arr = utils_py.create_output_descriptor_py((1, ), dtype, None)
+    val_arr.get_pyobj()[0] = value
 
     cdef fptr_dpnp_initval_t func = <fptr_dpnp_initval_t > kernel_data.ptr
     func(result.get_data(), val_arr.get_data(), result.size)

dpnp/dpnp_iface_arraycreation.py

@@ -149,7 +149,7 @@ def arange(start, stop=None, step=1, dtype=None):
     return call_origin(numpy.arange, start, stop=stop, step=step, dtype=dtype)
 
 
-def array(obj, dtype=None, copy=True, order='C', subok=False, ndmin=0):
+def array(x1, dtype=None, copy=True, order='C', subok=False, ndmin=0, like=None):
     """
     Creates an array.
 
@@ -192,51 +192,20 @@ def array(obj, dtype=None, copy=True, order='C', subok=False, ndmin=0):
 
     """
 
-    # print("=======================")
-    # print(f"x1={obj}")
-    if (use_origin_backend(obj)):
-        # print("=========numpy.array==============")
-        return numpy.array(obj, dtype=dtype, copy=copy, order=order, subok=subok, ndmin=ndmin)
+    if not dpnp.is_type_supported(dtype) and dtype is not None:
+        pass
+    elif subok is not False:
+        pass
+    elif copy is not True:
+        pass
+    elif order != 'C':
+        pass
+    elif ndmin != 0:
+        pass
+    else:
+        return dpnp_array(x1, dtype).get_pyobj()
 
-    # if not isinstance(obj, collections.abc.Sequence):
-    #     return numpy.array(obj, dtype=dtype, copy=copy, order=order, subok=subok, ndmin=ndmin)
-
-    # if isinstance(obj, numpy.object):
-    #     return numpy.array(obj, dtype=dtype, copy=copy, order=order, subok=subok, ndmin=ndmin)
-
-    if subok is not False:
-        checker_throw_value_error("array", "subok", subok, False)
-
-    if copy is not True:
-        checker_throw_value_error("array", "copy", copy, True)
-
-    if order != 'C':
-        checker_throw_value_error("array", "order", order, 'C')
-
-    if ndmin != 0:
-        checker_throw_value_error("array", "ndmin", ndmin, 0)
-
-    # print("=========dpnp_array==============")
-    return dpnp_array(obj, dtype)
-
-
-# def array(x1, dtype=None, copy=True, order='C', subok=False, ndmin=0):
-#     print("=======================")
-#     print(f"x1={x1}")
-#     x1_desc = dpnp.get_dpnp_descriptor(x1)
-#     if x1_desc:
-#         if subok is not False:
-#             pass
-#         elif copy is not True:
-#             pass
-#         elif order != 'C':
-#             pass
-#         elif ndmin != 0:
-#             pass
-#         else:
-#             return dpnp_array(x1, dtype)
-
-#     return call_origin(numpy.array, x1, dtype, copy=copy, order=order, subok=subok, ndmin=ndmin)
+    return call_origin(numpy.array, x1, dtype=dtype, copy=copy, order=order, subok=subok, ndmin=ndmin)
 
 
 def asanyarray(a, dtype=None, order='C'):

dpnp/dpnp_utils/dpnp_algo_utils.pyx

@@ -256,6 +256,7 @@ cdef tuple get_shape_dtype(object input_obj):
     cdef shape_type_c return_shape  # empty shape means scalar
     return_dtype = None
 
+    # TODO replace with checking "shape" and "dtype" attributes
     if issubclass(type(input_obj), (numpy.ndarray, dparray)):
         return (input_obj.shape, input_obj.dtype)