Skip to content

Update dpnp.extract to avoid violation of compute-follows-data #2172

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.

Sign up for GitHub

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 2 commits into from
Nov 14, 2024
Merged

Update dpnp.extract to avoid violation of compute-follows-data #2172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ea0418
fix CFD issue for dpnp.extract
vtavana Nov 14, 2024
02b2c50
Merge branch 'master' into fix-CFD-for-extract
antonwolfy Nov 14, 2024
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
10 changes: 4 additions & 6 deletions dpnp/dpnp_iface_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@
dpnp_putmask,
)
from .dpnp_array import dpnp_array
from .dpnp_utils import (
call_origin,
get_usm_allocations,
)
from .dpnp_utils import call_origin, get_usm_allocations

__all__ = [
"choose",
Expand Down Expand Up @@ -535,11 +532,12 @@ def extract(condition, a):
"""

usm_a = dpnp.get_usm_ndarray(a)
usm_type, exec_q = get_usm_allocations([usm_a, condition])
usm_cond = dpnp.as_usm_ndarray(
condition,
dtype=dpnp.bool,
usm_type=usm_a.usm_type,
sycl_queue=usm_a.sycl_queue,
usm_type=usm_type,
sycl_queue=exec_q,
)

if usm_cond.size != usm_a.size:
Expand Down
14 changes: 14 additions & 0 deletions tests/test_sycl_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,20 @@ def test_copy_operation(device):
assert_sycl_queue_equal(y.sycl_queue, x.sycl_queue)


@pytest.mark.parametrize(
"device",
valid_devices,
ids=[device.filter_string for device in valid_devices],
)
def test_extract(device):
x = dpnp.arange(3, device=device)
y = dpnp.array([True, False, True], device=device)
result = dpnp.extract(x, y)

assert_sycl_queue_equal(result.sycl_queue, x.sycl_queue)
assert_sycl_queue_equal(result.sycl_queue, y.sycl_queue)


@pytest.mark.parametrize(
"device",
valid_devices,
Expand Down
12 changes: 12 additions & 0 deletions tests/test_usm_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,18 @@ def test_concat_stack(func, data1, data2, usm_type_x, usm_type_y):
assert z.usm_type == du.get_coerced_usm_type([usm_type_x, usm_type_y])


@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)
def test_extract(usm_type_x, usm_type_y):
x = dp.arange(3, usm_type=usm_type_x)
y = dp.array([True, False, True], usm_type=usm_type_y)
z = dp.extract(y, x)

assert x.usm_type == usm_type_x
assert y.usm_type == usm_type_y
assert z.usm_type == du.get_coerced_usm_type([usm_type_x, usm_type_y])


@pytest.mark.parametrize(
"func,data1",
[
Expand Down
Loading