update ci

Author: JLBegin

.github/workflows/ci.yaml

@@ -7,7 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, windows-latest]
+        # macos-13 is the last runner with an OpenCL device
+        os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
         python-version: ["3.9", "3.12"]
 
     runs-on: ${{ matrix.os }}

pytissueoptics/rayscattering/opencl/config/CLConfig.py

@@ -7,6 +7,19 @@
 try:
     import pyopencl as cl
     OPENCL_AVAILABLE = True
+
+    available_platforms = cl.get_platforms()
+    print("Available OpenCL platforms:")
+    for platform in available_platforms:
+        print(f"... {platform.name}")
+    print("Available OpenCL devices:")
+    has_device = False
+    for platform in available_platforms:
+        devices = platform.get_devices()
+        for device in devices:
+            has_device = True
+            print(f"... {device.name} ({device.global_mem_size // 1024 ** 2} MB | {device.max_clock_frequency} MHz)")
+
 except ImportError:
     class DummyCL:
         def __getattr__(self, item):

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

@@ -6,7 +6,7 @@
 import numpy as np
 
 from pytissueoptics import Vector, ScatteringMaterial, ScatteringScene
-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.CLScene import NO_SURFACE_ID, NO_LOG_ID, NO_SOLID_ID, CLScene
@@ -37,7 +37,7 @@ class DataPointResult:
     surfaceID: int
 
 
-@unittest.skipIf(not OPENCL_AVAILABLE, 'Requires PyOpenCL.')
+@unittest.skipIf(not OPENCL_OK, 'Requires working OpenCL setup.')
 class TestCLPhoton(unittest.TestCase):
     def setUp(self):
         self.INITIAL_POSITION = Vector(2, 2, 0)
@@ -414,7 +414,6 @@ def _photonFunc(self, funcName: str, *args) -> PhotonResult:
                                 materialID=0, solidID=self.INITIAL_SOLID_ID, weight=self.INITIAL_WEIGHT)
         npArgs = [np.float32(arg) if isinstance(arg, (float, int)) else arg for arg in args]
         npArgs = [cl.cltypes.make_float3(*arg.array) if isinstance(arg, Vector) else arg for arg in npArgs]
-        print("npArgs:", npArgs)
         self.program.launchKernel(kernelName=funcName + "Kernel", N=1,
                                   arguments=npArgs + [photonBuffer, np.int32(0)])
         photonResult = self._getPhotonResult(photonBuffer)

tox.ini

@@ -8,4 +8,4 @@ setenv =
     PTO_N_WORK_UNITS = 128
     PTO_MAX_MEMORY_MB = 1024
 commands =
-    python -m unittest discover -v
+    python -m unittest pytissueoptics/rayscattering/tests/opencl/src/testCLPhoton.py -v