remove redundant tests for comparison functions

Author: ndgrigorian

dpctl/tests/elementwise/test_equal.py

@@ -14,16 +14,13 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import ctypes
-
 import numpy as np
 import pytest
 
-import dpctl
 import dpctl.tensor as dpt
 from dpctl.tests.helper import get_queue_or_skip, skip_if_dtype_not_supported
 
-from .utils import _all_dtypes, _compare_dtypes, _usm_types
+from .utils import _all_dtypes, _compare_dtypes
 
 
 @pytest.mark.parametrize("op1_dtype", _all_dtypes)
@@ -60,131 +57,10 @@ def test_equal_dtype_matrix(op1_dtype, op2_dtype):
     assert (dpt.asnumpy(r) == np.full(r.shape, True, dtype=r.dtype)).all()
 
 
-@pytest.mark.parametrize("op1_usm_type", _usm_types)
-@pytest.mark.parametrize("op2_usm_type", _usm_types)
-def test_equal_usm_type_matrix(op1_usm_type, op2_usm_type):
-    get_queue_or_skip()
-
-    sz = 128
-    ar1 = dpt.ones(sz, dtype="i4", usm_type=op1_usm_type)
-    ar2 = dpt.ones_like(ar1, dtype="i4", usm_type=op2_usm_type)
-
-    r = dpt.equal(ar1, ar2)
-    assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
-    assert r.usm_type == expected_usm_type
-
-
-def test_equal_order():
-    get_queue_or_skip()
-
-    ar1 = dpt.ones((20, 20), dtype="i4", order="C")
-    ar2 = dpt.ones((20, 20), dtype="i4", order="C")
-    r1 = dpt.equal(ar1, ar2, order="C")
-    assert r1.flags.c_contiguous
-    r2 = dpt.equal(ar1, ar2, order="F")
-    assert r2.flags.f_contiguous
-    r3 = dpt.equal(ar1, ar2, order="A")
-    assert r3.flags.c_contiguous
-    r4 = dpt.equal(ar1, ar2, order="K")
-    assert r4.flags.c_contiguous
-
-    ar1 = dpt.ones((20, 20), dtype="i4", order="F")
-    ar2 = dpt.ones((20, 20), dtype="i4", order="F")
-    r1 = dpt.equal(ar1, ar2, order="C")
-    assert r1.flags.c_contiguous
-    r2 = dpt.equal(ar1, ar2, order="F")
-    assert r2.flags.f_contiguous
-    r3 = dpt.equal(ar1, ar2, order="A")
-    assert r3.flags.f_contiguous
-    r4 = dpt.equal(ar1, ar2, order="K")
-    assert r4.flags.f_contiguous
-
-    ar1 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2]
-    ar2 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2]
-    r4 = dpt.equal(ar1, ar2, order="K")
-    assert r4.strides == (20, -1)
-
-    ar1 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2].mT
-    ar2 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2].mT
-    r4 = dpt.equal(ar1, ar2, order="K")
-    assert r4.strides == (-1, 20)
-
-
-def test_equal_broadcasting():
-    get_queue_or_skip()
-
-    m = dpt.ones((100, 5), dtype="i4")
-    v = dpt.arange(5, dtype="i4")
-
-    r = dpt.equal(m, v)
-    expected = np.full((100, 5), [False, True, False, False, False], dtype="?")
-
-    assert (dpt.asnumpy(r) == expected).all()
-
-    r2 = dpt.equal(v, m)
-    assert (dpt.asnumpy(r2) == expected).all()
-
-    r3 = dpt.empty_like(m, dtype="?")
-    dpt.equal(m, v, out=r3)
-    assert (dpt.asnumpy(r3) == expected).all()
-
-
-@pytest.mark.parametrize("arr_dt", _all_dtypes)
-def test_equal_python_scalar(arr_dt):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(arr_dt, q)
-
-    X = dpt.zeros((10, 10), dtype=arr_dt, sycl_queue=q)
-    py_zeros = (
-        bool(0),
-        int(0),
-        float(0),
-        complex(0),
-        np.float32(0),
-        ctypes.c_int(0),
-    )
-    for sc in py_zeros:
-        R = dpt.equal(X, sc)
-        assert isinstance(R, dpt.usm_ndarray)
-        assert dpt.all(R)
-        R = dpt.equal(sc, X)
-        assert isinstance(R, dpt.usm_ndarray)
-        assert dpt.all(R)
-
-
 class MockArray:
     def __init__(self, arr):
         self.data_ = arr
 
     @property
     def __sycl_usm_array_interface__(self):
         return self.data_.__sycl_usm_array_interface__
-
-
-def test_equal_mock_array():
-    get_queue_or_skip()
-    a = dpt.arange(10)
-    b = dpt.ones(10)
-    c = MockArray(b)
-    r = dpt.equal(a, c)
-    assert isinstance(r, dpt.usm_ndarray)
-
-
-def test_equal_canary_mock_array():
-    get_queue_or_skip()
-    a = dpt.arange(10)
-
-    class Canary:
-        def __init__(self):
-            pass
-
-        @property
-        def __sycl_usm_array_interface__(self):
-            return None
-
-    c = Canary()
-    with pytest.raises(ValueError):
-        dpt.equal(a, c)

