Skip to content

Explicit CI compiler version #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanatwork merged 10 commits into from
Oct 23, 2026
Merged

Explicit CI compiler version #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f414bd5
Added explicit compiler version to Windows CI jobs
stefanatwork Oct 14, 2026
3c57134
Added MSVC 2022 and 2026 builds to CI continuous job
stefanatwork Oct 14, 2026
7587737
Added msvc version to Windows SYCL JIT builds
stefanatwork Oct 14, 2026
e8cb5bc
Added msvc version to Windows release builds
stefanatwork Oct 14, 2026
85fc448
Added explicit msvc version to all internal Windows CI jobs
stefanatwork Oct 14, 2026
81d1ba0
moved mvsc-version before dpcpp-version
stefanatwork Oct 14, 2026
07927f7
Raised superbuild CMake minimum version to 3.10
stefanatwork Oct 22, 2026
c5b00b7
Lowered default msvc verison to 2022
stefanatwork Oct 22, 2026
4c58fb6
Made sure to not mix ICX and intel-llvm in CI
stefanatwork Oct 22, 2026
4ade6ff
Merge branch 'master' into sw/ci-compiler-version
stefanatwork Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .github/workflows/continuous.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ jobs:
with:
force-delete: true
runs-on: '[ "Windows", "build" ]'
msvc-version: 2022
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
artifact-out: windows-JIT-build
artifact-path: ./build/*.zip
Expand Down Expand Up @@ -192,6 +193,7 @@ jobs:
needs: ["windows-JIT-build"]
with:
runs-on: '[ "Windows", "dg2" ]'
msvc-version: 2022
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
artifact-in: windows-JIT-build
cmd: |
Expand All @@ -204,6 +206,7 @@ jobs:
needs: ["windows-JIT-build"]
with:
runs-on: '[ "Windows", "bmg" ]'
msvc-version: 2022
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
artifact-in: windows-JIT-build
cmd: |
Expand All @@ -216,6 +219,7 @@ jobs:
needs: ["windows-JIT-build"]
with:
runs-on: '[ "Windows", "lnl" ]'
msvc-version: 2022
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
artifact-in: windows-JIT-build
cmd: |
Expand All @@ -228,6 +232,7 @@ jobs:
needs: ["windows-JIT-build"]
with:
runs-on: '[ "Windows", "dg2" ]'
msvc-version: 2022
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env
artifact-in: windows-JIT-build
cmd: |
Expand All @@ -239,6 +244,7 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
with:
runs-on: '[ "Windows", "build" ]'
msvc-version: 2022
dpcpp-version: intel/2025.2
artifact-out: windows-DG2-JIT-ICX-build
artifact-path: ./build/*.zip
Expand Down Expand Up @@ -269,6 +275,7 @@ jobs:
with:
force-delete: true
runs-on: '[ "Windows", "build" ]'
msvc-version: 2022
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
cmd: |
$opts = "-DCMAKE_BUILD_TYPE=Debug"
Expand Down Expand Up @@ -471,6 +478,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
########################################
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
with:
runs-on: '[ "Windows", "build" ]'
msvc-version: 2022
dpcpp-version: intel/2025.2
artifact-out: nightly-windows-DG2-JIT-ICX-RC-build
artifact-path: ./build/*.zip
Expand Down Expand Up @@ -208,6 +209,7 @@ jobs:
with:
runs-on: '[ "Windows", "dg2" ]'
env-from-files: ./.github/workflows/gfx-windows-public.env
msvc-version: 2022
dpcpp-version: intel-llvm/v6.2.0
artifact-out: nightly-windows-DG2-JIT-INTELLLVM-bulid
artifact-path: ./build/*.zip
Expand Down Expand Up @@ -239,6 +241,7 @@ jobs:
with:
runs-on: '[ "Windows", "dg2" ]'
env-from-files: ./.github/workflows/gfx-windows-public.env
msvc-version: 2022
dpcpp-version: intel-llvm/v6.2.0
artifact-in: nightly-windows-DG2-JIT-INTELLLVM-bulid
cmd: |
Expand All @@ -251,6 +254,7 @@ jobs:
with:
runs-on: '[ "Windows", "dg2" ]'
env-from-files: ./.github/workflows/gfx-windows-public.env
msvc-version: 2022
dpcpp-version: intel-llvm/v6.2.0
artifact-out: nightly-windows-DG2-JIT-PUBLIC-build
artifact-path: ./build/*.zip
Expand Down Expand Up @@ -282,6 +286,7 @@ jobs:
with:
runs-on: '[ "Windows", "dg2" ]'
env-from-files: ./.github/workflows/gfx-windows-public.env
msvc-version: 2022
dpcpp-version: intel-llvm/v6.2.0
artifact-in: nightly-windows-DG2-JIT-PUBLIC-build
cmd: |
Expand All @@ -293,6 +298,7 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
with:
runs-on: '[ "Windows", "dg2" ]'
msvc-version: 2022
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
artifact-out: nightly-windows-DG2-MULTILEVEL-build
artifact-path: ./build/*.zip
Expand Down Expand Up @@ -324,6 +330,8 @@ jobs:
needs: ["nightly-windows-DG2-MULTILEVEL-build"]
with:
runs-on: '[ "Windows", "dg2" ]'
msvc-version: 2022
dpcpp-version: intel/2025.2
env-from-files: ./.github/workflows/gfx-windows-public.env
artifact-in: nightly-windows-DG2-MULTILEVEL-build
cmd: |
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
runs-on: '[ "Windows", "build"]'
artifact-out: build-windows
artifact-path: ./build/embree-*.zip
msvc-version: 2019
dpcpp-version: intel-llvm/v6.2.0
cmd: |
$opts = "-DCMAKE_BUILD_TYPE=Release"
Expand Down Expand Up @@ -50,6 +51,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
Expand Down Expand Up @@ -212,6 +214,7 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
with:
runs-on: '[ "Windows", "build" ]'
msvc-version: 2019
dpcpp-version: intel-llvm/v6.2.0
artifact-out: build-windows-sycl
artifact-path: ./build/*.zip
Expand Down Expand Up @@ -276,6 +279,8 @@ jobs:
platform: [dg2, bmg, lnl]
with:
runs-on: '[ "Windows", "${{ matrix.platform }}" ]'
msvc-version: 2022
dpcpp-version: intel/2025.2
env-from-files: ./.github/workflows/gfx-windows-public.env
artifact-in: build-windows-sycl
cmd: |
Expand Down
2 changes: 1 addition & 1 deletion superbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading