Skip to content

Commit b50a132

Browse files
authored
Merge branch 'master' into fix/sycl-instance-level-count-bug
2 parents 474d919 + a28a11d commit b50a132

8 files changed

Lines changed: 29 additions & 270 deletions

File tree

‎.github/workflows/continuous.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
with:
195195
runs-on: '[ "Windows", "dg2" ]'
196196
msvc-version: 2022
197-
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
197+
env-from-files: ./.github/workflows/gfx-windows-public.env
198198
artifact-in: windows-JIT-build
199199
cmd: |
200200
$EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
@@ -207,7 +207,7 @@ jobs:
207207
with:
208208
runs-on: '[ "Windows", "bmg" ]'
209209
msvc-version: 2022
210-
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
210+
env-from-files: ./.github/workflows/gfx-windows-public.env
211211
artifact-in: windows-JIT-build
212212
cmd: |
213213
$EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
@@ -220,7 +220,7 @@ jobs:
220220
with:
221221
runs-on: '[ "Windows", "lnl" ]'
222222
msvc-version: 2022
223-
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
223+
env-from-files: ./.github/workflows/gfx-windows-public.env
224224
artifact-in: windows-JIT-build
225225
cmd: |
226226
$EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
@@ -233,7 +233,7 @@ jobs:
233233
with:
234234
runs-on: '[ "Windows", "dg2" ]'
235235
msvc-version: 2022
236-
env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env
236+
env-from-files: ./.github/workflows/gfx-windows-internal.env
237237
artifact-in: windows-JIT-build
238238
cmd: |
239239
$EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DPCPP_VERSION=intel-llvm/v6.2.0
1+
DPCPP_VERSION=intel-llvm/v7.2.0

