Fix using dppl.has_sycl_platforms() and dppl.has_gpu_queues() functions in skipIf() (#56)

* Fix using dppl.has_sycl_platforms() and dppl.has_gpu_queues() functions in skipIf()

* Add skipIf for cases when CPU platforn is not available

Author: PokhodenkoSA

dppl/tests/dppl_tests/test_sycl_queue_manager.py

@@ -27,12 +27,12 @@
 import unittest
 
 class TestGetNumPlatforms (unittest.TestCase):
-    @unittest.skipIf(not dppl.has_sycl_platforms, "No SYCL platforms available")
+    @unittest.skipIf(not dppl.has_sycl_platforms(), "No SYCL platforms available")
     def test_dppl_get_num_platforms (self):
         if(dppl.has_sycl_platforms):
             self.assertGreaterEqual(dppl.get_num_platforms(), 1)
 
-@unittest.skipIf(not dppl.has_sycl_platforms, "No SYCL platforms available")
+@unittest.skipIf(not dppl.has_sycl_platforms(), "No SYCL platforms available")
 class TestDumpMethods (unittest.TestCase):
     def test_dppl_dump (self):
         try:
@@ -47,7 +47,7 @@ def test_dppl_dump_device_info (self):
         except Exception:
             self.fail("Encountered an exception inside dump_device_info().")
 
-@unittest.skipIf(not dppl.has_sycl_platforms, "No SYCL platforms available")
+@unittest.skipIf(not dppl.has_sycl_platforms(), "No SYCL platforms available")
 class TestDPPLIsInDPPLCtxt (unittest.TestCase):
 
     def test_is_in_dppl_ctxt_outside_device_ctxt (self):
@@ -57,28 +57,31 @@ def test_is_in_dppl_ctxt_inside_device_ctxt (self):
         with dppl.device_context(dppl.device_type.gpu):
             self.assertTrue(dppl.is_in_dppl_ctxt())
 
+    @unittest.skipIf(not dppl.has_cpu_queues(), "No CPU platforms available")
     def test_is_in_dppl_ctxt_inside_nested_device_ctxt (self):
         with dppl.device_context(dppl.device_type.cpu):
             with dppl.device_context(dppl.device_type.gpu):
                 self.assertTrue(dppl.is_in_dppl_ctxt())
             self.assertTrue(dppl.is_in_dppl_ctxt())
         self.assertFalse(dppl.is_in_dppl_ctxt())
 
-@unittest.skipIf(not dppl.has_sycl_platforms, "No SYCL platforms available")
+@unittest.skipIf(not dppl.has_sycl_platforms(), "No SYCL platforms available")
 class TestGetCurrentQueueInMultipleThreads (unittest.TestCase):
 
     def test_num_current_queues_outside_with_clause (self):
         self.assertEqual(dppl.get_num_activated_queues(), 0)
 
-    @unittest.skipIf(not dppl.has_gpu_queues, "No GPU platforms available")
+    @unittest.skipIf(not dppl.has_gpu_queues(), "No GPU platforms available")
+    @unittest.skipIf(not dppl.has_cpu_queues(), "No CPU platforms available")
     def test_num_current_queues_inside_with_clause (self):
         with dppl.device_context(dppl.device_type.cpu):
             self.assertEqual(dppl.get_num_activated_queues(), 1)
             with dppl.device_context(dppl.device_type.gpu):
                 self.assertEqual(dppl.get_num_activated_queues(), 2)
         self.assertEqual(dppl.get_num_activated_queues(), 0)
 
-    @unittest.skipIf(not dppl.has_gpu_queues, "No GPU platforms available")
+    @unittest.skipIf(not dppl.has_gpu_queues(), "No GPU platforms available")
+    @unittest.skipIf(not dppl.has_cpu_queues(), "No CPU platforms available")
     def test_num_current_queues_inside_threads (self):
         from threading import Thread, local
         def SessionThread (self):

dppl/tests/dppl_tests/test_sycl_usm.py

@@ -43,6 +43,7 @@ def test_memory_without_context (self):
         # Without context
         self.assertEqual(mobj._usm_type(), 'shared')
 
+    @unittest.skipIf(not dppl.has_cpu_queues(), "No CPU platforms available")
     def test_memory_cpu_context (self):
         mobj = self._create_memory()
 
@@ -60,6 +61,7 @@ def test_memory_cpu_context (self):
             # not in the same SYCL context
             self.assertTrue(usm_type in ['unknown', 'shared'])
 
+    @unittest.skipIf(not dppl.has_gpu_queues(), "No GPU platforms available")
     def test_memory_gpu_context (self):
         mobj = self._create_memory()