Skip to content

Remove temporary solution accepting CFD with equal SYCL context instead of queue #1303

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
Feb 17, 2023
Merged

Remove temporary solution accepting CFD with equal SYCL context instead of queue #1303

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
e87b223
Remove temporary solution accepting CFD with equal SYCL context inste…
antonwolfy Feb 16, 2023
a88c6be
Merge branch 'master' into cfd_issue
antonwolfy Feb 17, 2023
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
3 changes: 0 additions & 3 deletions dpnp/dpnp_utils/dpnp_algo_utils.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,9 +651,6 @@ cdef tuple get_common_usm_allocation(dpnp_descriptor x1, dpnp_descriptor x2):
"".format(array1_obj.usm_type, array2_obj.usm_type))

common_sycl_queue = dpu.get_execution_queue((array1_obj.sycl_queue, array2_obj.sycl_queue))
# TODO: refactor, remove when CFD is implemented in all array constructors
if common_sycl_queue is None and array1_obj.sycl_context == array2_obj.sycl_context:
common_sycl_queue = array1_obj.sycl_queue
if common_sycl_queue is None:
raise ValueError(
"could not recognize common SYCL queue for inputs in SYCL queues {} and {}"
Expand Down
16 changes: 15 additions & 1 deletion tests/test_sycl_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import numpy

from numpy.testing import (
assert_array_equal
assert_array_equal,
assert_raises
)


Expand Down Expand Up @@ -353,6 +354,19 @@ def test_broadcasting(func, data1, data2, device):
assert_sycl_queue_equal(result_queue, expected_queue)


@pytest.mark.parametrize("func", ["add", "copysign", "divide", "floor_divide", "fmod",
"maximum", "minimum", "multiply", "outer", "power",
"remainder", "subtract"])
@pytest.mark.parametrize("device",
valid_devices,
ids=[device.filter_string for device in valid_devices])
def test_2in_1out_diff_queue_but_equal_context(func, device):
x1 = dpnp.arange(10)
x2 = dpnp.arange(10, sycl_queue=dpctl.SyclQueue(device))[::-1]
with assert_raises(ValueError):
getattr(dpnp, func)(x1, x2)


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