‎.github/workflows/nightly.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
options: --device=/dev/dri:/dev/dri
9696
runs-on: '[ "Linux", "docker", "dg2" ]'
9797
env-from-files: ./.github/workflows/gfx-ubuntu24-public.env
98-
dpcpp-version: intel-llvm/v6.2.0
98+
dpcpp-version: intel-llvm/v7.2.0
9999
artifact-in: nightly-linux-DG2-JIT-PUBLIC-build
100100
cmd: |
101101
EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
@@ -140,7 +140,7 @@ jobs:
140140
options: --device=/dev/dri:/dev/dri
141141
runs-on: '[ "Linux", "docker", "pvc" ]'
142142
env-from-files: ./.github/workflows/gfx-ubuntu24-public.env
143-
dpcpp-version: intel-llvm/v6.2.0
143+
dpcpp-version: intel-llvm/v7.2.0
144144
artifact-in: nightly-linux-PVC-JIT-build
145145
cmd: |
146146
export NEOReadDebugKeys=1
@@ -159,7 +159,7 @@ jobs:
159159
options: --device=/dev/dri:/dev/dri
160160
runs-on: '[ "Linux", "docker", "pvc" ]'
161161
env-from-files: ./.github/workflows/gfx-ubuntu24-public.env
162-
dpcpp-version: intel-llvm/v6.2.0
162+
dpcpp-version: intel-llvm/v7.2.0
163163
artifact-in: nightly-linux-PVC-JIT-build
164164
cmd: |
165165
export NEOReadDebugKeys=1
@@ -210,7 +210,7 @@ jobs:
210210
runs-on: '[ "Windows", "dg2" ]'
211211
env-from-files: ./.github/workflows/gfx-windows-public.env
212212
msvc-version: 2022
213-
dpcpp-version: intel-llvm/v6.2.0
213+
dpcpp-version: intel-llvm/v7.2.0
214214
artifact-out: nightly-windows-DG2-JIT-INTELLLVM-bulid
215215
artifact-path: ./build/*.zip
216216
cmd: |
@@ -242,7 +242,7 @@ jobs:
242242
runs-on: '[ "Windows", "dg2" ]'
243243
env-from-files: ./.github/workflows/gfx-windows-public.env
244244
msvc-version: 2022
245-
dpcpp-version: intel-llvm/v6.2.0
245+
dpcpp-version: intel-llvm/v7.2.0
246246
artifact-in: nightly-windows-DG2-JIT-INTELLLVM-bulid
247247
cmd: |
248248
$EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest
@@ -255,7 +255,7 @@ jobs:
255255
runs-on: '[ "Windows", "dg2" ]'
256256
env-from-files: ./.github/workflows/gfx-windows-public.env
257257
msvc-version: 2022
258-
dpcpp-version: intel-llvm/v6.2.0
258+
dpcpp-version: intel-llvm/v7.2.0
259259
artifact-out: nightly-windows-DG2-JIT-PUBLIC-build
260260
artifact-path: ./build/*.zip
261261
cmd: |
@@ -287,7 +287,7 @@ jobs:
287287
runs-on: '[ "Windows", "dg2" ]'
288288
env-from-files: ./.github/workflows/gfx-windows-public.env
289289
msvc-version: 2022
290-
dpcpp-version: intel-llvm/v6.2.0
290+
dpcpp-version: intel-llvm/v7.2.0
291291
artifact-in: nightly-windows-DG2-JIT-PUBLIC-build
292292
cmd: |
293293
$EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
artifact-out: build-windows
2424
artifact-path: ./build/embree-*.zip
2525
msvc-version: 2019
26-
dpcpp-version: intel-llvm/v6.2.0
26+
dpcpp-version: intel-llvm/v7.2.0
2727
cmd: |
2828
$opts = "-DCMAKE_BUILD_TYPE=Release"
2929
$opts += " -DBUILD_TESTING=ON"
@@ -167,7 +167,7 @@ jobs:
167167
runs-on: '[ "Linux", "build" ]'
168168
artifact-out: build-linux
169169
artifact-path: ./build/*.tar.gz
170-
dpcpp-version: intel-llvm/v6.2.0
170+
dpcpp-version: intel-llvm/v7.2.0
171171
pre-cmd: |
172172
dnf -y install epel-release
173173
dnf -y config-manager --set-enabled powertools
@@ -215,7 +215,7 @@ jobs:
215215
with:
216216
runs-on: '[ "Windows", "build" ]'
217217
msvc-version: 2019
218-
dpcpp-version: intel-llvm/v6.2.0
218+
dpcpp-version: intel-llvm/v7.2.0
219219
artifact-out: build-windows-sycl
220220
artifact-path: ./build/*.zip
221221
cmd: |
@@ -243,7 +243,7 @@ jobs:
243243
with:
244244
image: rockylinux:8.7
245245
runs-on: '[ "Linux", "build" ]'
246-
dpcpp-version: intel-llvm/v6.2.0
246+
dpcpp-version: intel-llvm/v7.2.0
247247
artifact-out: build-linux-sycl
248248
artifact-path: ./build/*.tar.gz
249249
pre-cmd: |

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ C++11. Embree is tested with the following compilers:
286286
Linux
287287

288288
- Intel® oneAPI DPC++/C++ Compiler 2025.2
289-
- oneAPI DPC++/C++ Compiler 6.2.0
289+
- oneAPI DPC++/C++ Compiler 7.2.0
290290
- Clang 20
291291
- GCC 15 (Fedora 42) AVX512 support
292292
- Intel® Implicit SPMD Program Compiler 1.22.0
@@ -397,7 +397,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
397397
DPC++/C++ Compiler" but less stable. The current tested version of the "oneAPI
398398
DPC++ compiler is
399399

400-
- [oneAPI DPC++ Compiler 6.2.0](https://github.com/intel/llvm/releases/tag/v6.2.0)
400+
- [oneAPI DPC++ Compiler 7.2.0](https://github.com/intel/llvm/releases/tag/v7.2.0)
401401

402402
The compiler can be downloaded and simply extracted. The oneAPI DPC++ compiler
403403
can be set up executing the following commands in a Linux (bash) shell:
@@ -481,7 +481,7 @@ Windows
481481
Embree is tested using the following compilers under Windows:
482482

483483
- Intel® oneAPI DPC++/C++ Compiler 2025.2
484-
- oneAPI DPC++/C++ Compiler 6.2.0
484+
- oneAPI DPC++/C++ Compiler 7.2.0
485485
- Visual Studio 2022
486486
- Visual Studio 2019
487487
- Visual Studio 2017
@@ -602,7 +602,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
602602
DPC++/C++ Compiler" but less stable. The current tested version of the oneAPI
603603
DPC++ compiler is
604604

605-
- [oneAPI DPC++ Compiler 6.2.0](https://github.com/intel/llvm/releases/tag/v6.2.0)
605+
- [oneAPI DPC++ Compiler 7.2.0](https://github.com/intel/llvm/releases/tag/v7.2.0)
606606

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

‎common/cmake/package.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ IF (EMBREE_SYCL_SUPPORT AND EMBREE_INSTALL_DEPENDENCIES)
4545
IF (EXISTS "${DPCPP_COMPILER_DIR}/ur_adapter_level_zero.dll")
4646
INSTALL(FILES "${DPCPP_COMPILER_DIR}/ur_adapter_level_zero.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
4747
ENDIF()
48+
IF (EXISTS "${DPCPP_COMPILER_DIR}/ur_adapter_level_zero_V2.dll")
49+
INSTALL(FILES "${DPCPP_COMPILER_DIR}/ur_adapter_level_zero_V2.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
50+
ENDIF()
4851

4952
# copy unified runtime loader dll
5053
IF(EXISTS "${DPCPP_COMPILER_DIR}/ur_loader.dll")
@@ -84,6 +87,7 @@ IF (EMBREE_SYCL_SUPPORT AND EMBREE_INSTALL_DEPENDENCIES)
8487
"${DPCPP_COMPILER_DIR}/../lib/libsycl.so.?.?.?"
8588
"${DPCPP_COMPILER_DIR}/../lib/libsycl.so.?.?.?-?"
8689
"${DPCPP_COMPILER_DIR}/../lib/libur_adapter_level_zero.so*"
90+
"${DPCPP_COMPILER_DIR}/../lib/libur_adapter_level_zero_V2.so*"
8791
"${DPCPP_COMPILER_DIR}/../lib/libur_loader.so*"
8892
"${DPCPP_COMPILER_DIR}/../lib/libumf.so*")
8993
INSTALL(FILES ${LIB_SYCL_FILES} DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)

0 commit comments

Comments
 (0)