From f414bd50b8d24a39217d9357bd906637030819c0 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Wed, 14 Oct 2026 09:56:19 +0200 Subject: [PATCH 1/9] Added explicit compiler version to Windows CI jobs --- .github/workflows/continuous.yml | 6 ++++++ .github/workflows/nightly.yml | 2 ++ .github/workflows/release.yml | 2 ++ 3 files changed, 10 insertions(+) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 3546823eec..981c0bc308 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -162,6 +162,7 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: windows-JIT-build artifact-path: ./build/*.zip @@ -192,6 +193,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -204,6 +206,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "bmg" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -216,6 +219,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "lnl" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -228,6 +232,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env artifact-in: windows-JIT-build cmd: | @@ -269,6 +274,7 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env cmd: | $opts = "-DCMAKE_BUILD_TYPE=Debug" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0b237d2089..7ce94fff2c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -293,6 +293,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "dg2" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-windows-DG2-MULTILEVEL-build artifact-path: ./build/*.zip @@ -324,6 +325,7 @@ jobs: needs: ["nightly-windows-DG2-MULTILEVEL-build"] with: runs-on: '[ "Windows", "dg2" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: nightly-windows-DG2-MULTILEVEL-build cmd: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9598583ee0..20a0dc89c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,7 @@ jobs: platform: [avx2, avx512] with: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' + msvc-version: 2019 artifact-in: build-windows cmd: | $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest @@ -276,6 +277,7 @@ jobs: platform: [dg2, bmg, lnl] with: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: build-windows-sycl cmd: | From 3c5713418065836190036c8cd5882e34e0546ed0 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Wed, 14 Oct 2026 10:00:54 +0200 Subject: [PATCH 2/9] Added MSVC 2022 and 2026 builds to CI continuous job --- .github/workflows/continuous.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 981c0bc308..4ecfc3ec51 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -477,6 +477,33 @@ jobs: $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig RelWithDebInfo + windows-V144: + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main + with: + force-delete: true + runs-on: '[ "Windows", "build" ]' + msvc-version: 2022 + cmd: | + $opts = "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + $opts += " -DBUILD_TESTING=ON" + $opts += " -DEMBREE_TUTORIALS=ON" + $opts += " -DEMBREE_ISPC_SUPPORT=ON" + $opts += " -DEMBREE_MAX_INSTANCE_LEVEL_COUNT=8" + $opts += " -DEMBREE_MAX_ISA=SSE2" + $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON" + $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON" + $opts += " -DCMAKE_INSTALL_TESTDIR=testing" + $opts += " -DEMBREE_ZIP_MODE=ON" + + cmake -S superbuild -B build -G Ninja -D EMBREE_EXTRA_OPTIONS="$opts" + cmake --build build --config RelWithDebInfo + cmake --build build/embree/build --config RelWithDebInfo --target build + Copy-Item build/embree/build/embree-*.zip build/ -Force + + $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest + .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig RelWithDebInfo + ######################################## # MacOS ######################################## From 7587737329fb08542f5cfa722794a5bd8ee3a033 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Wed, 14 Oct 2026 10:33:10 +0200 Subject: [PATCH 3/9] Added msvc version to Windows SYCL JIT builds --- .github/workflows/continuous.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 4ecfc3ec51..061867ef8a 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -194,6 +194,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -245,6 +246,7 @@ jobs: with: runs-on: '[ "Windows", "build" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 artifact-out: windows-DG2-JIT-ICX-build artifact-path: ./build/*.zip cmd: | From e8cb5bca642c0bd38126cc091e350adcf3a640ce Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Wed, 14 Oct 2026 11:05:52 +0200 Subject: [PATCH 4/9] Added msvc version to Windows release builds --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20a0dc89c0..ebb93af964 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,7 @@ jobs: artifact-out: build-windows artifact-path: ./build/embree-*.zip dpcpp-version: intel-llvm/v6.2.0 + msvc-version: 2019 cmd: | $opts = "-DCMAKE_BUILD_TYPE=Release" $opts += " -DBUILD_TESTING=ON" @@ -214,6 +215,7 @@ jobs: with: runs-on: '[ "Windows", "build" ]' dpcpp-version: intel-llvm/v6.2.0 + msvc-version: 2019 artifact-out: build-windows-sycl artifact-path: ./build/*.zip cmd: | From 85fc448a81e31f80b54aac919a2746d592770a89 Mon Sep 17 00:00:00 2001 From: "Werner, Stefan" Date: Wed, 14 Oct 2026 12:03:20 +0200 Subject: [PATCH 5/9] Added explicit msvc version to all internal Windows CI jobs --- .github/workflows/continuous.yml | 5 +++++ .github/workflows/nightly.yml | 7 +++++++ .github/workflows/release.yml | 1 + 3 files changed, 13 insertions(+) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 061867ef8a..e061af33c0 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -163,6 +163,7 @@ jobs: force-delete: true runs-on: '[ "Windows", "build" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: windows-JIT-build artifact-path: ./build/*.zip @@ -208,6 +209,7 @@ jobs: with: runs-on: '[ "Windows", "bmg" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -221,6 +223,7 @@ jobs: with: runs-on: '[ "Windows", "lnl" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -234,6 +237,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env artifact-in: windows-JIT-build cmd: | @@ -277,6 +281,7 @@ jobs: force-delete: true runs-on: '[ "Windows", "build" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env cmd: | $opts = "-DCMAKE_BUILD_TYPE=Debug" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7ce94fff2c..48c766807c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -179,6 +179,7 @@ jobs: with: runs-on: '[ "Windows", "build" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 artifact-out: nightly-windows-DG2-JIT-ICX-RC-build artifact-path: ./build/*.zip cmd: | @@ -209,6 +210,7 @@ jobs: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env dpcpp-version: intel-llvm/v6.2.0 + msvc-version: 2026 artifact-out: nightly-windows-DG2-JIT-INTELLLVM-bulid artifact-path: ./build/*.zip cmd: | @@ -240,6 +242,7 @@ jobs: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env dpcpp-version: intel-llvm/v6.2.0 + msvc-version: 2026 artifact-in: nightly-windows-DG2-JIT-INTELLLVM-bulid cmd: | $EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest @@ -252,6 +255,7 @@ jobs: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env dpcpp-version: intel-llvm/v6.2.0 + msvc-version: 2026 artifact-out: nightly-windows-DG2-JIT-PUBLIC-build artifact-path: ./build/*.zip cmd: | @@ -283,6 +287,7 @@ jobs: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env dpcpp-version: intel-llvm/v6.2.0 + msvc-version: 2026 artifact-in: nightly-windows-DG2-JIT-PUBLIC-build cmd: | $EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest @@ -294,6 +299,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-windows-DG2-MULTILEVEL-build artifact-path: ./build/*.zip @@ -326,6 +332,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: nightly-windows-DG2-MULTILEVEL-build cmd: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ebb93af964..8c80900a31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -280,6 +280,7 @@ jobs: with: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' dpcpp-version: intel/2025.2 + msvc-version: 2026 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: build-windows-sycl cmd: | From 81d1ba08a4b55b90b5873230bd8505e971f2e83c Mon Sep 17 00:00:00 2001 From: "Werner, Stefan" Date: Wed, 14 Oct 2026 14:02:28 +0200 Subject: [PATCH 6/9] moved mvsc-version before dpcpp-version --- .github/workflows/continuous.yml | 14 +++++++------- .github/workflows/nightly.yml | 14 +++++++------- .github/workflows/release.yml | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index e061af33c0..7461e9a0b5 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -162,8 +162,8 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: windows-JIT-build artifact-path: ./build/*.zip @@ -194,8 +194,8 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -208,8 +208,8 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "bmg" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -222,8 +222,8 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "lnl" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -236,8 +236,8 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env artifact-in: windows-JIT-build cmd: | @@ -249,8 +249,8 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 artifact-out: windows-DG2-JIT-ICX-build artifact-path: ./build/*.zip cmd: | @@ -280,8 +280,8 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env cmd: | $opts = "-DCMAKE_BUILD_TYPE=Debug" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 48c766807c..c101ab4b85 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -178,8 +178,8 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 artifact-out: nightly-windows-DG2-JIT-ICX-RC-build artifact-path: ./build/*.zip cmd: | @@ -209,8 +209,8 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - dpcpp-version: intel-llvm/v6.2.0 msvc-version: 2026 + dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-INTELLLVM-bulid artifact-path: ./build/*.zip cmd: | @@ -241,8 +241,8 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - dpcpp-version: intel-llvm/v6.2.0 msvc-version: 2026 + dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-INTELLLVM-bulid cmd: | $EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest @@ -254,8 +254,8 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - dpcpp-version: intel-llvm/v6.2.0 msvc-version: 2026 + dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-PUBLIC-build artifact-path: ./build/*.zip cmd: | @@ -286,8 +286,8 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - dpcpp-version: intel-llvm/v6.2.0 msvc-version: 2026 + dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-PUBLIC-build cmd: | $EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest @@ -298,8 +298,8 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "dg2" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-windows-DG2-MULTILEVEL-build artifact-path: ./build/*.zip @@ -331,8 +331,8 @@ jobs: needs: ["nightly-windows-DG2-MULTILEVEL-build"] with: runs-on: '[ "Windows", "dg2" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: nightly-windows-DG2-MULTILEVEL-build cmd: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c80900a31..d5cc0d477f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,8 +22,8 @@ jobs: runs-on: '[ "Windows", "build"]' artifact-out: build-windows artifact-path: ./build/embree-*.zip - dpcpp-version: intel-llvm/v6.2.0 msvc-version: 2019 + dpcpp-version: intel-llvm/v6.2.0 cmd: | $opts = "-DCMAKE_BUILD_TYPE=Release" $opts += " -DBUILD_TESTING=ON" @@ -214,8 +214,8 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' - dpcpp-version: intel-llvm/v6.2.0 msvc-version: 2019 + dpcpp-version: intel-llvm/v6.2.0 artifact-out: build-windows-sycl artifact-path: ./build/*.zip cmd: | @@ -279,8 +279,8 @@ jobs: platform: [dg2, bmg, lnl] with: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' - dpcpp-version: intel/2025.2 msvc-version: 2026 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: build-windows-sycl cmd: | From 07927f704d3b16685eccdf6227612a7321a149a4 Mon Sep 17 00:00:00 2001 From: "Werner, Stefan" Date: Thu, 22 Oct 2026 11:58:35 +0200 Subject: [PATCH 7/9] Raised superbuild CMake minimum version to 3.10 --- superbuild/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt index 70e1a02774..1ca64a4207 100644 --- a/superbuild/CMakeLists.txt +++ b/superbuild/CMakeLists.txt @@ -3,7 +3,7 @@ ## Global settings ## -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} From c5b00b7e60859261a140cb26b8bc05b9bf12996f Mon Sep 17 00:00:00 2001 From: "Werner, Stefan" Date: Thu, 22 Oct 2026 12:19:04 +0200 Subject: [PATCH 8/9] Lowered default msvc verison to 2022 --- .github/workflows/continuous.yml | 14 +++++++------- .github/workflows/nightly.yml | 14 +++++++------- .github/workflows/release.yml | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 7461e9a0b5..3cbe29ec7f 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -162,7 +162,7 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: windows-JIT-build @@ -194,7 +194,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build @@ -208,7 +208,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "bmg" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build @@ -222,7 +222,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "lnl" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build @@ -236,7 +236,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env artifact-in: windows-JIT-build @@ -249,7 +249,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 artifact-out: windows-DG2-JIT-ICX-build artifact-path: ./build/*.zip @@ -280,7 +280,7 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env cmd: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c101ab4b85..13ff9b0692 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -178,7 +178,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 artifact-out: nightly-windows-DG2-JIT-ICX-RC-build artifact-path: ./build/*.zip @@ -209,7 +209,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-INTELLLVM-bulid artifact-path: ./build/*.zip @@ -241,7 +241,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-INTELLLVM-bulid cmd: | @@ -254,7 +254,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-PUBLIC-build artifact-path: ./build/*.zip @@ -286,7 +286,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-PUBLIC-build cmd: | @@ -298,7 +298,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "dg2" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-windows-DG2-MULTILEVEL-build @@ -331,7 +331,7 @@ jobs: needs: ["nightly-windows-DG2-MULTILEVEL-build"] with: runs-on: '[ "Windows", "dg2" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: nightly-windows-DG2-MULTILEVEL-build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d5cc0d477f..c2e63edbb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -279,7 +279,7 @@ jobs: platform: [dg2, bmg, lnl] with: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' - msvc-version: 2026 + msvc-version: 2022 dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: build-windows-sycl From 4c58fb6d5a92e0bec0f5d5a69a1ad6e5f2f9f527 Mon Sep 17 00:00:00 2001 From: "Werner, Stefan" Date: Thu, 22 Oct 2026 14:35:05 +0200 Subject: [PATCH 9/9] Made sure to not mix ICX and intel-llvm in CI --- .github/workflows/continuous.yml | 6 ------ .github/workflows/nightly.yml | 1 - 2 files changed, 7 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 3cbe29ec7f..aa464dcd17 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -163,7 +163,6 @@ jobs: force-delete: true runs-on: '[ "Windows", "build" ]' msvc-version: 2022 - dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: windows-JIT-build artifact-path: ./build/*.zip @@ -195,7 +194,6 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' msvc-version: 2022 - dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -209,7 +207,6 @@ jobs: with: runs-on: '[ "Windows", "bmg" ]' msvc-version: 2022 - dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -223,7 +220,6 @@ jobs: with: runs-on: '[ "Windows", "lnl" ]' msvc-version: 2022 - dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -237,7 +233,6 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' msvc-version: 2022 - dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env artifact-in: windows-JIT-build cmd: | @@ -281,7 +276,6 @@ jobs: force-delete: true runs-on: '[ "Windows", "build" ]' msvc-version: 2022 - dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env cmd: | $opts = "-DCMAKE_BUILD_TYPE=Debug" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 13ff9b0692..efa11b1543 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -299,7 +299,6 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' msvc-version: 2022 - dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-windows-DG2-MULTILEVEL-build artifact-path: ./build/*.zip