A current device is always present even outside a device context.

     -- default device is always available.

Author: Diptorup Deb

dpctl/sycl_core.pyx

@@ -573,10 +573,7 @@ cdef class _SyclRTManager:
     def get_current_device_type (self):
         ''' Returns current device type as `device_type` enum
         '''
-        if self.is_in_device_context():
-            return self.get_current_queue().get_sycl_device().get_device_type()
-        else:
-            return None
+        return self.get_current_queue().get_sycl_device().get_device_type()
 
     def get_current_queue (self):
         ''' Returns the activated SYCL queue as a PyCapsule.

dpctl/tests/test_sycl_queue_manager.py

@@ -81,33 +81,38 @@ def test_is_in_device_context_inside_nested_device_ctxt (self):
 class TestIsInDeviceContext (unittest.TestCase):
 
     def test_get_current_device_type_outside_device_ctxt (self):
-        self.assertEqual(dpctl.get_current_device_type(), None)
+        self.assertNotEqual(dpctl.get_current_device_type(), None)
 
     def test_get_current_device_type_inside_device_ctxt (self):
-        self.assertEqual(dpctl.get_current_device_type(), None)
+        self.assertNotEqual(dpctl.get_current_device_type(), None)
 
         with dpctl.device_context("opencl:gpu:0"):
             self.assertEqual(
                 dpctl.get_current_device_type(), dpctl.device_type.gpu
             )
 
-        self.assertEqual(dpctl.get_current_device_type(), None)
+        self.assertNotEqual(dpctl.get_current_device_type(), None)
 
     @unittest.skipUnless(
         dpctl.has_cpu_queues(), "No OpenCL CPU queues available"
     )
     def test_get_current_device_type_inside_nested_device_ctxt (self):
-        self.assertEqual(dpctl.get_current_device_type(), None)
+        self.assertNotEqual(dpctl.get_current_device_type(), None)
 
         with dpctl.device_context("opencl:cpu:0"):
-            self.assertEqual(dpctl.get_current_device_type(), dpctl.device_type.cpu)
+            self.assertEqual(
+                dpctl.get_current_device_type(), dpctl.device_type.cpu
+            )
 
             with dpctl.device_context("opencl:gpu:0"):
-                self.assertEqual(dpctl.get_current_device_type(), dpctl.
-                                 device_type.gpu)
-            self.assertEqual(dpctl.get_current_device_type(), dpctl.device_type.cpu)
+                self.assertEqual(
+                    dpctl.get_current_device_type(), dpctl.device_type.gpu
+                )
+            self.assertEqual(
+                dpctl.get_current_device_type(), dpctl.device_type.cpu
+            )
 
-        self.assertEqual(dpctl.get_current_device_type(), None)
+        self.assertNotEqual(dpctl.get_current_device_type(), None)
 
 
 @unittest.skipIf(not dpctl.has_sycl_platforms(), "No SYCL platforms available")