Skip to content

implement dpnp.bitwise_count #2308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unnecessary ids
  • Loading branch information
vtavana committed Feb 12, 2025
commit b5fc64a88945520a306aa6c755f05cb07c00ee8b
25 changes: 6 additions & 19 deletions dpnp/tests/test_sycl_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,9 +580,7 @@ def test_1in_1out(func, data, device):
assert_sycl_queue_equal(result_queue, expected_queue)


@pytest.mark.parametrize(
"op", ["bitwise_count", "bitwise_not"], ids=["bitwise_count", "bitwise_not"]
)
@pytest.mark.parametrize("op", ["bitwise_count", "bitwise_not"])
@pytest.mark.parametrize(
"device",
valid_devices,
Expand All @@ -598,13 +596,6 @@ def test_bitwise_op_1in(op, device):
@pytest.mark.parametrize(
"op",
["bitwise_and", "bitwise_or", "bitwise_xor", "left_shift", "right_shift"],
ids=[
"bitwise_and",
"bitwise_or",
"bitwise_xor",
"left_shift",
"right_shift",
],
)
@pytest.mark.parametrize(
"device",
Expand Down Expand Up @@ -1909,11 +1900,7 @@ def test_norm(device, ord, axis):
"(1, 0, 3)",
],
)
@pytest.mark.parametrize(
"mode",
["r", "raw", "complete", "reduced"],
ids=["r", "raw", "complete", "reduced"],
)
@pytest.mark.parametrize("mode", ["r", "raw", "complete", "reduced"])
@pytest.mark.parametrize(
"device",
valid_devices,
Expand Down Expand Up @@ -1945,8 +1932,8 @@ def test_qr(shape, mode, device):
valid_devices,
ids=[device.filter_string for device in valid_devices],
)
@pytest.mark.parametrize("full_matrices", [True, False], ids=["True", "False"])
@pytest.mark.parametrize("compute_uv", [True, False], ids=["True", "False"])
@pytest.mark.parametrize("full_matrices", [True, False])
@pytest.mark.parametrize("compute_uv", [True, False])
@pytest.mark.parametrize(
"shape",
[
Expand Down Expand Up @@ -2454,7 +2441,7 @@ def test_take_along_axis(data, ind, axis, device):
valid_devices,
ids=[device.filter_string for device in valid_devices],
)
@pytest.mark.parametrize("sparse", [True, False], ids=["True", "False"])
@pytest.mark.parametrize("sparse", [True, False])
def test_indices(device, sparse):
sycl_queue = dpctl.SyclQueue(device)
grid = dpnp.indices((2, 3), sparse=sparse, sycl_queue=sycl_queue)
Expand Down Expand Up @@ -2946,7 +2933,7 @@ def test_unique(axis, device):
assert_sycl_queue_equal(iv_queue, ia.sycl_queue)


@pytest.mark.parametrize("copy", [True, False], ids=["True", "False"])
@pytest.mark.parametrize("copy", [True, False])
@pytest.mark.parametrize(
"device",
valid_devices,
Expand Down
31 changes: 7 additions & 24 deletions dpnp/tests/test_usm_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def test_linspace_arrays(usm_type_start, usm_type_stop):
)


@pytest.mark.parametrize("func", ["tril", "triu"], ids=["tril", "triu"])
@pytest.mark.parametrize("func", ["tril", "triu"])
@pytest.mark.parametrize("usm_type", list_of_usm_types, ids=list_of_usm_types)
def test_tril_triu(func, usm_type):
x0 = dp.ones((3, 3), usm_type=usm_type)
Expand Down Expand Up @@ -433,9 +433,7 @@ def test_logic_op_2in(op, usm_type_x, usm_type_y):
assert z.usm_type == du.get_coerced_usm_type([usm_type_x, usm_type_y])


@pytest.mark.parametrize(
"op", ["bitwise_count", "bitwise_not"], ids=["bitwise_count", "bitwise_not"]
)
@pytest.mark.parametrize("op", ["bitwise_count", "bitwise_not"])
@pytest.mark.parametrize("usm_type_x", list_of_usm_types, ids=list_of_usm_types)
def test_bitwise_op_1in(op, usm_type_x):
x = dp.arange(-10, 10, usm_type=usm_type_x)
Expand All @@ -447,13 +445,6 @@ def test_bitwise_op_1in(op, usm_type_x):
@pytest.mark.parametrize(
"op",
["bitwise_and", "bitwise_or", "bitwise_xor", "left_shift", "right_shift"],
ids=[
"bitwise_and",
"bitwise_or",
"bitwise_xor",
"left_shift",
"right_shift",
],
)
@pytest.mark.parametrize("usm_type_x", list_of_usm_types, ids=list_of_usm_types)
@pytest.mark.parametrize("usm_type_y", list_of_usm_types, ids=list_of_usm_types)
Expand Down Expand Up @@ -1153,7 +1144,7 @@ def test_grid(usm_type, func):


@pytest.mark.parametrize("usm_type", list_of_usm_types, ids=list_of_usm_types)
@pytest.mark.parametrize("sparse", [True, False], ids=["True", "False"])
@pytest.mark.parametrize("sparse", [True, False])
def test_indices_sparse(usm_type, sparse):
x = dp.indices((2, 3), sparse=sparse, usm_type=usm_type)
for i in x:
Expand Down Expand Up @@ -1469,12 +1460,8 @@ def test_inv(shape, is_empty, usm_type):


@pytest.mark.parametrize("usm_type", list_of_usm_types, ids=list_of_usm_types)
@pytest.mark.parametrize(
"full_matrices_param", [True, False], ids=["True", "False"]
)
@pytest.mark.parametrize(
"compute_uv_param", [True, False], ids=["True", "False"]
)
@pytest.mark.parametrize("full_matrices_param", [True, False])
@pytest.mark.parametrize("compute_uv_param", [True, False])
@pytest.mark.parametrize(
"shape",
[
Expand Down Expand Up @@ -1595,11 +1582,7 @@ def test_pinv(shape, hermitian, usm_type):
"(1, 0, 3)",
],
)
@pytest.mark.parametrize(
"mode",
["r", "raw", "complete", "reduced"],
ids=["r", "raw", "complete", "reduced"],
)
@pytest.mark.parametrize("mode", ["r", "raw", "complete", "reduced"])
def test_qr(shape, mode, usm_type):
count_elems = numpy.prod(shape)
a = dp.arange(count_elems, usm_type=usm_type).reshape(shape)
Expand Down Expand Up @@ -1782,7 +1765,7 @@ def test_unique(axis, usm_type):
assert x.usm_type == usm_type


@pytest.mark.parametrize("copy", [True, False], ids=["True", "False"])
@pytest.mark.parametrize("copy", [True, False])
@pytest.mark.parametrize("usm_type_a", list_of_usm_types, ids=list_of_usm_types)
def test_nan_to_num(copy, usm_type_a):
a = dp.array([-dp.nan, -1, 0, 1, dp.nan], usm_type=usm_type_a)
Expand Down