dpctl/tests/elementwise/test_greater.py

@@ -14,16 +14,13 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import ctypes
-
 import numpy as np
 import pytest
 
-import dpctl
 import dpctl.tensor as dpt
 from dpctl.tests.helper import get_queue_or_skip, skip_if_dtype_not_supported
 
-from .utils import _all_dtypes, _compare_dtypes, _usm_types
+from .utils import _all_dtypes, _compare_dtypes
 
 
 @pytest.mark.parametrize("op1_dtype", _all_dtypes)
@@ -136,135 +133,6 @@ def test_greater_complex_float():
             assert (dpt.asnumpy(r3) == expected3).all()
 
 
-@pytest.mark.parametrize("op1_usm_type", _usm_types)
-@pytest.mark.parametrize("op2_usm_type", _usm_types)
-def test_greater_usm_type_matrix(op1_usm_type, op2_usm_type):
-    get_queue_or_skip()
-
-    sz = 128
-    ar1 = dpt.ones(sz, dtype="i4", usm_type=op1_usm_type)
-    ar2 = dpt.ones_like(ar1, dtype="i4", usm_type=op2_usm_type)
-
-    r = dpt.greater(ar1, ar2)
-    assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
-    assert r.usm_type == expected_usm_type
-
-
-def test_greater_order():
-    get_queue_or_skip()
-
-    ar1 = dpt.ones((20, 20), dtype="i4", order="C")
-    ar2 = dpt.ones((20, 20), dtype="i4", order="C")
-    r1 = dpt.greater(ar1, ar2, order="C")
-    assert r1.flags.c_contiguous
-    r2 = dpt.greater(ar1, ar2, order="F")
-    assert r2.flags.f_contiguous
-    r3 = dpt.greater(ar1, ar2, order="A")
-    assert r3.flags.c_contiguous
-    r4 = dpt.greater(ar1, ar2, order="K")
-    assert r4.flags.c_contiguous
-
-    ar1 = dpt.ones((20, 20), dtype="i4", order="F")
-    ar2 = dpt.ones((20, 20), dtype="i4", order="F")
-    r1 = dpt.greater(ar1, ar2, order="C")
-    assert r1.flags.c_contiguous
-    r2 = dpt.greater(ar1, ar2, order="F")
-    assert r2.flags.f_contiguous
-    r3 = dpt.greater(ar1, ar2, order="A")
-    assert r3.flags.f_contiguous
-    r4 = dpt.greater(ar1, ar2, order="K")
-    assert r4.flags.f_contiguous
-
-    ar1 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2]
-    ar2 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2]
-    r4 = dpt.greater(ar1, ar2, order="K")
-    assert r4.strides == (20, -1)
-
-    ar1 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2].mT
-    ar2 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2].mT
-    r4 = dpt.greater(ar1, ar2, order="K")
-    assert r4.strides == (-1, 20)
-
-
-def test_greater_broadcasting():
-    get_queue_or_skip()
-
-    m = dpt.ones((100, 5), dtype="i4")
-    v = dpt.arange(1, 6, dtype="i4")
-
-    r = dpt.greater(m, v)
-
-    expected = np.greater(
-        np.ones((100, 5), dtype="i4"), np.arange(1, 6, dtype="i4")
-    )
-    assert (dpt.asnumpy(r) == expected.astype(r.dtype)).all()
-
-    r2 = dpt.greater(v, m)
-    expected2 = np.greater(
-        np.arange(1, 6, dtype="i4"), np.ones((100, 5), dtype="i4")
-    )
-    assert (dpt.asnumpy(r2) == expected2.astype(r2.dtype)).all()
-
-
-@pytest.mark.parametrize("arr_dt", _all_dtypes)
-def test_greater_python_scalar(arr_dt):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(arr_dt, q)
-
-    X = dpt.ones((10, 10), dtype=arr_dt, sycl_queue=q)
-    py_ones = (
-        bool(1),
-        int(1),
-        float(1),
-        complex(1),
-        np.float32(1),
-        ctypes.c_int(1),
-    )
-    for sc in py_ones:
-        R = dpt.greater(X, sc)
-        assert isinstance(R, dpt.usm_ndarray)
-        R = dpt.greater(sc, X)
-        assert isinstance(R, dpt.usm_ndarray)
-
-
-class MockArray:
-    def __init__(self, arr):
-        self.data_ = arr
-
-    @property
-    def __sycl_usm_array_interface__(self):
-        return self.data_.__sycl_usm_array_interface__
-
-
-def test_greater_mock_array():
-    get_queue_or_skip()
-    a = dpt.arange(10)
-    b = dpt.ones(10)
-    c = MockArray(b)
-    r = dpt.greater(a, c)
-    assert isinstance(r, dpt.usm_ndarray)
-
-
-def test_greater_canary_mock_array():
-    get_queue_or_skip()
-    a = dpt.arange(10)
-
-    class Canary:
-        def __init__(self):
-            pass
-
-        @property
-        def __sycl_usm_array_interface__(self):
-            return None
-
-    c = Canary()
-    with pytest.raises(ValueError):
-        dpt.greater(a, c)
-
-
 def test_greater_mixed_integer_kinds():
     get_queue_or_skip()