Skip to content

Improve interoperability between SyclDevice and DLPack devices #1953

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
ndgrigorian merged 13 commits into from
Jan 15, 2025
Merged

Improve interoperability between SyclDevice and DLPack devices #1953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6781a82
Add get_device_id method to SyclDevice
ndgrigorian Jan 4, 2025
ea6e061
Adds conversion functions for dldevice and dpctl.SyclDevice
ndgrigorian Jan 4, 2025
d972d07
import SyclDevice directly in _dldevice_conversions
ndgrigorian Jan 7, 2025
2583383
Add tests for dldevice and sycldevice interchange functions
ndgrigorian Jan 9, 2025
7d35624
Add tests for dpctl.SyclDevice.get_device_id method
ndgrigorian Jan 9, 2025
f15778e
use sycl_device instead of sycldevice in dldevice conversion functions
ndgrigorian Jan 13, 2025
14c7dc5
Change errors throughout _sycl_device.pyx
ndgrigorian Jan 14, 2025
55944bc
Add docstring for dpctl.SyclDevice.get_device_id
ndgrigorian Jan 14, 2025
d3058ac
Fix incorrect SyclDevice docstring
ndgrigorian Jan 14, 2025
d5cbe3f
Fix missing line breaks in get_device_id method
ndgrigorian Jan 14, 2025
66d8025
Fix get_device_id example spacing
ndgrigorian Jan 14, 2025
cda903b
Adds get_unpartitioned_parent_device method to SyclDevice
ndgrigorian Jan 14, 2025
b1a5ecd
Use get_device_id to find DLpack device ID
ndgrigorian Jan 15, 2025
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
use sycl_device instead of sycldevice in dldevice conversion functions
  • Loading branch information
@ndgrigorian
ndgrigorian committed Jan 15, 2025
commit f15778e9ad37fe0b4c2e39dc552dd6cc7ce04ac1
8 changes: 4 additions & 4 deletions dpctl/tensor/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
)
from dpctl.tensor._device import Device
from dpctl.tensor._dldevice_conversions import (
dldevice_to_sycldevice,
sycldevice_to_dldevice,
dldevice_to_sycl_device,
sycl_device_to_dldevice,
)
from dpctl.tensor._dlpack import from_dlpack
from dpctl.tensor._indexing_functions import (
Expand Down Expand Up @@ -392,6 +392,6 @@
"take_along_axis",
"put_along_axis",
"top_k",
"dldevice_to_sycldevice",
"sycldevice_to_dldevice",
"dldevice_to_sycl_device",
"sycl_device_to_dldevice",
]
4 changes: 2 additions & 2 deletions dpctl/tensor/_dldevice_conversions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from ._usmarray import DLDeviceType


def dldevice_to_sycldevice(dl_dev: tuple):
def dldevice_to_sycl_device(dl_dev: tuple):
if isinstance(dl_dev, tuple):
if len(dl_dev) != 2:
raise ValueError("dldevice tuple must have length 2")
Expand All @@ -31,7 +31,7 @@ def dldevice_to_sycldevice(dl_dev: tuple):
return SyclDevice(str(dl_dev[1]))


def sycldevice_to_dldevice(dev: SyclDevice):
def sycl_device_to_dldevice(dev: SyclDevice):
if not isinstance(dev, SyclDevice):
raise TypeError(
"dev is expected to be a SyclDevice, got " f"{type(dev)}"
Expand Down
16 changes: 8 additions & 8 deletions dpctl/tests/test_usm_ndarray_dlpack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,36 +828,36 @@ def test_generic_container():
assert Z.device == X.device


def test_sycldevice_to_dldevice(all_root_devices):
def test_sycl_device_to_dldevice(all_root_devices):
for sycl_dev in all_root_devices:
dev = dpt.sycldevice_to_dldevice(sycl_dev)
dev = dpt.sycl_device_to_dldevice(sycl_dev)
assert type(dev) is tuple
assert len(dev) == 2
assert dev[0] == device_oneAPI
assert dev[1] == all_root_devices.index(sycl_dev)


def test_dldevice_to_sycldevice(all_root_devices):
def test_dldevice_to_sycl_device(all_root_devices):
for sycl_dev in all_root_devices:
dldev = dpt.empty(0, device=sycl_dev).__dlpack_device__()
dev = dpt.dldevice_to_sycldevice(dldev)
dev = dpt.dldevice_to_sycl_device(dldev)
assert type(dev) is dpctl.SyclDevice
assert dev == all_root_devices[dldev[1]]


def test_dldevice_conversion_arg_validation():
bad_dldevice_type = (dpt.DLDeviceType.kDLCPU, 0)
with pytest.raises(ValueError):
dpt.dldevice_to_sycldevice(bad_dldevice_type)
dpt.dldevice_to_sycl_device(bad_dldevice_type)

bad_dldevice_len = bad_dldevice_type + (0,)
with pytest.raises(ValueError):
dpt.dldevice_to_sycldevice(bad_dldevice_len)
dpt.dldevice_to_sycl_device(bad_dldevice_len)

bad_dldevice = dict()
with pytest.raises(TypeError):
dpt.dldevice_to_sycldevice(bad_dldevice)
dpt.dldevice_to_sycl_device(bad_dldevice)

bad_sycldevice = dict()
with pytest.raises(TypeError):
dpt.sycldevice_to_dldevice(bad_sycldevice)
dpt.sycl_device_to_dldevice(bad_sycldevice)