Fix macOS AdaptiveCpp OpenMP detection

Author: allnes

scripts/ci/sycl_adaptivecpp_setup.py

@@ -7,24 +7,27 @@
 from common import append_path, capture, prepend_env_path, require_env, run, write_env
 
 
-def set_common_env(prefix: str, clang_path: str, clangxx_path: str) -> None:
+def set_common_env(prefixes: list[str], clang_path: str, clangxx_path: str) -> None:
+    prefix_path = ";".join(prefixes)
     write_env("ITLABAI_CC", clang_path)
     write_env("ITLABAI_CXX", clangxx_path)
-    write_env("ITLABAI_CMAKE_PREFIX_PATH", prefix)
+    write_env("ITLABAI_CMAKE_PREFIX_PATH", prefix_path)
     write_env("ITLABAI_SYCL_IMPLEMENTATION", "AdaptiveCpp")
     write_env("ITLABAI_ENABLE_OPENCV_APPS", "ON")
     write_env("ACPP_TARGETS", "omp.library-only")
-    append_path(f"{prefix}/bin")
+    append_path(f"{prefixes[0]}/bin")
 
 
 def setup_macos() -> None:
-    run(["brew", "install", "adaptivecpp"])
+    run(["brew", "install", "adaptivecpp", "libomp"])
 
     adaptivecpp_prefix = capture(["brew", "--prefix", "adaptivecpp"])
+    libomp_prefix = capture(["brew", "--prefix", "libomp"])
     clang_path = capture(["xcrun", "--find", "clang"])
     clangxx_path = capture(["xcrun", "--find", "clang++"])
 
-    set_common_env(adaptivecpp_prefix, clang_path, clangxx_path)
+    write_env("ITLABAI_OPENMP_ROOT", libomp_prefix)
+    set_common_env([adaptivecpp_prefix, libomp_prefix], clang_path, clangxx_path)
 
 
 def setup_linux() -> None:
@@ -88,7 +91,7 @@ def setup_linux() -> None:
     )
     run(["cmake", "--build", str(build_dir), "--target", "install", "--parallel"])
 
-    set_common_env(str(install_dir), "/usr/bin/clang-18", "/usr/bin/clang++-18")
+    set_common_env([str(install_dir)], "/usr/bin/clang-18", "/usr/bin/clang++-18")
     prepend_env_path("LD_LIBRARY_PATH", f"{install_dir}/lib")
     prepend_env_path("LD_LIBRARY_PATH", "/usr/lib/llvm-18/lib")
 

scripts/ci/sycl_configure.py

@@ -40,6 +40,10 @@ def main() -> None:
     if openmp_include_dir:
         cmake_args.append(f"-DITLABAI_OPENMP_INCLUDE_DIR={openmp_include_dir}")
 
+    openmp_root = os.environ.get("ITLABAI_OPENMP_ROOT", "")
+    if openmp_root:
+        cmake_args.append(f"-DOpenMP_ROOT={openmp_root}")
+
     acpp_targets = os.environ.get("ACPP_TARGETS", "")
     if acpp_targets:
         cmake_args.append(f"-DACPP_TARGETS={acpp_targets}")