Add dpctl.SyclPlatform tests for get_devices method

Also removes some remaining, sporadic references to the deprecated sycl::info::device_type::host

Author: ndgrigorian

dpctl/_sycl_device_factory.pyx

@@ -162,7 +162,7 @@ cpdef list get_devices(backend=backend_type.all, device_type=device_type_t.all):
         device_type (optional):
             A :class:`dpctl.device_type` enum value or a string that
             specifies a SYCL device type. Currently, accepted values are:
-            "gpu", "cpu", "accelerator", "host", or "all".
+            "gpu", "cpu", "accelerator", or "all".
             Default: ``dpctl.device_type.all``.
     Returns:
         list:
@@ -218,7 +218,7 @@ cpdef int get_num_devices(
         device_type (optional):
             A :class:`dpctl.device_type` enum value or a string that
             specifies a SYCL device type. Currently, accepted values are:
-            "gpu", "cpu", "accelerator", "host", or "all".
+            "gpu", "cpu", "accelerator", or "all".
             Default: ``dpctl.device_type.all``.
     Returns:
         int:

dpctl/_sycl_platform.pyx

@@ -385,7 +385,7 @@ cdef class SyclPlatform(_SyclPlatform):
             device_type (optional):
                 A :class:`dpctl.device_type` enum value or a string that
                 specifies a SYCL device type. Currently, accepted values are:
-                "gpu", "cpu", "accelerator", "host", or "all".
+                "gpu", "cpu", "accelerator", or "all".
                 Default: ``dpctl.device_type.all``.
 
         Returns:

dpctl/tests/test_sycl_device_factory.py

@@ -51,8 +51,6 @@ def string_to_device_type(dty_str):
         return dty.accelerator
     elif dty_str == "cpu":
         return dty.cpu
-    elif dty_str == "host":
-        return dty.host
     elif dty_str == "gpu":
         return dty.gpu
 
@@ -62,8 +60,6 @@ def string_to_backend_type(bty_str):
         return bty.cuda
     elif bty_str == "hip":
         return bty.hip
-    elif bty_str == "host":
-        return bty.host
     elif bty_str == "level_zero":
         return bty.level_zero
     elif bty_str == "opencl":

dpctl/tests/test_sycl_platform.py

@@ -22,6 +22,7 @@
 import pytest
 
 import dpctl
+from dpctl import device_type
 
 from .helper import has_sycl_platforms
 
@@ -212,3 +213,49 @@ def test_get_platforms():
             assert has_sycl_platforms()
     except Exception:
         pytest.fail("Encountered an exception inside get_platforms().")
+
+
+def test_platform_get_devices():
+    platforms = dpctl.get_platforms()
+    if platforms:
+        for p in platforms:
+            assert len(p.get_devices())
+    else:
+        pytest.skip("No platforms available")
+
+
+def _str_device_type_to_enum(dty):
+    if dty == "accelerator":
+        return device_type.accelerator
+    elif dty == "cpu":
+        return device_type.cpu
+    elif dty == "gpu":
+        return device_type.gpu
+
+
+def test_platform_get_devices_str_device_type():
+    platforms = dpctl.get_platforms()
+    dtys = ["accelerator", "all", "cpu", "gpu"]
+    if platforms:
+        for p in platforms:
+            for dty in dtys:
+                devices = p.get_devices(device_type=dty)
+                if len(devices):
+                    dty_enum = _str_device_type_to_enum(dty)
+                    assert (d.device_type == dty_enum for d in devices)
+
+
+def test_platform_get_devices_enum_device_type():
+    platforms = dpctl.get_platforms()
+    dtys = [
+        device_type.accelerator,
+        device_type.all,
+        device_type.cpu,
+        device_type.gpu,
+    ]
+    if platforms:
+        for p in platforms:
+            for dty in dtys:
+                devices = p.get_devices(device_type=dty)
+                if len(devices):
+                    assert (d.device_type == dty for d in devices)

libsyclinterface/helper/source/dpctl_utils_helper.cpp

@@ -73,9 +73,6 @@ info::device_type DPCTL_StrToDeviceType(const std::string &devTyStr)
     else if (devTyStr == "custom") {
         devTy = info::device_type::custom;
     }
-    else if (devTyStr == "host") {
-        devTy = info::device_type::host;
-    }
     else {
         // \todo handle the error
         throw std::runtime_error("Unknown device type.");

libsyclinterface/tests/test_sycl_device_selector_interface.cpp

@@ -220,8 +220,7 @@ INSTANTIATE_TEST_SUITE_P(FilterSelectorCreation,
                                            "gpu:0",
                                            "gpu:1",
                                            "1",
-                                           "0",
-                                           "host"));
+                                           "0"));
 
 INSTANTIATE_TEST_SUITE_P(NegativeFilterSelectorCreation,
                          TestUnsupportedFilters,