Merge pull request #701 from howetuft/llvm-openmp

Llvm openmp: rely on conan llvm-openmp rather than Github runner openmp, in order to decrease MACOS_DEPLOYMENT_VERSION to 14.2 for arm (Github omp is 15.0+)

Author: howetuft

.github/workflows/wheel-builder.yml

@@ -182,11 +182,11 @@ jobs:
           # Arm: opensubdiv
           script: |
             if ('${{ runner.arch }}' == 'X64') {
-              target = '14.0';  // Required by libomp
+              target = '11.0';  // Required by libomp
               arch='x86_64';
             }
             else {
-              target = '15.0';  // Required by libomp
+              target = '14.2';  // Required by opensubdiv
               arch='armv8';
             }
             core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
@@ -223,11 +223,6 @@ jobs:
             echo "LDFLAGS=${LD_FLAGS} -fuse-ld=${LLD_PREFIX}/bin/ld64.lld -L${LLVM_PREFIX}/lib -L${LLD_PREFIX}/lib" >> $GITHUB_ENV
             echo "CPPFLAGS=${CPPFLAGS} -I${LLVM_PREFIX}/include -I${LLD_PREFIX}/include" >> $GITHUB_ENV
 
-            # OpenMP
-            brew install libomp
-            brew link libomp --overwrite
-            echo "OpenMP_ROOT=$(brew --prefix libomp)" >> $GITHUB_ENV
-
 
       # TODO: The following block is an ugly hack but, at the moment (2025-02-25),
       # scikit-build-core lacks a preset parameter, so this is the only way
@@ -370,18 +365,7 @@ jobs:
             delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
           CIBW_TEST_COMMAND_LINUX: pyluxcoretest
           CIBW_TEST_COMMAND_WINDOWS: pyluxcoretest
-          CIBW_TEST_COMMAND_MACOS: |
-            if [[ ${{ matrix.os }} == 'macos-15-intel' ]]; then
-              # Full test for Intel
-              echo "Testing x86_64"
-              pyluxcoretest
-            elif [[ ${{ matrix.os }} == 'macos-15' ]]; then
-              # Light test, as ARM runner raises an OpenCL driver issue otherwise
-              echo "Testing arm"
-              python -c "import pyluxcore"
-            else
-              echo "UNHANDLED OS"
-            fi
+          CIBW_TEST_COMMAND_MACOS: pyluxcoretest
           CIBW_CONTAINER_ENGINE: >
             docker;
             create_args:

CMakeLists.txt

@@ -133,11 +133,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 #endif("${isSystemDir}" STREQUAL "-1")
 MESSAGE(STATUS "Install RPATH: ${CMAKE_INSTALL_RPATH}")
 if(LINUX)
-  add_link_options("LINKER:--disable-new-dtags")
-endif()
-
-if(LINUX OR APPLE)
-  add_link_options("LINKER:-Bsymbolic")
+  add_link_options("LINKER:--disable-new-dtags" "LINKER:-Bsymbolic")
 endif()
 
 if (LUXRAYS_DISABLE_OPENCL)

python/pyluxcoretest/pyluxcoretest.py

@@ -161,8 +161,13 @@ def PropertiesTests():
 
 def LuxRaysDeviceTests():
     print("LuxRays device information example......", flush=True)
-    deviceList = pyluxcore.GetOpenCLDeviceList()
+    try:
+        deviceList = pyluxcore.GetOpenCLDeviceList()
+    except RuntimeError as err:
+        print(str(err))
+        return None
     print("OpenCL device list: %s\n" % str(deviceList), flush=True)
+    return deviceList
 
 
 ################################################################################
@@ -866,7 +871,9 @@ def main():
         # os.chdir(os.path.dirname(__file__))
 
         PropertiesTests()
-        LuxRaysDeviceTests()
+        devices = LuxRaysDeviceTests()
+        if devices is None:
+            return
         SimpleRender()
         GetOutputTest()
         ExtractConfiguration()

src/pyluxcore/CMakeLists.txt

@@ -41,7 +41,7 @@ target_link_libraries(pyluxcore PRIVATE
 )
 
 if(APPLE)
-  target_link_libraries(pyluxcore PRIVATE llvm-openmp::llvm-openmp)
+  target_link_libraries(pyluxcore PRIVATE OpenMP::OpenMP)
 else()
   target_link_libraries(pyluxcore PRIVATE OpenMP::OpenMP_CXX)
 endif(APPLE)

src/slg/CMakeLists.txt

@@ -71,7 +71,7 @@ add_library(bcd STATIC ${BCD_SRCS})
 target_link_libraries(bcd PRIVATE boost::boost Eigen3::Eigen)
 
 if(APPLE)
-  target_link_libraries(bcd PRIVATE llvm-openmp::llvm-openmp)
+  target_link_libraries(bcd PRIVATE OpenMP::OpenMP)
 else()
   target_link_libraries(bcd PRIVATE OpenMP::OpenMP_CXX)
 endif(APPLE)
@@ -512,7 +512,7 @@ target_link_libraries(slg-core PRIVATE
 )
 
 if(APPLE)
-  target_link_libraries(slg-core PRIVATE llvm-openmp::llvm-openmp)
+  target_link_libraries(slg-core PRIVATE OpenMP::OpenMP)
 else()
   target_link_libraries(slg-core PRIVATE OpenMP::OpenMP_CXX)
 endif(APPLE)