skip opencl tests when no device found

Author: JLBegin

pytissueoptics/rayscattering/opencl/__init__.py

@@ -7,6 +7,7 @@
     try:
         CONFIG = CLConfig()
     except Exception as e:
+        warnings.warn("Error creating OpenCL config: " + str(e))
         OPENCL_OK = False
         CONFIG = None
 else:

pytissueoptics/rayscattering/tests/opencl/src/testCLFresnel.py

@@ -6,7 +6,7 @@
 import numpy as np
 
 from pytissueoptics import Vector, ScatteringMaterial
-from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE
+from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE, OPENCL_OK
 from pytissueoptics.rayscattering.opencl.config.CLConfig import OPENCL_SOURCE_DIR
 from pytissueoptics.rayscattering.opencl.buffers import MaterialCL, SurfaceCL, SurfaceCLInfo, SeedCL
 from pytissueoptics.rayscattering.tests.opencl.src.CLObjects import IntersectionCL
@@ -29,7 +29,7 @@ class FresnelResult:
     nextSolidID: int
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLFresnel(unittest.TestCase):
     OUTSIDE_SOLID_ID = 0
     INSIDE_SOLID_ID = 1

pytissueoptics/rayscattering/tests/opencl/src/testCLIntersection.py

@@ -5,15 +5,15 @@
 import numpy as np
 
 from pytissueoptics import *
-from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE
+from pytissueoptics.rayscattering.opencl import OPENCL_OK
 from pytissueoptics.rayscattering.opencl.CLPhotons import CLScene
 from pytissueoptics.rayscattering.opencl.CLProgram import CLProgram
 from pytissueoptics.rayscattering.opencl.config.CLConfig import OPENCL_SOURCE_DIR
 from pytissueoptics.rayscattering.tests.opencl.src.CLObjects import RayCL
 from pytissueoptics.rayscattering.tests.opencl.src.testCLFresnel import IntersectionCL
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLIntersection(unittest.TestCase):
     def setUp(self):
         sourcePath = os.path.join(OPENCL_SOURCE_DIR, "intersection.c")

pytissueoptics/rayscattering/tests/opencl/src/testCLPhoton.py

@@ -37,7 +37,7 @@ class DataPointResult:
     surfaceID: int
 
 
-@unittest.skipIf(not OPENCL_OK, 'Requires working OpenCL setup.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLPhoton(unittest.TestCase):
     def setUp(self):
         self.INITIAL_POSITION = Vector(2, 2, 0)

pytissueoptics/rayscattering/tests/opencl/src/testCLRandom.py

@@ -1,16 +1,15 @@
 import os
-import traceback
 import unittest
 
 import numpy as np
 
-from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE
+from pytissueoptics.rayscattering.opencl import OPENCL_OK
 from pytissueoptics.rayscattering.opencl.config.CLConfig import OPENCL_SOURCE_DIR
 from pytissueoptics.rayscattering.opencl.buffers import SeedCL, EmptyBuffer
 from pytissueoptics.rayscattering.opencl.CLProgram import CLProgram
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLRandom(unittest.TestCase):
     def setUp(self):
         sourcePath = os.path.join(OPENCL_SOURCE_DIR, "random.c")

pytissueoptics/rayscattering/tests/opencl/src/testCLScatteringMaterial.py

@@ -4,13 +4,13 @@
 
 import numpy as np
 
-from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE
+from pytissueoptics.rayscattering.opencl import OPENCL_OK
 from pytissueoptics.rayscattering.opencl.config.CLConfig import OPENCL_SOURCE_DIR
 from pytissueoptics.rayscattering.opencl.buffers import BufferOf, EmptyBuffer, RandomBuffer
 from pytissueoptics.rayscattering.opencl.CLProgram import CLProgram
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLScatteringMaterial(unittest.TestCase):
     def setUp(self):
         sourcePath = os.path.join(OPENCL_SOURCE_DIR, "scatteringMaterial.c")

pytissueoptics/rayscattering/tests/opencl/src/testCLSmoothing.py

@@ -5,7 +5,7 @@
 import numpy as np
 
 from pytissueoptics import *
-from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE
+from pytissueoptics.rayscattering.opencl import OPENCL_OK
 from pytissueoptics.rayscattering.opencl.buffers import *
 from pytissueoptics.rayscattering.opencl.config.CLConfig import OPENCL_SOURCE_DIR
 from pytissueoptics.rayscattering.tests.opencl.src.CLObjects import IntersectionCL, RayCL
@@ -14,7 +14,7 @@
 from pytissueoptics.rayscattering.opencl.CLProgram import CLProgram
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLNormalSmoothing(unittest.TestCase):
     def setUp(self):
         sourcePath = os.path.join(OPENCL_SOURCE_DIR, "intersection.c")

pytissueoptics/rayscattering/tests/opencl/src/testCLVectorOperators.py

@@ -6,7 +6,7 @@
 from numpy.lib import recfunctions as rfn
 
 from pytissueoptics.scene.geometry import Vector
-from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE
+from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE, OPENCL_OK
 from pytissueoptics.rayscattering.opencl.config.CLConfig import OPENCL_SOURCE_DIR
 from pytissueoptics.rayscattering.opencl.CLProgram import CLProgram
 from pytissueoptics.rayscattering.opencl.buffers import BufferOf
@@ -17,7 +17,7 @@
     cl = None
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLVectorOperators(unittest.TestCase):
     def setUp(self):
         sourcePath = os.path.join(OPENCL_SOURCE_DIR, "vectorOperators.c")

pytissueoptics/rayscattering/tests/opencl/testCLKeyLog.py

@@ -5,12 +5,12 @@
 
 from pytissueoptics import Cube, ScatteringMaterial, Sphere, ScatteringScene, EnergyLogger
 from pytissueoptics.rayscattering.opencl.utils import CLKeyLog
-from pytissueoptics.rayscattering.opencl import OPENCL_AVAILABLE
+from pytissueoptics.rayscattering.opencl import OPENCL_OK
 from pytissueoptics.rayscattering.opencl.CLScene import CLScene, NO_LOG_ID, NO_SOLID_ID, NO_SURFACE_ID, NO_SOLID_LABEL
 from pytissueoptics.scene.logger import InteractionKey
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'OpenCL device not available.')
 class TestCLKeyLog(unittest.TestCase):
     def setUp(self):
         material1 = ScatteringMaterial(2, 0.8, 0.8, 1.4)