Changed tests for tril() and triu() functions.

Author: npolina4

dpnp/dpnp_container.py

@@ -39,7 +39,6 @@
 
 from dpnp.dpnp_array import dpnp_array
 import dpnp
-import operator
 
 
 __all__ = [
@@ -204,19 +203,15 @@ def ones(shape,
 
 
 def tril(x1, /, *, k=0):
-    k = operator.index(k)
-    order = "F" if (x1.flags.f_contiguous) else "C"
     """"Creates `dpnp_array` as lower triangular part of an input array."""
     array_obj = dpt.tril(x1.get_array() if isinstance(x1, dpnp_array) else x1, k)
-    return dpnp_array(array_obj.shape, buffer=array_obj, order=order)
+    return dpnp_array(array_obj.shape, buffer=array_obj, order="K")
 
 
 def triu(x1, /, *, k=0):
-    k = operator.index(k)
-    order = "F" if (x1.flags.f_contiguous) else "C"
     """"Creates `dpnp_array` as upper triangular part of an input array."""
     array_obj = dpt.triu(x1.get_array() if isinstance(x1, dpnp_array) else x1, k)
-    return dpnp_array(array_obj.shape, buffer=array_obj, order=order)
+    return dpnp_array(array_obj.shape, buffer=array_obj, order="K")
 
 
 def zeros(shape,

dpnp/dpnp_iface_arraycreation.py

@@ -42,6 +42,7 @@
 
 import numpy
 import dpnp
+import operator
 
 import dpnp.config as config
 from dpnp.dpnp_algo import *
@@ -1357,15 +1358,20 @@ def tril(x1, /, *, k=0):
 
     """
 
+    _k = None
+    try:
+        _k = operator.index(k)
+    except TypeError:
+        pass
+
     if not isinstance(x1, (dpnp.ndarray, dpt.usm_ndarray)):
         pass
     elif x1.ndim < 2:
         pass
-    elif not isinstance(k, int):
-        if not (isinstance(k, (dpnp.ndarray, dpt.usm_ndarray)) and numpy.issubdtype(k.dtype, int)):
-            pass
+    elif _k is None:
+        pass
     else:
-        return dpnp_container.tril(x1, k=k)
+        return dpnp_container.tril(x1, k=_k)
 
     return call_origin(numpy.tril, x1, k)
 
@@ -1396,15 +1402,20 @@ def triu(x1, /, *, k=0):
 
     """
 
+    _k = None
+    try:
+        _k = operator.index(k)
+    except TypeError:
+        pass
+
     if not isinstance(x1, (dpnp.ndarray, dpt.usm_ndarray)):
         pass
     elif x1.ndim < 2:
         pass
-    elif not isinstance(k, int):
-        if not (isinstance(k, (dpnp.ndarray, dpt.usm_ndarray)) and numpy.issubdtype(k.dtype, int)):
-            pass
+    elif _k is None:
+        pass
     else:
-        return dpnp_container.triu(x1, k=k)
+        return dpnp_container.triu(x1, k=_k)
 
     return call_origin(numpy.triu, x1, k)
 

tests/skipped_tests.tbl

@@ -430,12 +430,6 @@ tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_
 tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_mixed_start_stop
 tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_mixed_start_stop2
 tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_start_stop_list
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_tril
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_tril_nega
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_tril_posi
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_triu
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_triu_nega
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_triu_posi
 tests/third_party/cupy/indexing_tests/test_generate.py::TestAxisConcatenator::test_AxisConcatenator_init1
 tests/third_party/cupy/indexing_tests/test_generate.py::TestAxisConcatenator::test_len
 tests/third_party/cupy/indexing_tests/test_generate.py::TestC_::test_c_1

tests/skipped_tests_gpu.tbl

@@ -190,12 +190,6 @@ tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_cons
 tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_construction_from_tuple
 tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_extraction_from_nested_list
 tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_extraction_from_nested_tuple
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_tril
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_tril_nega
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_tril_posi
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_triu
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_triu_nega
-tests/third_party/cupy/creation_tests/test_matrix.py::TestTriLowerAndUpper_param_0_{shape=(2,)}::test_triu_posi
 
 tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_4_{shape=(3, 3), val=(2,), wrap=True}::test_1darray
 tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_4_{shape=(3, 3), val=(2,), wrap=True}::test_fill_diagonal

tests/test_arraycreation.py

@@ -15,6 +15,7 @@
 )
 
 import tempfile
+import operator
 
 
 @pytest.mark.parametrize("start",
@@ -258,8 +259,10 @@ def test_tri_default_dtype():
 
 
 @pytest.mark.parametrize("k",
-                         [-3, -2, -1, 0, 1, 2, 3, 4, 5],
-                         ids=['-3', '-2', '-1', '0', '1', '2', '3', '4', '5'])
+                         [-3, -2, -1, 0, 1, 2, 3, 4, 5,
+                          numpy.array(1), dpnp.array(2), dpt.asarray(3)],
+                         ids=['-3', '-2', '-1', '0', '1', '2', '3', '4', '5',
+                              'np.array(1)', 'dpnp.array(2)', 'dpt.asarray(3)'])
 @pytest.mark.parametrize("m",
                          [[[0, 0], [0, 0]],
                           [[1, 2], [1, 2]],
@@ -275,14 +278,16 @@ def test_tri_default_dtype():
 def test_tril(m, k, dtype):
     a = numpy.array(m, dtype=dtype)
     ia = dpnp.array(a)
-    expected = numpy.tril(a, k=k)
+    expected = numpy.tril(a, k=operator.index(k))
     result = dpnp.tril(ia, k=k)
     assert_array_equal(expected, result)
 
 
 @pytest.mark.parametrize("k",
-                         [-3, -2, -1, 0, 1, 2, 3, 4, 5],
-                         ids=['-3', '-2', '-1', '0', '1', '2', '3', '4', '5'])
+                         [-3, -2, -1, 0, 1, 2, 3, 4, 5,
+                          numpy.array(1), dpnp.array(2), dpt.asarray(3)],
+                         ids=['-3', '-2', '-1', '0', '1', '2', '3', '4', '5',
+                              'np.array(1)', 'dpnp.array(2)', 'dpt.asarray(3)'])
 @pytest.mark.parametrize("m",
                          [[[1, 2], [3, 4]],
                           [[0, 1, 2], [3, 4, 5], [6, 7, 8]],
@@ -294,7 +299,7 @@ def test_tril(m, k, dtype):
 def test_triu(m, k, dtype):
     a = numpy.array(m, dtype=dtype)
     ia = dpnp.array(a)
-    expected = numpy.triu(a, k=k)
+    expected = numpy.triu(a, k=operator.index(k))
     result = dpnp.triu(ia, k=k)
     assert_array_equal(expected, result)
 
@@ -305,8 +310,8 @@ def test_triu(m, k, dtype):
 def test_triu_size_null(k):
     a = numpy.ones(shape=(1, 2, 0))
     ia = dpnp.array(a)
-    expected = numpy.triu(a, k)
-    result = dpnp.triu(ia, k)
+    expected = numpy.triu(a, k=k)
+    result = dpnp.triu(ia, k=k)
     assert_array_equal(expected, result)
 
 

tests/test_sycl_queue.py

@@ -168,7 +168,7 @@ def test_array_creation_like(func, kwargs, device_x, device_y):
 def test_tril_triu(func, device):
     x0 = dpnp.ones((3,3), device=device)
     x = getattr(dpnp, func)(x0)
-    assert x.sycl_device == device
+    assert_sycl_queue_equal(x.sycl_queue, x0.sycl_queue)
 
 
 @pytest.mark.usefixtures("allow_fall_back_on_numpy")

tests/third_party/cupy/creation_tests/test_matrix.py

@@ -140,6 +140,7 @@ def test_tri_posi(self, xp, dtype):
     {'shape': (2, 3, 4)},
 )
 @testing.gpu
+@pytest.mark.usefixtures("allow_fall_back_on_numpy")
 class TestTriLowerAndUpper(unittest.TestCase):
 
     @testing.for_all_dtypes(no_complex=True)
@@ -148,7 +149,6 @@ def test_tril(self, xp, dtype):
         m = testing.shaped_arange(self.shape, xp, dtype)
         return xp.tril(m)
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.numpy_cupy_array_equal()
     def test_tril_array_like(self, xp):
         return xp.tril([[1, 2], [3, 4]])
@@ -171,7 +171,6 @@ def test_triu(self, xp, dtype):
         m = testing.shaped_arange(self.shape, xp, dtype)
         return xp.triu(m)
 
-    @pytest.mark.usefixtures("allow_fall_back_on_numpy")
     @testing.numpy_cupy_array_equal()
     def test_triu_array_like(self, xp):
         return xp.triu([[1, 2], [3, 4]])