use sycl_device instead of sycldevice in dldevice conversion functions

Author: ndgrigorian

dpctl/tensor/__init__.py

@@ -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 (
@@ -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",
 ]

dpctl/tensor/_dldevice_conversions.py

@@ -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")
@@ -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)}"

dpctl/tests/test_usm_ndarray_dlpack.py

@@ -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)