Skip to content

Commit be0accf

Browse files
freiboldfreibold
committed
updates
* use syclos 20230922 for release * use proper public driver on Windows * update ispc to 1.21.0 * update TBB to 2021.10.0 * update ICX RK to 20230926
1 parent decc2ff commit be0accf

File tree

10 files changed

+64
-78
lines changed

10 files changed

+64
-78
lines changed

‎.github/workflows/continuous.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
artifact-out: linux-DG2-JIT-INTERNAL
2828
artifact-path: ./build .ctest_conf
2929
cmd: |
30-
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.18.1 isa:SSE2 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON LEVEL_ZERO:ON sycl:none tasking:TBB2021.7.0 intensity:4
30+
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.21.0 isa:SSE2 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON LEVEL_ZERO:ON sycl:none tasking:TBB2021.10.0 intensity:4
3131
scripts/test.py build --debug
3232
scripts/test.py build
3333
@@ -57,7 +57,7 @@ jobs:
5757
artifact-out: linux-DG2-JIT-PUBLIC
5858
artifact-path: ./build .ctest_conf
5959
cmd: |
60-
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.18.1 isa:SSE2 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.7.0 intensity:4
60+
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.21.0 isa:SSE2 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.10.0 intensity:4
6161
scripts/test.py build --debug
6262
scripts/test.py build
6363
@@ -87,7 +87,7 @@ jobs:
8787
artifact-out: linux-DG2-JIT-EMBARGO
8888
artifact-path: ./build .ctest_conf
8989
cmd: |
90-
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.18.1 isa:SSE2 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.7.0 intensity:4
90+
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.21.0 isa:SSE2 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.10.0 intensity:4
9191
scripts/test.py build --debug
9292
scripts/test.py build
9393
@@ -118,7 +118,7 @@ jobs:
118118
artifact-out: linux-DG2-JIT-PUBLIC-ICX
119119
artifact-path: ./build .ctest_conf
120120
cmd: |
121-
scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.18.1 isa:AVX512 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.7.0 intensity:4
121+
scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.21.0 isa:AVX512 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.10.0 intensity:4
122122
scripts/test.py build --debug
123123
scripts/test.py build
124124
@@ -146,11 +146,11 @@ jobs:
146146
runs-on: '[ "Linux", "docker", "build" ]'
147147
project: embree
148148
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
149-
dpcpp-version: icx/compiler_ppkg-rel/20230919
149+
dpcpp-version: icx/compiler_ppkg-rel/20230926
150150
artifact-out: linux-DG2-JIT-PUBLIC-ICX-RC
151151
artifact-path: ./build .ctest_conf
152152
cmd: |
153-
scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.18.1 isa:AVX512 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.7.0 intensity:4
153+
scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.21.0 isa:AVX512 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.10.0 intensity:4
154154
scripts/test.py build --debug
155155
scripts/test.py build
156156
@@ -164,7 +164,7 @@ jobs:
164164
runs-on: '[ "Linux", "docker", "dg2" ]'
165165
project: embree
166166
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
167-
dpcpp-version: icx/compiler_ppkg-rel/20230919
167+
dpcpp-version: icx/compiler_ppkg-rel/20230926
168168
artifact-in: linux-DG2-JIT-PUBLIC-ICX-RC
169169
cmd: |
170170
scripts/test.py test --debug
@@ -178,11 +178,11 @@ jobs:
178178
runs-on: '[ "Linux", "docker", "build" ]'
179179
project: embree
180180
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
181-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
181+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
182182
artifact-out: linux-DG2-JIT-PUBLIC-sycl-nightly-RK
183183
artifact-path: ./build .ctest_conf
184184
cmd: |
185-
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.18.1 isa:AVX512 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.7.0 intensity:4
185+
scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.21.0 isa:AVX512 build:RelWithAssert EMBREE_SYCL_SUPPORT:ON sycl:none tasking:TBB2021.10.0 intensity:4
186186
scripts/test.py build --debug
187187
scripts/test.py build
188188
@@ -196,7 +196,7 @@ jobs:
196196
runs-on: '[ "Linux", "docker", "dg2" ]'
197197
project: embree
198198
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
199-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
199+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
200200
artifact-in: linux-DG2-JIT-PUBLIC-sycl-nightly-RK
201201
cmd: |
202202
scripts/test.py test --debug
@@ -337,7 +337,7 @@ jobs:
337337
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-windows-public.env
338338
dpcpp-version: oneAPI/compiler/2023.1.0
339339
cmd: |
340-
python scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.18.1 isa:AVX512 tasking:TBB2021.7.0 build:Release EMBREE_SYCL_SUPPORT:ON sycl:none intensity:2
340+
python scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.21.0 isa:AVX512 tasking:TBB2021.10.0 build:Release EMBREE_SYCL_SUPPORT:ON sycl:none intensity:2
341341
python scripts/test.py build
342342
python scripts/test.py test
343343
@@ -348,9 +348,9 @@ jobs:
348348
runs-on: '[ "Windows", "NAS", "dg2" ]'
349349
project: embree
350350
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-windows-public.env
351-
dpcpp-version: icx/compiler_ppkg-rel/20230919
351+
dpcpp-version: icx/compiler_ppkg-rel/20230926
352352
cmd: |
353-
python scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.18.1 isa:AVX512 tasking:TBB2021.7.0 build:Release EMBREE_SYCL_SUPPORT:ON sycl:none intensity:2
353+
python scripts/test.py configure platform:x64 compiler:ICX ispc:ispc1.21.0 isa:AVX512 tasking:TBB2021.10.0 build:Release EMBREE_SYCL_SUPPORT:ON sycl:none intensity:2
354354
python scripts/test.py build
355355
python scripts/test.py test
356356
@@ -361,9 +361,9 @@ jobs:
361361
runs-on: '[ "Windows", "NAS", "dg2" ]'
362362
project: embree
363363
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-windows-public.env
364-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
364+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
365365
cmd: |
366-
python scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.18.1 isa:AVX512 tasking:TBB2021.7.0 build:Release EMBREE_SYCL_SUPPORT:ON sycl:none intensity:2
366+
python scripts/test.py configure platform:x64 compiler:dpcpp ispc:ispc1.21.0 isa:AVX512 tasking:TBB2021.10.0 build:Release EMBREE_SYCL_SUPPORT:ON sycl:none intensity:2
367367
python scripts/test.py build
368368
python scripts/test.py test
369369
@@ -421,7 +421,7 @@ jobs:
421421
runs-on: '[ "Linux", "docker", "avx512" ]'
422422
dpcpp-version: intel/2023.1
423423
cmd: |
424-
python scripts/test.py configure platform:x64 build:Debug compiler:ICX ispc:ispc1.13.0 isa:AVX512 frequency_level:simd256 tasking:TBB2021.7.0 intensity:2 maxinstancelevelcount:4
424+
python scripts/test.py configure platform:x64 build:Debug compiler:ICX ispc:ispc1.13.0 isa:AVX512 frequency_level:simd256 tasking:TBB2021.10.0 intensity:2 maxinstancelevelcount:4
425425
python scripts/test.py build
426426
python scripts/test.py test
427427
@@ -476,7 +476,7 @@ jobs:
476476
with:
477477
image: embree/ubuntu:20.04
478478
runs-on: '[ "Linux", "docker", "avx512" ]'
479-
dpcpp-version: icx/compiler_ppkg-rel/20230919
479+
dpcpp-version: icx/compiler_ppkg-rel/20230926
480480
cmd: |
481481
module load cmake/3.25.3
482482
scripts/test.py configure platform:x64 build:Release threads:4 compiler:ICX ispc:ispc1.17.0 isa:AVX512 frequency_level:simd256 tasking:TBB2021.5.0 intensity:2
@@ -505,7 +505,7 @@ jobs:
505505
runs-on: '[ "Windows", "NAS", "build" ]'
506506
dpcpp-version: none
507507
cmd: |
508-
python scripts/test.py configure platform:x64 build:RelWithDebInfo compiler:V142 ispc:ispc1.18.1 isa:SSE2 tasking:TBB2021.7.0 intensity:2 maxinstancelevelcount:8
508+
python scripts/test.py configure platform:x64 build:RelWithDebInfo compiler:V142 ispc:ispc1.21.0 isa:SSE2 tasking:TBB2021.10.0 intensity:2 maxinstancelevelcount:8
509509
python scripts/test.py build
510510
python scripts/test.py test
511511
@@ -525,7 +525,7 @@ jobs:
525525
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows_gpu.yml@main
526526
with:
527527
runs-on: '[ "Windows", "NAS", "build", "avx512" ]'
528-
dpcpp-version: icx/compiler_ppkg-rel/20230919
528+
dpcpp-version: icx/compiler_ppkg-rel/20230926
529529
cmd: |
530530
python scripts/test.py configure platform:x64 build:RelWithDebInfo compiler:ICX ispc:ispc1.17.0 isa:AVX512 tasking:TBB2021.5.0 threads:16 intensity:2
531531
python scripts/test.py build
@@ -558,7 +558,7 @@ jobs:
558558
with:
559559
runs-on: '[ "macOS", "build", "x86_64" ]'
560560
cmd: |
561-
scripts/test.py configure platform:x64 build:Debug compiler:CLANG ispc:ispc1.18.1 isa:SSE2 tasking:TBB2021.1.1 intensity:2
561+
scripts/test.py configure platform:x64 build:Debug compiler:CLANG ispc:ispc1.21.0 isa:SSE2 tasking:TBB2021.1.1 intensity:2
562562
scripts/test.py build
563563
scripts/test.py test
564564

‎.github/workflows/gfx-windows-public.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
GFX_DRIVER_VERSION=gfx-driver-builds/prod/releases_23ww24-ci-master-14081/prod-hini-releases_23ww24-ci-master-14081-revenue-pr-1014575/artifacts/Windows/
1+
GFX_DRIVER_VERSION=windows-101.4826

‎.github/workflows/release.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: '[ "Windows", "NAS", "build", "avx512" ]'
2121
artifact-out: release-windows
2222
artifact-path: ./build/embree-*.zip
23-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
23+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
2424
shell: cmd
2525
cmd: |
2626
cmake --preset release-windows
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: '[ "Linux", "docker", "avx512" ]'
5252
artifact-out: release-linux
5353
artifact-path: ./build/*.tar.gz
54-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
54+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
5555
pre-cmd: |
5656
yum -y install epel-release
5757
dnf makecache --refresh
@@ -77,7 +77,7 @@ jobs:
7777
runs-on: '[ "Windows", "NAS", "dg2" ]'
7878
project: embree
7979
env-from-files: ./.github/workflows/gfx-windows-internal.env
80-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
80+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
8181
artifact-out: release-windows-sycl
8282
artifact-path: ./build/*.zip
8383
shell: cmd
@@ -94,7 +94,7 @@ jobs:
9494
image: rockylinux:8.7
9595
runs-on: '[ "Linux", "docker", "build" ]'
9696
project: embree
97-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
97+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
9898
artifact-out: release-linux-sycl
9999
artifact-path: ./build/*.tar.gz
100100
pre-cmd: |
@@ -114,12 +114,12 @@ jobs:
114114
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
115115
needs: ["release-linux-sycl"]
116116
with:
117-
image: embree/ubuntu:20.04
117+
image: embree/ubuntu:22.04
118118
options: --device=/dev/dri:/dev/dri
119119
runs-on: '[ "Linux", "docker", "dg2" ]'
120120
project: embree
121121
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu20-release.env
122-
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
122+
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
123123
artifact-in: release-linux-sycl
124124
cmd: |
125125
cd build

‎CMakePresets.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
{
2626
"name": "release-linux",
27-
"inherits": ["package-linux", "env", "dpcpp", "ispc1_19_0", "tbb2021_9_0"],
27+
"inherits": ["package-linux", "env", "dpcpp", "ispc1_21_0", "tbb2021_10_0"],
2828
"binaryDir": "${sourceDir}/build",
2929
"cacheVariables": {
3030
"CMAKE_BUILD_TYPE": "Release",
@@ -95,7 +95,7 @@
9595

9696
{
9797
"name": "release-linux-sycl",
98-
"inherits": ["package-linux", "env", "dpcpp", "ispc1_19_0", "tbb2021_9_0"],
98+
"inherits": ["package-linux", "env", "dpcpp", "ispc1_21_0", "tbb2021_10_0"],
9999
"binaryDir": "${sourceDir}/build",
100100
"cacheVariables": {
101101
"CMAKE_BUILD_TYPE": "Release",
@@ -148,7 +148,7 @@
148148

149149
{
150150
"name": "release-macos",
151-
"inherits": ["package-macos", "env", "gcc", "ispc1_19_0", "tbb2021_9_0"],
151+
"inherits": ["package-macos", "env", "gcc", "ispc1_21_0", "tbb2021_10_0"],
152152
"binaryDir": "${sourceDir}/build",
153153
"cacheVariables": {
154154
"CMAKE_BUILD_TYPE": "Release",
@@ -190,7 +190,7 @@
190190

191191
{
192192
"name": "release-windows",
193-
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_19_0", "tbb2021_9_0"],
193+
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_21_0", "tbb2021_10_0"],
194194
"binaryDir": "${sourceDir}/build",
195195
"cacheVariables": {
196196
"CMAKE_BUILD_TYPE": "Release",
@@ -250,7 +250,7 @@
250250

251251
{
252252
"name": "release-windows-sycl",
253-
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_19_0", "tbb2021_9_0"],
253+
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_21_0", "tbb2021_10_0"],
254254
"binaryDir": "${sourceDir}/build",
255255
"cacheVariables": {
256256
"CMAKE_BUILD_TYPE": "Release",

‎README.md

+8-23
Original file line numberDiff line numberDiff line change
@@ -286,27 +286,19 @@ C++11. Embree is tested with the following compilers:
286286
Linux
287287

288288
- Intel® oneAPI DPC++/C++ Compiler 2023.1.0
289-
- Intel® oneAPI DPC++/C++ Compiler 2023.0.0
290-
- oneAPI DPC++/C++ Compiler 2023-09-20
289+
- oneAPI DPC++/C++ Compiler 2023-09-22
291290
- Clang 5.0.0
292291
- Clang 4.0.0
293292
- GCC 10.0.1 (Fedora 32) AVX512 support
294293
- GCC 8.3.1 (Fedora 28) AVX512 support
295294
- GCC 7.3.1 (Fedora 27) AVX2 support
296295
- GCC 7.3.1 (Fedora 26) AVX2 support
297296
- GCC 6.4.1 (Fedora 25) AVX2 support
298-
- Intel® Implicit SPMD Program Compiler 1.19.0
299-
- Intel® Implicit SPMD Program Compiler 1.18.1
300-
- Intel® Implicit SPMD Program Compiler 1.17.0
301-
- Intel® Implicit SPMD Program Compiler 1.16.1
302-
- Intel® Implicit SPMD Program Compiler 1.15.0
303-
- Intel® Implicit SPMD Program Compiler 1.14.1
304-
- Intel® Implicit SPMD Program Compiler 1.13.0
305-
297+
- Intel® Implicit SPMD Program Compiler 1.21.0
298+
306299
macOS x86
307300

308301
- Intel® C++ Classic Compiler 2023.1.0
309-
- Intel® C++ Classic Compiler 2023.0.0
310302
- Apple Clang 12.0.5 (macOS 11.7.1)
311303

312304
macOS M1
@@ -416,7 +408,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
416408
DPC++/C++ Compiler" but less stable. The current tested version of the "oneAPI
417409
DPC++ compiler is
418410

419-
- [oneAPI DPC++ Compiler 2023-09-20](https://github.com/intel/llvm/releases/tag/nightly-2023-09-20)
411+
- [oneAPI DPC++ Compiler 2023-09-25](https://github.com/intel/llvm/releases/tag/nightly-2023-09-22)
420412

421413
The compiler can be downloaded and simply extracted. The oneAPI DPC++ compiler
422414
can be set up executing the following commands in a Linux (bash) shell:
@@ -511,18 +503,11 @@ Windows
511503
Embree is tested using the following compilers under Windows:
512504

513505
- Intel® oneAPI DPC++/C++ Compiler 2023.1.0
514-
- Intel® oneAPI DPC++/C++ Compiler 2023.0.0
515-
- oneAPI DPC++/C++ Compiler 2023-07-24
506+
- oneAPI DPC++/C++ Compiler 2023-09-22
507+
- Visual Studio 2022
516508
- Visual Studio 2019
517509
- Visual Studio 2017
518-
- Intel® Implicit SPMD Program Compiler 1.19.0
519-
- Intel® Implicit SPMD Program Compiler 1.18.1
520-
- Intel® Implicit SPMD Program Compiler 1.17.0
521-
- Intel® Implicit SPMD Program Compiler 1.16.1
522-
- Intel® Implicit SPMD Program Compiler 1.15.0
523-
- Intel® Implicit SPMD Program Compiler 1.14.1
524-
- Intel® Implicit SPMD Program Compiler 1.13.0
525-
- Intel® Implicit SPMD Program Compiler 1.12.0
510+
- Intel® Implicit SPMD Program Compiler 1.21.0
526511

527512
IMPORTANT: Unfortunatlly, latest version of the Intel® oneAPI DPC++/C++
528513
Compiler (2023.2.1), has a bug that doesn't allow Embree to run correctly with
@@ -644,7 +629,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
644629
DPC++/C++ Compiler" but less stable. The current tested version of the oneAPI
645630
DPC++ compiler is
646631

647-
- [oneAPI DPC++ Compiler 2023-09-20](https://github.com/intel/llvm/releases/tag/nightly-2023-09-20)
632+
- [oneAPI DPC++ Compiler 2023-09-22](https://github.com/intel/llvm/releases/tag/nightly-2023-09-22)
648633

649634
Download and unpack the archive and open the "x64 Native Tools Command Prompt"
650635
of Visual Studio and execute the following lines to properly configure the

0 commit comments

Comments
 (0)