Align x86 SYCL CI targets and OpenMP headers

Author: allnes

scripts/ci/sycl_x86_setup.py

@@ -55,7 +55,7 @@ def configure_platform(platform: str) -> None:
             "toolchain_asset": "sycl_windows.tar.gz",
             "device_selector": "opencl:cpu",
             "opencv_apps": "ON",
-            "sycl_targets": "spir64",
+            "sycl_targets": "spir64_x86_64",
         },
     }.get(platform)
 
@@ -214,17 +214,17 @@ def setup_windows_compilers(sycl_root: Path) -> None:
     cc_path = find_first_existing(
         [
             sycl_root / "bin" / "icx.exe",
-            sycl_root / "bin" / "clang.exe",
             sycl_root / "bin" / "icx-cl.exe",
             sycl_root / "bin" / "clang-cl.exe",
+            sycl_root / "bin" / "clang.exe",
         ]
     )
     cxx_path = find_first_existing(
         [
             sycl_root / "bin" / "icpx.exe",
-            sycl_root / "bin" / "clang++.exe",
             sycl_root / "bin" / "icx-cl.exe",
             sycl_root / "bin" / "clang-cl.exe",
+            sycl_root / "bin" / "clang++.exe",
         ]
     )
 
@@ -275,6 +275,7 @@ def setup_unix_compilers(sycl_root: Path) -> None:
     append_path(str(sycl_root / "bin"))
 
     if require_env("RUNNER_OS") == "Linux":
+        export_openmp_include_dir = True
         openmp_library = find_file([sycl_root, Path("/opt/intel/oneapi")], "libiomp5.so")
         openmp_library_name = "iomp5"
         openmp_flags = "-fopenmp=libiomp5"
@@ -291,6 +292,7 @@ def setup_unix_compilers(sycl_root: Path) -> None:
                 openmp_library = gcc_openmp_library
                 openmp_library_name = "gomp"
                 openmp_flags = "-fopenmp=libgomp"
+                export_openmp_include_dir = False
         if openmp_library is None and not source_built_linux_toolchain:
             main_error("Unable to locate an Intel toolchain OpenMP runtime library")
 
@@ -306,16 +308,18 @@ def setup_unix_compilers(sycl_root: Path) -> None:
         if openmp_header is None and source_built_linux_toolchain:
             gcc_root = Path(require_env("ITLABAI_GCC_INSTALL_DIR"))
             openmp_header = find_file([gcc_root / "include"], "omp.h")
+            export_openmp_include_dir = False
         if openmp_header is None and not source_built_linux_toolchain:
             main_error(
                 "Unable to locate Intel-provided omp.h under the SYCL toolchain"
             )
 
-        if openmp_library is not None and openmp_header is not None:
+        if openmp_library is not None:
             write_env("ITLABAI_OPENMP_FLAGS", openmp_flags)
             write_env("ITLABAI_OPENMP_LIBRARY_NAME", openmp_library_name)
             write_env("ITLABAI_OPENMP_LIBRARY", str(openmp_library))
-            write_env("ITLABAI_OPENMP_INCLUDE_DIR", str(openmp_header.parent))
+            if openmp_header is not None and export_openmp_include_dir:
+                write_env("ITLABAI_OPENMP_INCLUDE_DIR", str(openmp_header.parent))
 
         libsycl = find_file(library_roots + [sycl_root], "libsycl.so.8")
         if libsycl is None: