Use Intel native CPU container for Linux SYCL

allnes · allnes · commit e7741bcc2d12 · 2026-03-19T19:13:50.000+01:00
diff --git a/.github/workflows/sycl-ci.yml b/.github/workflows/sycl-ci.yml
@@ -14,16 +14,16 @@ env:
   ADAPTIVECPP_TAG: v25.10.0
 
 jobs:
-  build-sycl-x86:
-    name: ${{ matrix.platform }} / ${{ matrix.build_type }}
-    runs-on: ${{ matrix.platform == 'linux-x86_64' && 'ubuntu-latest' || 'windows-2025' }}
+  build-sycl-linux-x86:
+    name: linux-x86_64 / ${{ matrix.build_type }}
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest
+      options: -u 0:0
     timeout-minutes: 360
     strategy:
       fail-fast: true
       matrix:
-        platform:
-          - linux-x86_64
-          - windows-x86_64
         build_type:
           - Debug
           - Release
@@ -41,24 +41,61 @@ jobs:
       uses: seanmiddleditch/gha-setup-ninja@v6
 
     - name: Setup ccache
-      if: runner.os != 'Windows'
       uses: hendrikmuhs/ccache-action@v1.2
       with:
-        key: ccache-${{ github.job }}-${{ matrix.platform }}-${{ matrix.build_type }}
+        key: ccache-${{ github.job }}-${{ matrix.build_type }}
         max-size: 2G
 
+    - name: Prepare platform settings
+      run: python3 ./scripts/ci/sycl_x86_setup.py linux-x86_64
+
+    - name: Configure
+      run: python3 ./scripts/ci/sycl_configure.py "${{ matrix.build_type }}" "${ITLABAI_ENABLE_OPENCV_APPS}"
+
+    - name: Build
+      run: cmake --build build --parallel
+
+    - name: Test
+      run: |
+        if [ -n "${DEVICE_SELECTOR}" ]; then
+          ONEAPI_DEVICE_SELECTOR="${DEVICE_SELECTOR}" ctest --test-dir build --output-on-failure --parallel
+        else
+          ctest --test-dir build --output-on-failure --parallel
+        fi
+
+  build-sycl-windows-x86:
+    name: windows-x86_64 / ${{ matrix.build_type }}
+    runs-on: windows-2025
+    timeout-minutes: 360
+    strategy:
+      fail-fast: true
+      matrix:
+        build_type:
+          - Debug
+          - Release
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Setup Ninja
+      uses: seanmiddleditch/gha-setup-ninja@v6
+
     - name: Setup ccache
-      if: runner.os == 'Windows'
       uses: Chocobo1/setup-ccache-action@v1
       with:
         windows_compile_environment: msvc
 
     - name: Setup MSVC environment
-      if: runner.os == 'Windows'
       uses: ilammy/msvc-dev-cmd@v1
 
     - name: Prepare platform settings
-      run: python3 ./scripts/ci/sycl_x86_setup.py "${{ matrix.platform }}"
+      run: python3 ./scripts/ci/sycl_x86_setup.py windows-x86_64
 
     - name: Configure
       run: python3 ./scripts/ci/sycl_configure.py "${{ matrix.build_type }}" "${ITLABAI_ENABLE_OPENCV_APPS}"
