atleast_1d, atleast_2d, atleast_3d (#336)

* add atleast_1d, atleast_2d, atleast_3d

Author: Rubtsowa

dpnp/backend_manipulation.pyx

@@ -37,6 +37,8 @@ from dpnp.dpnp_utils cimport *
 
 
 __all__ += [
+    "dpnp_atleast_2d",
+    "dpnp_atleast_3d",
     "dpnp_copyto",
     "dpnp_repeat",
     "dpnp_transpose"
@@ -48,6 +50,37 @@ ctypedef void(*fptr_custom_elemwise_transpose_1in_1out_t)(void * , dparray_shape
                                                           dparray_shape_type &, void * , size_t)
 
 
+cpdef dparray dpnp_atleast_2d(dparray arr):
+    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)
+        for i in range(arr_size):
+            result[0, i] = arr[i]
+        return result
+    else:
+        return arr
+
+
+cpdef dparray dpnp_atleast_3d(dparray arr):
+    cdef size_t arr_ndim = arr.ndim
+    cdef dparray_shape_type arr_shape = arr.shape
+    cdef long arr_size = arr.size
+    if arr_ndim == 1:
+        result = dparray((1, 1, arr_size), dtype=arr.dtype)
+        for i in range(arr_size):
+            result[0, 0, i] = arr[i]
+        return result
+    elif arr_ndim == 2:
+        result = dparray((1, arr_shape[0], arr_shape[1]), dtype=arr.dtype)
+        for i in range(arr_shape[0]):
+            for j in range(arr_shape[1]):
+                result[0, i, j] = arr[i, j]
+        return result
+    else:
+        return arr
+
+
 cpdef dparray dpnp_copyto(dparray dst, dparray src, where=True):
     cdef dparray_shape_type shape_src = src.shape
     cdef long size_src = src.size

dpnp/dpnp_iface_manipulation.py

@@ -50,6 +50,9 @@
 
 
 __all__ = [
+    "atleast_1d",
+    "atleast_2d",
+    "atleast_3d",
     "copyto",
     "moveaxis",
     "ravel",
@@ -60,6 +63,85 @@
 ]
 
 
+def atleast_1d(*arys):
+    """
+    Convert inputs to arrays with at least one dimension.
+    Scalar inputs are converted to 1-dimensional arrays, whilst
+    higher-dimensional inputs are preserved.
+
+    For full documentation refer to :obj:`numpy.atleast_1d`.
+
+    Limitations
+    -----------
+    Input arrays is supported as :obj:`dpnp.ndarray`.
+
+    """
+
+    return call_origin(numpy.atleast_1d, *arys)
+
+
+def atleast_2d(*arys):
+    """
+    View inputs as arrays with at least two dimensions.
+
+    For full documentation refer to :obj:`numpy.atleast_2d`.
+
+    Limitations
+    -----------
+    Input arrays is supported as :obj:`dpnp.ndarray`.
+    """
+
+    all_is_dparray = True
+    for ary in arys:
+        if not isinstance(ary, dparray):
+            all_is_dparray = False
+            break
+
+    if not use_origin_backend(arys[0]) and all_is_dparray:
+        result = []
+        for ary in arys:
+            res = dpnp_atleast_2d(ary)
+            result.append(res)
+
+        if len(result) == 1:
+            return result[0]
+        else:
+            return result
+
+    return call_origin(numpy.atleast_2d, *arys)
+
+
+def atleast_3d(*arys):
+    """
+    View inputs as arrays with at least three dimensions.
+
+    For full documentation refer to :obj:`numpy.atleast_3d`.
+
+    Limitations
+    -----------
+    Input arrays is supported as :obj:`dpnp.ndarray`.
+    """
+
+    all_is_dparray = True
+    for ary in arys:
+        if not isinstance(ary, dparray):
+            all_is_dparray = False
+            break
+
+    if not use_origin_backend(arys[0]) and all_is_dparray:
+        result = []
+        for ary in arys:
+            res = dpnp_atleast_3d(ary)
+            result.append(res)
+
+        if len(result) == 1:
+            return result[0]
+        else:
+            return result
+
+    return call_origin(numpy.atleast_3d, *arys)
+
+
 def copyto(dst, src, casting='same_kind', where=True):
     """
     Copies values from one array to another, broadcasting as necessary.

tests/skipped_tests.tbl

@@ -861,6 +861,71 @@ tests/third_party/cupy/math_tests/test_trigonometric.py::TestUnwrap::test_unwrap
 tests/third_party/cupy/math_tests/test_trigonometric.py::TestUnwrap::test_unwrap_2dim_with_axis
 tests/third_party/cupy/math_tests/test_trigonometric.py::TestUnwrap::test_unwrap_2dim_with_discont
 tests/third_party/cupy/math_tests/test_trigonometric.py::TestUnwrap::test_unwrap_2dim_without_axis
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_broadcast_to
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_broadcast_to_fail
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_broadcast_to_fail_numpy19
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_broadcast_to_numpy19
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_broadcast_to_short_shape
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_broadcast_to_short_shape_numpy19
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims0
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims_negative1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims_negative2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims_out_of_range
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims_repeated_axis
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_expand_dims_tuple_axis
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_external_squeeze
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_failure
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_int_axis1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_int_axis2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_int_axis_failure1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_int_axis_failure2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_scalar1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_scalar2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_scalar_failure1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_scalar_failure2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_scalar_failure3
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_scalar_failure4
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_tuple_axis1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_tuple_axis2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_tuple_axis3
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_tuple_axis4
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_tuple_axis_failure1
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_tuple_axis_failure2
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestDims::test_squeeze_tuple_axis_failure3
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_0_{shapes=[(), ()]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_0_{shapes=[(), ()]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_1_{shapes=[(0,), (0,)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_1_{shapes=[(0,), (0,)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_2_{shapes=[(1,), (1,)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_2_{shapes=[(1,), (1,)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_3_{shapes=[(2,), (2,)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_3_{shapes=[(2,), (2,)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_4_{shapes=[(0,), (1,)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_4_{shapes=[(0,), (1,)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_5_{shapes=[(2, 3), (1, 3)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_5_{shapes=[(2, 3), (1, 3)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_6_{shapes=[(2, 1, 3, 4), (3, 1, 4)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_6_{shapes=[(2, 1, 3, 4), (3, 1, 4)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_7_{shapes=[(4, 3, 2, 3), (2, 3)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_7_{shapes=[(4, 3, 2, 3), (2, 3)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_8_{shapes=[(2, 0, 1, 1, 3), (2, 1, 0, 0, 3)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_8_{shapes=[(2, 0, 1, 1, 3), (2, 1, 0, 0, 3)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_9_{shapes=[(0, 1, 1, 3), (2, 1, 0, 0, 3)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_9_{shapes=[(0, 1, 1, 3), (2, 1, 0, 0, 3)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_10_{shapes=[(0, 1, 1, 0, 3), (5, 2, 0, 1, 0, 0, 3), (2, 1, 0, 0, 0, 3)]}::test_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestBroadcast_param_10_{shapes=[(0, 1, 1, 0, 3), (5, 2, 0, 1, 0, 0, 3), (2, 1, 0, 0, 0, 3)]}::test_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_0_{shapes=[(3,), (2,)]}::test_invalid_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_0_{shapes=[(3,), (2,)]}::test_invalid_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_1_{shapes=[(3, 2), (2, 3)]}::test_invalid_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_1_{shapes=[(3, 2), (2, 3)]}::test_invalid_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_2_{shapes=[(3, 2), (3, 4)]}::test_invalid_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_2_{shapes=[(3, 2), (3, 4)]}::test_invalid_broadcast_arrays
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_3_{shapes=[(0,), (2,)]}::test_invalid_broadcast
+tests/third_party/cupy/manipulation_tests/test_dims.py::TestInvalidBroadcast_param_3_{shapes=[(0,), (2,)]}::test_invalid_broadcast_arrays
 tests/third_party/cupy/random_tests/test_distributions.py::TestDistributionsBeta_param_0_{a_shape=(), b_shape=(), dtype=float64, shape=(4, 3, 2)}::test_beta
 tests/third_party/cupy/random_tests/test_distributions.py::TestDistributionsBeta_param_10_{a_shape=(), b_shape=(3, 2), dtype=float16, shape=(4, 3, 2)}::test_beta
 tests/third_party/cupy/random_tests/test_distributions.py::TestDistributionsBeta_param_11_{a_shape=(), b_shape=(3, 2), dtype=float16, shape=(3, 2)}::test_beta