Use full TBB runtime dir for Windows OpenCL

Author: allnes

scripts/ci/sycl_test.py

@@ -10,6 +10,23 @@
 from common import find_file
 
 
+def find_windows_tbb_runtime_dir() -> Path | None:
+    build_root = Path("build").resolve()
+    fallback: Path | None = None
+    for current_root, _, files in os.walk(build_root):
+        current_files = set(files)
+        if "tbb12.dll" not in current_files:
+            continue
+
+        candidate = Path(current_root)
+        if "tbbmalloc.dll" in current_files or "tbbmalloc_proxy.dll" in current_files:
+            return candidate
+        if fallback is None:
+            fallback = candidate
+
+    return fallback
+
+
 def configure_windows_opencl_tbb() -> None:
     if os.environ.get("RUNNER_OS") != "Windows":
         return
@@ -22,11 +39,11 @@ def configure_windows_opencl_tbb() -> None:
     if not config_path.exists():
         return
 
-    tbb_dll = find_file([Path("build").resolve()], "tbb12.dll")
-    if tbb_dll is None:
+    tbb_runtime_dir = find_windows_tbb_runtime_dir()
+    if tbb_runtime_dir is None:
         return
 
-    tbb_dir = str(tbb_dll.parent.resolve())
+    tbb_dir = str(tbb_runtime_dir.resolve())
     existing_lines = config_path.read_text(encoding="utf-8").splitlines()
     updated_lines: list[str] = []
     updated = False
@@ -48,6 +65,11 @@ def main() -> int:
     configure_windows_opencl_tbb()
 
     env = os.environ.copy()
+    if os.environ.get("RUNNER_OS") == "Windows":
+        tbb_runtime_dir = find_windows_tbb_runtime_dir()
+        if tbb_runtime_dir is not None:
+            env["PATH"] = f"{tbb_runtime_dir}{os.pathsep}{env.get('PATH', '')}"
+
     device_selector = env.get("DEVICE_SELECTOR", "")
     if device_selector:
         env["ONEAPI_DEVICE_SELECTOR"] = device_selector