remove redundant bitwise function tests

Author: ndgrigorian

dpctl/tests/elementwise/test_bitwise_and.py

@@ -25,7 +25,7 @@
 
 
 @pytest.mark.parametrize("op_dtype", _integral_dtypes)
-def test_bitwise_and_dtype_matrix_contig(op_dtype):
+def test_bitwise_and_dtype_matrix(op_dtype):
     q = get_queue_or_skip()
     skip_if_dtype_not_supported(op_dtype, q)
 
@@ -50,32 +50,6 @@ def test_bitwise_and_dtype_matrix_contig(op_dtype):
     assert (r_np == dpt.asnumpy(r)).all()
 
 
-@pytest.mark.parametrize("op_dtype", _integral_dtypes)
-def test_bitwise_and_dtype_matrix_strided(op_dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(op_dtype, q)
-
-    sz = 11
-    n = 2 * sz
-    dt1 = dpt.dtype(op_dtype)
-    dt2 = dpt.dtype(op_dtype)
-
-    x1_range_begin = -sz if dpt.iinfo(dt1).min < 0 else 0
-    x1 = dpt.arange(x1_range_begin, x1_range_begin + n, dtype=dt1)[::2]
-
-    x2_range_begin = -(sz // 2) if dpt.iinfo(dt2).min < 0 else 0
-    x2 = dpt.arange(x2_range_begin, x2_range_begin + n, dtype=dt1)[::-2]
-
-    r = dpt.bitwise_and(x1, x2)
-    assert isinstance(r, dpt.usm_ndarray)
-
-    x1_np = np.arange(x1_range_begin, x1_range_begin + n, dtype=op_dtype)[::2]
-    x2_np = np.arange(x2_range_begin, x2_range_begin + n, dtype=op_dtype)[::-2]
-    r_np = np.bitwise_and(x1_np, x2_np)
-
-    assert (r_np == dpt.asnumpy(r)).all()
-
-
 def test_bitwise_and_bool():
     get_queue_or_skip()
 
@@ -88,18 +62,6 @@ def test_bitwise_and_bool():
     assert dpt.all(dpt.equal(r_bw, r_lo))
 
 
-@pytest.mark.parametrize("dtype", ["?"] + _integral_dtypes)
-def test_bitwise_and_inplace_python_scalar(dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(dtype, q)
-    X = dpt.zeros((10, 10), dtype=dtype, sycl_queue=q)
-    dt_kind = X.dtype.kind
-    if dt_kind == "b":
-        X &= False
-    else:
-        X &= int(0)
-
-
 @pytest.mark.parametrize("op1_dtype", ["?"] + _integral_dtypes)
 @pytest.mark.parametrize("op2_dtype", ["?"] + _integral_dtypes)
 def test_bitwise_and_inplace_dtype_matrix(op1_dtype, op2_dtype):

dpctl/tests/elementwise/test_bitwise_invert.py

@@ -20,7 +20,7 @@
 import dpctl.tensor as dpt
 from dpctl.tests.helper import get_queue_or_skip, skip_if_dtype_not_supported
 
-from .utils import _compare_dtypes, _integral_dtypes, _usm_types
+from .utils import _compare_dtypes, _integral_dtypes
 
 
 @pytest.mark.parametrize(
@@ -73,52 +73,6 @@ def test_bitwise_invert_dtype_matrix(op_dtype):
     assert dpt.all(dpt.equal(r, r3))
 
 
-@pytest.mark.parametrize("op_usm_type", _usm_types)
-def test_bitwise_invert_usm_type_matrix(op_usm_type):
-    get_queue_or_skip()
-
-    sz = 128
-    ar1 = dpt.asarray(
-        np.random.randint(0, 2, sz), dtype="i4", usm_type=op_usm_type
-    )
-
-    r = dpt.bitwise_invert(ar1)
-    assert isinstance(r, dpt.usm_ndarray)
-    assert r.usm_type == op_usm_type
-
-
-def test_bitwise_invert_order():
-    get_queue_or_skip()
-
-    ar1 = dpt.ones((20, 20), dtype="i4", order="C")
-    r1 = dpt.bitwise_invert(ar1, order="C")
-    assert r1.flags.c_contiguous
-    r2 = dpt.bitwise_invert(ar1, order="F")
-    assert r2.flags.f_contiguous
-    r3 = dpt.bitwise_invert(ar1, order="A")
-    assert r3.flags.c_contiguous
-    r4 = dpt.bitwise_invert(ar1, order="K")
-    assert r4.flags.c_contiguous
-
-    ar1 = dpt.zeros((20, 20), dtype="i4", order="F")
-    r1 = dpt.bitwise_invert(ar1, order="C")
-    assert r1.flags.c_contiguous
-    r2 = dpt.bitwise_invert(ar1, order="F")
-    assert r2.flags.f_contiguous
-    r3 = dpt.bitwise_invert(ar1, order="A")
-    assert r3.flags.f_contiguous
-    r4 = dpt.bitwise_invert(ar1, order="K")
-    assert r4.flags.f_contiguous
-
-    ar1 = dpt.ones((40, 40), dtype="i4", order="C")[:20, ::-2]
-    r4 = dpt.bitwise_invert(ar1, order="K")
-    assert r4.strides == (20, -1)
-
-    ar1 = dpt.zeros((40, 40), dtype="i4", order="C")[:20, ::-2].mT
-    r4 = dpt.bitwise_invert(ar1, order="K")
-    assert r4.strides == (-1, 20)
-
-
 def test_bitwise_invert_large_boolean():
     get_queue_or_skip()
 

dpctl/tests/elementwise/test_bitwise_left_shift.py

@@ -26,7 +26,7 @@
 
 @pytest.mark.parametrize("op1_dtype", _integral_dtypes)
 @pytest.mark.parametrize("op2_dtype", _integral_dtypes)
-def test_bitwise_left_shift_dtype_matrix_contig(op1_dtype, op2_dtype):
+def test_bitwise_left_shift_dtype_matrix(op1_dtype, op2_dtype):
     q = get_queue_or_skip()
     skip_if_dtype_not_supported(op1_dtype, q)
     skip_if_dtype_not_supported(op2_dtype, q)
@@ -56,38 +56,6 @@ def test_bitwise_left_shift_dtype_matrix_contig(op1_dtype, op2_dtype):
     assert (dpt.asnumpy(r) == r_np).all()
 
 
-@pytest.mark.parametrize("op1_dtype", _integral_dtypes)
-@pytest.mark.parametrize("op2_dtype", _integral_dtypes)
-def test_bitwise_left_shift_dtype_matrix_strided(op1_dtype, op2_dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(op1_dtype, q)
-    skip_if_dtype_not_supported(op2_dtype, q)
-
-    if op1_dtype != op2_dtype and "u8" in [op1_dtype, op2_dtype]:
-        return
-
-    sz = 11
-    n = 2 * sz
-    dt1 = dpt.dtype(op1_dtype)
-    dt2 = dpt.dtype(op2_dtype)
-
-    x1_range_begin = -sz if dpt.iinfo(dt1).min < 0 else 0
-    x1 = dpt.arange(x1_range_begin, x1_range_begin + n, dtype=dt1)[::-2]
-    x2 = dpt.arange(0, n, dtype=dt2)[::2]
-
-    r = dpt.bitwise_left_shift(x1, x2)
-    assert isinstance(r, dpt.usm_ndarray)
-    assert r.sycl_queue == x1.sycl_queue
-    assert r.sycl_queue == x2.sycl_queue
-
-    x1_np = np.arange(x1_range_begin, x1_range_begin + n, dtype=dt1)[::-2]
-    x2_np = np.arange(0, n, dtype=dt2)[::2]
-    r_np = np.left_shift(x1_np, x2_np)
-
-    assert r.dtype == r_np.dtype
-    assert (dpt.asnumpy(r) == r_np).all()
-
-
 @pytest.mark.parametrize("op_dtype", _integral_dtypes)
 def test_bitwise_left_shift_range(op_dtype):
     q = get_queue_or_skip()
@@ -100,14 +68,6 @@ def test_bitwise_left_shift_range(op_dtype):
     assert dpt.all(dpt.equal(z, 0))
 
 
-@pytest.mark.parametrize("dtype", _integral_dtypes)
-def test_bitwise_left_shift_inplace_python_scalar(dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(dtype, q)
-    X = dpt.zeros((10, 10), dtype=dtype, sycl_queue=q)
-    X <<= int(0)
-
-
 @pytest.mark.parametrize("op1_dtype", _integral_dtypes)
 @pytest.mark.parametrize("op2_dtype", _integral_dtypes)
 def test_bitwise_left_shift_inplace_dtype_matrix(op1_dtype, op2_dtype):

dpctl/tests/elementwise/test_bitwise_or.py

@@ -25,7 +25,7 @@
 
 
 @pytest.mark.parametrize("op_dtype", _integral_dtypes)
-def test_bitwise_or_dtype_matrix_contig(op_dtype):
+def test_bitwise_or_dtype_matrix(op_dtype):
     q = get_queue_or_skip()
     skip_if_dtype_not_supported(op_dtype, q)
 
@@ -50,32 +50,6 @@ def test_bitwise_or_dtype_matrix_contig(op_dtype):
     assert (r_np == dpt.asnumpy(r)).all()
 
 
-@pytest.mark.parametrize("op_dtype", _integral_dtypes)
-def test_bitwise_or_dtype_matrix_strided(op_dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(op_dtype, q)
-
-    sz = 11
-    n = 2 * sz
-    dt1 = dpt.dtype(op_dtype)
-    dt2 = dpt.dtype(op_dtype)
-
-    x1_range_begin = -sz if dpt.iinfo(dt1).min < 0 else 0
-    x1 = dpt.arange(x1_range_begin, x1_range_begin + n, dtype=dt1)[::2]
-
-    x2_range_begin = -(sz // 2) if dpt.iinfo(dt2).min < 0 else 0
-    x2 = dpt.arange(x2_range_begin, x2_range_begin + n, dtype=dt1)[::-2]
-
-    r = dpt.bitwise_or(x1, x2)
-    assert isinstance(r, dpt.usm_ndarray)
-
-    x1_np = np.arange(x1_range_begin, x1_range_begin + n, dtype=op_dtype)[::2]
-    x2_np = np.arange(x2_range_begin, x2_range_begin + n, dtype=op_dtype)[::-2]
-    r_np = np.bitwise_or(x1_np, x2_np)
-
-    assert (r_np == dpt.asnumpy(r)).all()
-
-
 def test_bitwise_or_bool():
     get_queue_or_skip()
 
@@ -88,18 +62,6 @@ def test_bitwise_or_bool():
     assert dpt.all(dpt.equal(r_bw, r_lo))
 
 
-@pytest.mark.parametrize("dtype", ["?"] + _integral_dtypes)
-def test_bitwise_or_inplace_python_scalar(dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(dtype, q)
-    X = dpt.zeros((10, 10), dtype=dtype, sycl_queue=q)
-    dt_kind = X.dtype.kind
-    if dt_kind == "b":
-        X |= False
-    else:
-        X |= int(0)
-
-
 @pytest.mark.parametrize("op1_dtype", ["?"] + _integral_dtypes)
 @pytest.mark.parametrize("op2_dtype", ["?"] + _integral_dtypes)
 def test_bitwise_or_inplace_dtype_matrix(op1_dtype, op2_dtype):

dpctl/tests/elementwise/test_bitwise_right_shift.py

@@ -26,7 +26,7 @@
 
 @pytest.mark.parametrize("op1_dtype", _integral_dtypes)
 @pytest.mark.parametrize("op2_dtype", _integral_dtypes)
-def test_bitwise_right_shift_dtype_matrix_contig(op1_dtype, op2_dtype):
+def test_bitwise_right_shift_dtype_matrix(op1_dtype, op2_dtype):
     q = get_queue_or_skip()
     skip_if_dtype_not_supported(op1_dtype, q)
     skip_if_dtype_not_supported(op2_dtype, q)
@@ -56,58 +56,6 @@ def test_bitwise_right_shift_dtype_matrix_contig(op1_dtype, op2_dtype):
     assert (dpt.asnumpy(r) == r_np).all()
 
 
-@pytest.mark.parametrize("op1_dtype", _integral_dtypes)
-@pytest.mark.parametrize("op2_dtype", _integral_dtypes)
-def test_bitwise_right_shift_dtype_matrix_strided(op1_dtype, op2_dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(op1_dtype, q)
-    skip_if_dtype_not_supported(op2_dtype, q)
-
-    if op1_dtype != op2_dtype and "u8" in [op1_dtype, op2_dtype]:
-        return
-
-    sz = 11
-    n = 2 * sz
-    dt1 = dpt.dtype(op1_dtype)
-    dt2 = dpt.dtype(op2_dtype)
-
-    x1_range_begin = -sz if dpt.iinfo(dt1).min < 0 else 0
-    x1 = dpt.arange(x1_range_begin, x1_range_begin + n, dtype=dt1)[::-2]
-    x2 = dpt.arange(0, n, dtype=dt2)[::2]
-
-    r = dpt.bitwise_right_shift(x1, x2)
-    assert isinstance(r, dpt.usm_ndarray)
-    assert r.sycl_queue == x1.sycl_queue
-    assert r.sycl_queue == x2.sycl_queue
-
-    x1_np = np.arange(x1_range_begin, x1_range_begin + n, dtype=dt1)[::-2]
-    x2_np = np.arange(0, n, dtype=dt2)[::2]
-    r_np = np.right_shift(x1_np, x2_np)
-
-    assert r.dtype == r_np.dtype
-    assert (dpt.asnumpy(r) == r_np).all()
-
-
-@pytest.mark.parametrize("op_dtype", _integral_dtypes)
-def test_bitwise_right_shift_range(op_dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(op_dtype, q)
-
-    x = dpt.ones(255, dtype=op_dtype)
-    y = dpt.asarray(64, dtype=op_dtype)
-
-    z = dpt.bitwise_right_shift(x, y)
-    assert dpt.all(dpt.equal(z, 0))
-
-
-@pytest.mark.parametrize("dtype", _integral_dtypes)
-def test_bitwise_right_shift_inplace_python_scalar(dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(dtype, q)
-    X = dpt.zeros((10, 10), dtype=dtype, sycl_queue=q)
-    X >>= int(0)
-
-
 @pytest.mark.parametrize("op1_dtype", _integral_dtypes)
 @pytest.mark.parametrize("op2_dtype", _integral_dtypes)
 def test_bitwise_right_shift_inplace_dtype_matrix(op1_dtype, op2_dtype):

dpctl/tests/elementwise/test_bitwise_xor.py

@@ -25,7 +25,7 @@
 
 
 @pytest.mark.parametrize("op_dtype", _integral_dtypes)
-def test_bitwise_xor_dtype_matrix_contig(op_dtype):
+def test_bitwise_xor_dtype_matrix(op_dtype):
     q = get_queue_or_skip()
     skip_if_dtype_not_supported(op_dtype, q)
 
@@ -50,32 +50,6 @@ def test_bitwise_xor_dtype_matrix_contig(op_dtype):
     assert (r_np == dpt.asnumpy(r)).all()
 
 
-@pytest.mark.parametrize("op_dtype", _integral_dtypes)
-def test_bitwise_xor_dtype_matrix_strided(op_dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(op_dtype, q)
-
-    sz = 11
-    n = 2 * sz
-    dt1 = dpt.dtype(op_dtype)
-    dt2 = dpt.dtype(op_dtype)
-
-    x1_range_begin = -sz if dpt.iinfo(dt1).min < 0 else 0
-    x1 = dpt.arange(x1_range_begin, x1_range_begin + n, dtype=dt1)[::2]
-
-    x2_range_begin = -(sz // 2) if dpt.iinfo(dt2).min < 0 else 0
-    x2 = dpt.arange(x2_range_begin, x2_range_begin + n, dtype=dt1)[::-2]
-
-    r = dpt.bitwise_xor(x1, x2)
-    assert isinstance(r, dpt.usm_ndarray)
-
-    x1_np = np.arange(x1_range_begin, x1_range_begin + n, dtype=op_dtype)[::2]
-    x2_np = np.arange(x2_range_begin, x2_range_begin + n, dtype=op_dtype)[::-2]
-    r_np = np.bitwise_xor(x1_np, x2_np)
-
-    assert (r_np == dpt.asnumpy(r)).all()
-
-
 def test_bitwise_xor_bool():
     get_queue_or_skip()
 
@@ -88,18 +62,6 @@ def test_bitwise_xor_bool():
     assert dpt.all(dpt.equal(r_bw, r_lo))
 
 
-@pytest.mark.parametrize("dtype", ["?"] + _integral_dtypes)
-def test_bitwise_xor_inplace_python_scalar(dtype):
-    q = get_queue_or_skip()
-    skip_if_dtype_not_supported(dtype, q)
-    X = dpt.zeros((10, 10), dtype=dtype, sycl_queue=q)
-    dt_kind = X.dtype.kind
-    if dt_kind == "b":
-        X ^= False
-    else:
-        X ^= int(0)
-
-
 @pytest.mark.parametrize("op1_dtype", ["?"] + _integral_dtypes)
 @pytest.mark.parametrize("op2_dtype", ["?"] + _integral_dtypes)
 def test_bitwise_xor_inplace_dtype_matrix(op1_dtype, op2_dtype):