Skip to content

Commit ae6873d

Browse files
author
Diptorup Deb
committed
A current device is always present even outside a device context.
-- default device is alayws available.
1 parent 99f9080 commit ae6873d

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

dpctl/sycl_core.pyx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,10 +573,7 @@ cdef class _SyclRTManager:
573573
def get_current_device_type (self):
574574
''' Returns current device type as `device_type` enum
575575
'''
576-
if self.is_in_device_context():
577-
return self.get_current_queue().get_sycl_device().get_device_type()
578-
else:
579-
return None
576+
return self.get_current_queue().get_sycl_device().get_device_type()
580577

581578
def get_current_queue (self):
582579
''' Returns the activated SYCL queue as a PyCapsule.

dpctl/tests/test_sycl_queue_manager.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,33 +81,38 @@ def test_is_in_device_context_inside_nested_device_ctxt (self):
8181
class TestIsInDeviceContext (unittest.TestCase):
8282

8383
def test_get_current_device_type_outside_device_ctxt (self):
84-
self.assertEqual(dpctl.get_current_device_type(), None)
84+
self.assertNotEqual(dpctl.get_current_device_type(), None)
8585

8686
def test_get_current_device_type_inside_device_ctxt (self):
87-
self.assertEqual(dpctl.get_current_device_type(), None)
87+
self.assertNotEqual(dpctl.get_current_device_type(), None)
8888

8989
with dpctl.device_context("opencl:gpu:0"):
9090
self.assertEqual(
9191
dpctl.get_current_device_type(), dpctl.device_type.gpu
9292
)
9393

94-
self.assertEqual(dpctl.get_current_device_type(), None)
94+
self.assertNotEqual(dpctl.get_current_device_type(), None)
9595

9696
@unittest.skipUnless(
9797
dpctl.has_cpu_queues(), "No OpenCL CPU queues available"
9898
)
9999
def test_get_current_device_type_inside_nested_device_ctxt (self):
100-
self.assertEqual(dpctl.get_current_device_type(), None)
100+
self.assertNotEqual(dpctl.get_current_device_type(), None)
101101

102102
with dpctl.device_context("opencl:cpu:0"):
103-
self.assertEqual(dpctl.get_current_device_type(), dpctl.device_type.cpu)
103+
self.assertEqual(
104+
dpctl.get_current_device_type(), dpctl.device_type.cpu
105+
)
104106

105107
with dpctl.device_context("opencl:gpu:0"):
106-
self.assertEqual(dpctl.get_current_device_type(), dpctl.
107-
device_type.gpu)
108-
self.assertEqual(dpctl.get_current_device_type(), dpctl.device_type.cpu)
108+
self.assertEqual(
109+
dpctl.get_current_device_type(), dpctl.device_type.gpu
110+
)
111+
self.assertEqual(
112+
dpctl.get_current_device_type(), dpctl.device_type.cpu
113+
)
109114

110-
self.assertEqual(dpctl.get_current_device_type(), None)
115+
self.assertNotEqual(dpctl.get_current_device_type(), None)
111116

112117

113118
@unittest.skipIf(not dpctl.has_sycl_platforms(), "No SYCL platforms available")

0 commit comments

Comments
 (0)