Skip to content

Commit 9350761

Browse files
committed
CI and compiler updates
- add `msvc-version` to jobs which need `cmake` - GPU tests run on Ubuntu 24.04 - bump GH action versions - add MSVC 2026 - bump dpcpp to v7.2 (benchmark needs WA for llvm-project#234701) - bump icx Windows to 2026.1
1 parent e2339a6 commit 9350761

11 files changed

Lines changed: 56 additions & 68 deletions
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
DPCPP_VERSION=intel-llvm/v7.0.0
1+
DPCPP_VERSION=intel-llvm/v7.2.0
2+
MSVC_VERSION=2022

‎.github/deps/dpcpp-windows-icx.env‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
DPCPP_VERSION=intel/2025.3
1+
DPCPP_VERSION=intel/2026.1
2+
MSVC_VERSION=2022

‎.github/workflows/external.ci.linux.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
dnf group install "Development Tools" -y
2929
3030
- name: Checkout Repository
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v7
3232

3333
- name: Build OpenVKL
3434
run: |
3535
export PATH=/usr/bin:$PATH # prefer newer cmake in /usr/bin instead of /usr/local/bin
3636
scl enable gcc-toolset-11 .github/scripts/build.sh
3737
3838
- name: Upload Artifact
39-
uses: actions/upload-artifact@v4
39+
uses: actions/upload-artifact@v7
4040
with:
4141
name: build-rocky-8
4242
path: build/install
@@ -54,7 +54,7 @@ jobs:
5454
dnf install libglvnd-glx libglvnd-opengl -y
5555
5656
- name: Download Artifact
57-
uses: actions/download-artifact@v4
57+
uses: actions/download-artifact@v8
5858
with:
5959
name: build-rocky-8
6060

@@ -84,13 +84,13 @@ jobs:
8484
apt-get install build-essential cmake ninja-build libglfw3-dev libgl1-mesa-dev git -y
8585
8686
- name: Checkout Repository
87-
uses: actions/checkout@v4
87+
uses: actions/checkout@v7
8888

8989
- name: Build OpenVKL
9090
run: .github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF
9191

9292
- name: Upload Artifact
93-
uses: actions/upload-artifact@v4
93+
uses: actions/upload-artifact@v7
9494
with:
9595
name: build-ubuntu-2204
9696
path: build/install
@@ -110,7 +110,7 @@ jobs:
110110
apt-get install libglfw3 libopengl0 -y
111111
112112
- name: Download Artifact
113-
uses: actions/download-artifact@v4
113+
uses: actions/download-artifact@v8
114114
with:
115115
name: build-ubuntu-2204
116116

‎.github/workflows/internal.ci.linux.gpu.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
6363
with:
6464
timeout-minutes: 45
65-
image: ubuntu:22.04
65+
image: ubuntu:24.04
6666
runs-on: '[ "Linux", "docker", "dg2" ]'
6767
artifact-in: build-gpu
6868
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
@@ -77,7 +77,7 @@ jobs:
7777
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
7878
with:
7979
timeout-minutes: 45
80-
image: ubuntu:22.04
80+
image: ubuntu:24.04
8181
runs-on: '[ "Linux", "docker", "pvc" ]'
8282
artifact-in: build-gpu
8383
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
@@ -93,7 +93,7 @@ jobs:
9393
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
9494
with:
9595
timeout-minutes: 45
96-
image: ubuntu:22.04
96+
image: ubuntu:24.04
9797
runs-on: '[ "Linux", "docker", "pvc" ]'
9898
artifact-in: build-gpu
9999
artifact-out: test-examples-pvc
@@ -111,7 +111,7 @@ jobs:
111111
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
112112
with:
113113
timeout-minutes: 45
114-
image: ubuntu:22.04
114+
image: ubuntu:24.04
115115
runs-on: '[ "Linux", "docker", "dg2" ]'
116116
artifact-in: build-gpu
117117
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
@@ -127,7 +127,7 @@ jobs:
127127
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
128128
with:
129129
timeout-minutes: 45
130-
image: ubuntu:22.04
130+
image: ubuntu:24.04
131131
runs-on: '[ "Linux", "docker", "dg2" ]'
132132
artifact-in: build-gpu
133133
artifact-out: test-examples-dg2
@@ -145,7 +145,7 @@ jobs:
145145
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
146146
with:
147147
timeout-minutes: 45
148-
image: ubuntu:22.04
148+
image: ubuntu:24.04
149149
runs-on: '[ "Linux", "docker", "pvc" ]'
150150
artifact-in: build-gpu
151151
artifact-out: test-examples-big-volume-pvc

‎.github/workflows/internal.ci.windows.gpu.icx.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
force-delete: true # guarantees .gitattributes are respected in working dir
2222
runs-on: '[ "build", "x86_64" ]'
2323
env-from-files: .github/deps/dpcpp-windows-icx.env
24-
msvc-version: 2022
2524
artifact-out: build-windows-gpu
2625
artifact-path: ./build
2726
artifact-on-failure: true
@@ -43,7 +42,6 @@ jobs:
4342
force-delete: true # guarantees .gitattributes are respected in working dir
4443
runs-on: '[ "build", "x86_64" ]'
4544
env-from-files: .github/deps/dpcpp-windows-icx.env
46-
msvc-version: 2022
4745
artifact-in: build-windows-gpu
4846
cmd: |
4947
cd ./build/install/bin
@@ -60,7 +58,6 @@ jobs:
6058
force-delete: true # guarantees .gitattributes are respected in working dir
6159
runs-on: '[ "dg2" ]'
6260
env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
63-
msvc-version: 2022
6461
artifact-in: build-windows-gpu
6562
cmd: |
6663
cd ./build/install/bin
@@ -77,7 +74,6 @@ jobs:
7774
force-delete: true # guarantees .gitattributes are respected in working dir
7875
runs-on: '[ "bmg" ]'
7976
env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
80-
msvc-version: 2022
8177
artifact-in: build-windows-gpu
8278
cmd: |
8379
cd ./build/install/bin
@@ -94,7 +90,6 @@ jobs:
9490
force-delete: true # guarantees .gitattributes are respected in working dir
9591
runs-on: '[ "lnl" ]'
9692
env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
97-
msvc-version: 2022
9893
artifact-in: build-windows-gpu
9994
cmd: |
10095
cd ./build/install/bin
@@ -111,7 +106,6 @@ jobs:
111106
force-delete: true # guarantees .gitattributes are respected in working dir
112107
runs-on: '[ "dg2" ]'
113108
env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
114-
msvc-version: 2022
115109
artifact-in: build-windows-gpu
116110
artifact-out: test-examples-dg2
117111
artifact-path: ./build/install/bin/*.pfm
@@ -129,7 +123,6 @@ jobs:
129123
force-delete: true # guarantees .gitattributes are respected in working dir
130124
runs-on: '[ "bmg" ]'
131125
env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
132-
msvc-version: 2022
133126
artifact-in: build-windows-gpu
134127
artifact-out: test-examples-bmg
135128
artifact-path: ./build/install/bin/*.pfm
@@ -147,7 +140,6 @@ jobs:
147140
force-delete: true # guarantees .gitattributes are respected in working dir
148141
runs-on: '[ "lnl" ]'
149142
env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
150-
msvc-version: 2022
151143
artifact-in: build-windows-gpu
152144
artifact-out: test-examples-lnl
153145
artifact-path: ./build/install/bin/*.pfm

‎.github/workflows/internal.ci.windows.gpu.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
force-delete: true # guarantees .gitattributes are respected in working dir
2222
runs-on: '[ "build", "x86_64" ]'
2323
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env
24-
msvc-version: 2022
2524
artifact-out: build-windows-gpu
2625
artifact-path: ./build
2726
artifact-on-failure: true
@@ -43,7 +42,6 @@ jobs:
4342
force-delete: true # guarantees .gitattributes are respected in working dir
4443
runs-on: '[ "build", "x86_64" ]'
4544
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env
46-
msvc-version: 2022
4745
artifact-in: build-windows-gpu
4846
cmd: |
4947
cd ./build/install/bin
@@ -60,7 +58,6 @@ jobs:
6058
force-delete: true # guarantees .gitattributes are respected in working dir
6159
runs-on: '[ "dg2" ]'
6260
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
63-
msvc-version: 2022
6461
artifact-in: build-windows-gpu
6562
cmd: |
6663
cd ./build/install/bin
@@ -77,7 +74,6 @@ jobs:
7774
force-delete: true # guarantees .gitattributes are respected in working dir
7875
runs-on: '[ "bmg" ]'
7976
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
80-
msvc-version: 2022
8177
artifact-in: build-windows-gpu
8278
cmd: |
8379
cd ./build/install/bin
@@ -94,7 +90,6 @@ jobs:
9490
force-delete: true # guarantees .gitattributes are respected in working dir
9591
runs-on: '[ "lnl" ]'
9692
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
97-
msvc-version: 2022
9893
artifact-in: build-windows-gpu
9994
cmd: |
10095
cd ./build/install/bin
@@ -111,7 +106,6 @@ jobs:
111106
force-delete: true # guarantees .gitattributes are respected in working dir
112107
runs-on: '[ "dg2" ]'
113108
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
114-
msvc-version: 2022
115109
artifact-in: build-windows-gpu
116110
artifact-out: test-examples-dg2
117111
artifact-path: ./build/install/bin/*.pfm
@@ -129,7 +123,6 @@ jobs:
129123
force-delete: true # guarantees .gitattributes are respected in working dir
130124
runs-on: '[ "bmg" ]'
131125
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
132-
msvc-version: 2022
133126
artifact-in: build-windows-gpu
134127
artifact-out: test-examples-bmg
135128
artifact-path: ./build/install/bin/*.pfm
@@ -147,7 +140,6 @@ jobs:
147140
force-delete: true # guarantees .gitattributes are respected in working dir
148141
runs-on: '[ "lnl" ]'
149142
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
150-
msvc-version: 2022
151143
artifact-in: build-windows-gpu
152144
artifact-out: test-examples-lnl
153145
artifact-path: ./build/install/bin/*.pfm

‎.github/workflows/internal.ci.windows.yml‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,49 @@ concurrency:
1313
permissions: read-all
1414

1515
jobs:
16-
build-windows-msvc16:
16+
build-windows:
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
include:
21+
- { vs: 16, msvc: 2019 }
22+
- { vs: 17, msvc: 2022 }
23+
- { vs: 18, msvc: 2026 }
1724
secrets: inherit
1825
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
1926
with:
2027
force-delete: true # guarantees .gitattributes are respected in working dir
2128
runs-on: '[ "build", "x86_64" ]'
22-
artifact-out: build-windows-msvc16
29+
msvc-version: ${{ matrix.msvc }}
30+
artifact-out: build-windows-msvc${{ matrix.vs }}
2331
artifact-path: ./build/install
24-
cmd: .github\scripts\build.bat "Visual Studio 16 2019" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
25-
26-
test-windows-msvc16:
27-
needs: build-windows-msvc16
28-
secrets: inherit
29-
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
30-
with:
31-
runs-on: '[ "build", "x86_64" ]'
32-
artifact-in: build-windows-msvc16
33-
cmd: |
34-
.github\scripts\run_tests.bat
35-
36-
37-
build-windows-msvc17:
32+
cmd: .github\scripts\build.bat "Visual Studio ${{ matrix.vs }} ${{ matrix.msvc }}" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
33+
34+
build-windows-source:
35+
strategy:
36+
fail-fast: false
37+
matrix:
38+
include:
39+
- { vs: 17, msvc: 2022 }
40+
- { vs: 18, msvc: 2026 }
3841
secrets: inherit
3942
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
4043
with:
4144
force-delete: true # guarantees .gitattributes are respected in working dir
4245
runs-on: '[ "build", "x86_64" ]'
43-
artifact-out: build-windows-msvc17
44-
artifact-path: ./build/install
45-
cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
46-
47-
build-windows-msvc17-source:
46+
msvc-version: ${{ matrix.msvc }}
47+
cmd: .github\scripts\build.bat "Visual Studio ${{ matrix.vs }} ${{ matrix.msvc }}" "Release"
48+
49+
test-windows:
50+
needs: build-windows
51+
strategy:
52+
fail-fast: false
53+
matrix:
54+
vs: [16, 17] # TODO 18 when fix of https://developercommunity.visualstudio.com/t/MSVC-x64-O1-miscompiles-size_t-loop-aft/11163646 is released
4855
secrets: inherit
4956
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
5057
with:
51-
force-delete: true # guarantees .gitattributes are respected in working dir
5258
runs-on: '[ "build", "x86_64" ]'
53-
cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release"
54-
55-
test-windows-msvc17:
56-
needs: build-windows-msvc17
57-
secrets: inherit
58-
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
59-
with:
60-
runs-on: '[ "build", "x86_64" ]'
61-
artifact-in: build-windows-msvc17
59+
artifact-in: build-windows-msvc${{ matrix.vs }}
6260
cmd: |
6361
.github\scripts\run_tests.bat
64-
65-
# TODO add msvc18, but VC 2026 v18.9 miscompiles

‎.github/workflows/internal.nightly.windows.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
with:
2121
force-delete: true # guarantees .gitattributes are respected in working dir
2222
runs-on: '[ "build", "x86_64" ]'
23+
msvc-version: 2022
2324
artifact-out: build-windows-msvc17-debug
2425
artifact-path: ./build/install
2526
cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Debug"

‎.github/workflows/internal.release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
timeout-minutes: 60
7575
force-delete: true # guarantees .gitattributes are respected in working dir
7676
runs-on: '[ "build", "x86_64" ]'
77+
msvc-version: 2022
7778
artifact-out: windows
7879
artifact-path: ./*.zip
7980
cmd: |
@@ -89,7 +90,6 @@ jobs:
8990
force-delete: true # guarantees .gitattributes are respected in working dir
9091
runs-on: '[ "build", "x86_64" ]'
9192
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env
92-
msvc-version: 2022
9393
artifact-out: windows_sycl
9494
artifact-path: ./*.zip
9595
cmd: |
@@ -155,6 +155,7 @@ jobs:
155155
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
156156
with:
157157
runs-on: '[ "x86_64" ]'
158+
msvc-version: 2022
158159
artifact-in: windows
159160
cmd: |
160161
$env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"
@@ -169,7 +170,6 @@ jobs:
169170
force-delete: true # guarantees .gitattributes are respected in working dir
170171
runs-on: '[ "bmg" ]'
171172
env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
172-
msvc-version: 2022
173173
artifact-in: windows_sycl
174174
cmd: |
175175
$env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"

‎doc/compilation.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Windows, you need the following additional prerequisites:
7474
- [CMake](http://www.cmake.org) version 3.25.3 or higher
7575

7676
- Download the [oneAPI DPC++ Compiler
77-
2023-10-26](https://github.com/intel/llvm/releases/tag/v7.0.0);
77+
v7.2.0](https://github.com/intel/llvm/releases/tag/v7.2.0);
7878
please note this specific version has been validated and used in our
7979
releases.
8080

0 commit comments

Comments
 (0)