diff --git a/scripts/ci/sycl_x86_setup.py b/scripts/ci/sycl_x86_setup.py
@@ -24,10 +24,10 @@
 def configure_platform(platform: str) -> None:
     settings = {
         "linux-x86_64": {
-            "toolchain_asset": "sycl_linux.tar.gz",
-            "device_selector": "opencl:cpu",
+            "toolchain_asset": "",
+            "device_selector": "native_cpu:cpu",
             "opencv_apps": "ON",
-            "sycl_targets": "spir64",
+            "sycl_targets": "native_cpu",
         },
         "windows-x86_64": {
             "toolchain_asset": "sycl_windows.tar.gz",
@@ -48,87 +48,46 @@ def configure_platform(platform: str) -> None:
 
 
 def setup_linux_runtime() -> None:
-    run(["sudo", "apt-get", "update"])
+    command_prefix = [] if os.geteuid() == 0 else ["sudo"]
+    run([*command_prefix, "apt-get", "update"])
     run(
         [
-            "sudo",
+            *command_prefix,
             "apt-get",
             "install",
             "-y",
             "build-essential",
+            "ccache",
             "cmake",
             "g++-13",
             "gcc-13",
             "git",
-            "ocl-icd-opencl-dev",
-            "opencl-headers",
             "python3",
             "zstd",
         ]
     )
-
-    key_url = "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB"
-    key_path = Path(require_env("RUNNER_TEMP")) / "oneapi-intel-key.pub"
-    armored_key_path = Path(require_env("RUNNER_TEMP")) / "oneapi-archive-keyring.gpg"
-    download(key_url, key_path)
-    run(
-        [
-            "gpg",
-            "--dearmor",
-            "--output",
-            str(armored_key_path),
-            str(key_path),
-        ]
-    )
-    run(
-        [
-            "sudo",
-            "cp",
-            str(armored_key_path),
-            "/usr/share/keyrings/oneapi-archive-keyring.gpg",
-        ]
-    )
-    run(
-        ["sudo", "tee", "/etc/apt/sources.list.d/oneAPI.list"],
-        input_text=(
-            "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] "
-            "https://apt.repos.intel.com/oneapi all main\n"
+    clang_path = Path(capture(["bash", "-lc", "readlink -f \"$(command -v clang++)\""]))
+    candidate_roots = [
+        clang_path.parent.parent,
+        clang_path.parent.parent.parent,
+    ]
+    sycl_root = next(
+        (
+            root
+            for root in candidate_roots
+            if (root / "bin").is_dir() or (root / "bin" / "compiler").is_dir()
         ),
+        None,
     )
-    run(["sudo", "apt-get", "update"])
-    run(
-        [
-            "sudo",
-            "apt-get",
-            "install",
-            "-y",
-            "intel-oneapi-compiler-dpcpp-cpp",
-            "intel-oneapi-runtime-opencl",
-        ]
-    )
-
-    write_env("ITLABAI_GCC_INSTALL_DIR", "/usr/lib/gcc/x86_64-linux-gnu/13")
-
-    icd_dir = Path(require_env("RUNNER_TEMP")) / "intel-opencl-icd"
-    icd_dir.mkdir(parents=True, exist_ok=True)
-
-    icd_file = None
-    for candidate in Path("/etc/OpenCL/vendors").glob("*.icd"):
-        try:
-            if "intel" in candidate.read_text(encoding="utf-8").lower():
-                icd_file = candidate
-                break
-        except OSError:
-            continue
-
-    if icd_file is None:
-        main_error("Unable to locate Intel OpenCL ICD file under /etc/OpenCL/vendors")
-
-    run(["cp", str(icd_file), str(icd_dir / icd_file.name)])
-    write_env("OCL_ICD_VENDORS", str(icd_dir))
+    if sycl_root is None:
+        main_error(f"Unable to infer SYCL_ROOT from compiler path: {clang_path}")
+    write_env("SYCL_ROOT", str(sycl_root))
 
 
 def prepare_sycl_toolchain() -> Path:
+    if require_env("RUNNER_OS") == "Linux" and not os.environ.get("TOOLCHAIN_ASSET"):
+        return Path(require_env("SYCL_ROOT"))
+
     runner_os = require_env("RUNNER_OS")
     runner_temp = require_env("RUNNER_TEMP")
     runner_temp_dir = Path(cygpath("u", runner_temp) if runner_os == "Windows" else runner_temp)
@@ -204,19 +163,23 @@ def setup_unix_compilers(sycl_root: Path) -> None:
     sycl_runtime_dirs: list[Path] = []
 
     if require_env("RUNNER_OS") == "Linux":
-        compiler_root = Path("/opt/intel/oneapi/compiler/latest")
+        compiler_root = Path(require_env("SYCL_ROOT"))
         cc_candidates = [
+            compiler_root / "bin" / "icx",
+            compiler_root / "bin" / "clang",
             compiler_root / "bin" / "compiler" / "icx",
             compiler_root / "bin" / "compiler" / "clang",
             *cc_candidates,
         ]
         cxx_candidates = [
+            compiler_root / "bin" / "icpx",
+            compiler_root / "bin" / "clang++",
             compiler_root / "bin" / "compiler" / "icpx",
             compiler_root / "bin" / "compiler" / "clang++",
             *cxx_candidates,
         ]
-        prefix_paths = [compiler_root, sycl_root]
-        library_roots = [compiler_root, sycl_root]
+        prefix_paths = [compiler_root]
+        library_roots = [compiler_root]
 
     cc_path = find_first_existing(cc_candidates)
     cxx_path = find_first_existing(cxx_candidates)
@@ -253,9 +216,9 @@ def setup_unix_compilers(sycl_root: Path) -> None:
         write_env("ITLABAI_OPENMP_LIBRARY", str(openmp_library))
         write_env("ITLABAI_OPENMP_INCLUDE_DIR", str(openmp_header.parent))
 
-        libsycl = find_file(library_roots, "libsycl.so.8")
+        libsycl = find_file(library_roots + [sycl_root], "libsycl.so.8")
         if libsycl is None:
-            libsycl = find_file(library_roots, "libsycl.so")
+            libsycl = find_file(library_roots + [sycl_root], "libsycl.so")
         if libsycl is not None:
             sycl_runtime_dirs.append(libsycl.parent)
 
