add indices (#486)

Author: Rubtsowa

dpnp/dpnp_algo/dpnp_algo_indexing.pyx

@@ -42,6 +42,7 @@ __all__ += [
     "dpnp_diag_indices",
     "dpnp_diagonal",
     "dpnp_fill_diagonal",
+    "dpnp_indices",
     "dpnp_nonzero",
     "dpnp_place",
     "dpnp_put",
@@ -143,6 +144,40 @@ cpdef dpnp_fill_diagonal(dparray input, val):
         input[ind] = val
 
 
+cpdef dparray dpnp_indices(dimensions):
+    len_dimensions = len(dimensions)
+    res_shape = []
+    res_shape.append(len_dimensions)
+    for i in range(len_dimensions):
+        res_shape.append(dimensions[i])
+
+    result = []
+    if len_dimensions == 1:
+        res = []
+        for i in range(dimensions[0]):
+            res.append(i)
+        result.append(res)
+    else:
+        res1 = []
+        for i in range(dimensions[0]):
+            res = []
+            for j in range(dimensions[1]):
+                res.append(i)
+            res1.append(res)
+        result.append(res1)
+
+        res2 = []
+        for i in range(dimensions[0]):
+            res = []
+            for j in range(dimensions[1]):
+                res.append(j)
+            res2.append(res)
+        result.append(res2)
+
+    dpnp_result = dpnp.array(result)
+    return dpnp_result
+
+
 cpdef tuple dpnp_nonzero(dparray in_array1):
     res_count = in_array1.ndim
 

dpnp/dpnp_iface_indexing.py

@@ -55,6 +55,7 @@
     "diag_indices_from",
     "diagonal",
     "fill_diagonal",
+    "indices",
     "nonzero",
     "place",
     "put",
@@ -220,6 +221,32 @@ def fill_diagonal(input, val, wrap=False):
     return call_origin(numpy.fill_diagonal, input, val, wrap)
 
 
+def indices(dimensions, dtype=int, sparse=False):
+    """
+    Return an array representing the indices of a grid.
+
+    For full documentation refer to :obj:`numpy.indices`.
+
+    Limitations
+    -----------
+    Parameters ``dtype`` and ``sparse`` are supported only with default values.
+    Parameter ``dimensions`` is supported with len <=2.
+    """
+
+    if not isinstance(dimensions, (tuple, list)):
+        pass
+    elif len(dimensions) > 2 or len(dimensions) == 0:
+        pass
+    elif dtype != int:
+        pass
+    elif sparse:
+        pass
+    else:
+        return dpnp_indices(dimensions)
+
+    return call_origin(numpy.indices, dimensions, dtype, sparse)
+
+
 def nonzero(a):
     """
     Return the indices of the elements that are non-zero.

tests/skipped_tests.tbl

@@ -522,10 +522,6 @@ tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_12_{n=15, norm=None
 tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_13_{n=15, norm=None, shape=(10, 10)}::test_rfft
 tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_14_{n=15, norm='ortho', shape=(10,)}::test_rfft
 tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_15_{n=15, norm='ortho', shape=(10, 10)}::test_rfft
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list0
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list1
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list2
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list3
 tests/third_party/cupy/indexing_tests/test_generate.py::TestIX_::test_ix_bool_ndarray
 tests/third_party/cupy/indexing_tests/test_generate.py::TestIX_::test_ix_empty_ndarray
 tests/third_party/cupy/indexing_tests/test_generate.py::TestIX_::test_ix_list

tests/skipped_tests_gpu.tbl

@@ -675,10 +675,6 @@ tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_8_{n=10, norm=None,
 tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_8_{n=10, norm=None, shape=(10,)}::test_rfft
 tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_9_{n=10, norm=None, shape=(10, 10)}::test_irfft
 tests/third_party/cupy/fft_tests/test_fft.py::TestRfft_param_9_{n=10, norm=None, shape=(10, 10)}::test_rfft
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list0
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list1
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list2
-tests/third_party/cupy/indexing_tests/test_generate.py::TestIndices::test_indices_list3
 tests/third_party/cupy/indexing_tests/test_generate.py::TestIX_::test_ix_bool_ndarray
 tests/third_party/cupy/indexing_tests/test_generate.py::TestIX_::test_ix_empty_ndarray
 tests/third_party/cupy/indexing_tests/test_generate.py::TestIX_::test_ix_list

tests/test_indexing.py

@@ -60,6 +60,16 @@ def test_fill_diagonal(array, val):
     numpy.testing.assert_array_equal(expected, result)
 
 
+@pytest.mark.parametrize("dimension",
+                         [(1, ), (2, ), (1, 2), (2, 3), (3, 2), [1], [2], [1, 2], [2, 3], [3, 2]],
+                         ids=['(1, )', '(2, )', '(1, 2)', '(2, 3)', '(3, 2)',
+                              '[1]', '[2]', '[1, 2]', '[2, 3]', '[3, 2]'])
+def test_indices(dimension):
+    expected = numpy.indices(dimension)
+    result = dpnp.indices(dimension)
+    numpy.testing.assert_array_equal(expected, result)
+
+
 @pytest.mark.parametrize("vals",
                          [[100, 200],
                           (100, 200)],