Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
freibold committed Sep 27, 2023
1 parent decc2ff commit be0accf
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 78 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
artifact-out: linux-DG2-JIT-INTERNAL
artifact-path: ./build .ctest_conf
cmd: |
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
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
scripts/test.py build --debug
scripts/test.py build
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
artifact-out: linux-DG2-JIT-PUBLIC
artifact-path: ./build .ctest_conf
cmd: |
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
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
scripts/test.py build --debug
scripts/test.py build
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
artifact-out: linux-DG2-JIT-EMBARGO
artifact-path: ./build .ctest_conf
cmd: |
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
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
scripts/test.py build --debug
scripts/test.py build
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
artifact-out: linux-DG2-JIT-PUBLIC-ICX
artifact-path: ./build .ctest_conf
cmd: |
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
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
scripts/test.py build --debug
scripts/test.py build
Expand Down Expand Up @@ -146,11 +146,11 @@ jobs:
runs-on: '[ "Linux", "docker", "build" ]'
project: embree
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
dpcpp-version: icx/compiler_ppkg-rel/20230919
dpcpp-version: icx/compiler_ppkg-rel/20230926
artifact-out: linux-DG2-JIT-PUBLIC-ICX-RC
artifact-path: ./build .ctest_conf
cmd: |
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
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
scripts/test.py build --debug
scripts/test.py build
Expand All @@ -164,7 +164,7 @@ jobs:
runs-on: '[ "Linux", "docker", "dg2" ]'
project: embree
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
dpcpp-version: icx/compiler_ppkg-rel/20230919
dpcpp-version: icx/compiler_ppkg-rel/20230926
artifact-in: linux-DG2-JIT-PUBLIC-ICX-RC
cmd: |
scripts/test.py test --debug
Expand All @@ -178,11 +178,11 @@ jobs:
runs-on: '[ "Linux", "docker", "build" ]'
project: embree
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
artifact-out: linux-DG2-JIT-PUBLIC-sycl-nightly-RK
artifact-path: ./build .ctest_conf
cmd: |
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
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
scripts/test.py build --debug
scripts/test.py build
Expand All @@ -196,7 +196,7 @@ jobs:
runs-on: '[ "Linux", "docker", "dg2" ]'
project: embree
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu22-public.env
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
artifact-in: linux-DG2-JIT-PUBLIC-sycl-nightly-RK
cmd: |
scripts/test.py test --debug
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-windows-public.env
dpcpp-version: oneAPI/compiler/2023.1.0
cmd: |
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
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
python scripts/test.py build
python scripts/test.py test
Expand All @@ -348,9 +348,9 @@ jobs:
runs-on: '[ "Windows", "NAS", "dg2" ]'
project: embree
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-windows-public.env
dpcpp-version: icx/compiler_ppkg-rel/20230919
dpcpp-version: icx/compiler_ppkg-rel/20230926
cmd: |
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
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
python scripts/test.py build
python scripts/test.py test
Expand All @@ -361,9 +361,9 @@ jobs:
runs-on: '[ "Windows", "NAS", "dg2" ]'
project: embree
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-windows-public.env
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
cmd: |
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
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
python scripts/test.py build
python scripts/test.py test
Expand Down Expand Up @@ -421,7 +421,7 @@ jobs:
runs-on: '[ "Linux", "docker", "avx512" ]'
dpcpp-version: intel/2023.1
cmd: |
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
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
python scripts/test.py build
python scripts/test.py test
Expand Down Expand Up @@ -476,7 +476,7 @@ jobs:
with:
image: embree/ubuntu:20.04
runs-on: '[ "Linux", "docker", "avx512" ]'
dpcpp-version: icx/compiler_ppkg-rel/20230919
dpcpp-version: icx/compiler_ppkg-rel/20230926
cmd: |
module load cmake/3.25.3
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
Expand Down Expand Up @@ -505,7 +505,7 @@ jobs:
runs-on: '[ "Windows", "NAS", "build" ]'
dpcpp-version: none
cmd: |
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
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
python scripts/test.py build
python scripts/test.py test
Expand All @@ -525,7 +525,7 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows_gpu.yml@main
with:
runs-on: '[ "Windows", "NAS", "build", "avx512" ]'
dpcpp-version: icx/compiler_ppkg-rel/20230919
dpcpp-version: icx/compiler_ppkg-rel/20230926
cmd: |
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
python scripts/test.py build
Expand Down Expand Up @@ -558,7 +558,7 @@ jobs:
with:
runs-on: '[ "macOS", "build", "x86_64" ]'
cmd: |
scripts/test.py configure platform:x64 build:Debug compiler:CLANG ispc:ispc1.18.1 isa:SSE2 tasking:TBB2021.1.1 intensity:2
scripts/test.py configure platform:x64 build:Debug compiler:CLANG ispc:ispc1.21.0 isa:SSE2 tasking:TBB2021.1.1 intensity:2
scripts/test.py build
scripts/test.py test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gfx-windows-public.env
Original file line number Diff line number Diff line change
@@ -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/
GFX_DRIVER_VERSION=windows-101.4826
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: '[ "Windows", "NAS", "build", "avx512" ]'
artifact-out: release-windows
artifact-path: ./build/embree-*.zip
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
shell: cmd
cmd: |
cmake --preset release-windows
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: '[ "Linux", "docker", "avx512" ]'
artifact-out: release-linux
artifact-path: ./build/*.tar.gz
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
pre-cmd: |
yum -y install epel-release
dnf makecache --refresh
Expand All @@ -77,7 +77,7 @@ jobs:
runs-on: '[ "Windows", "NAS", "dg2" ]'
project: embree
env-from-files: ./.github/workflows/gfx-windows-internal.env
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
artifact-out: release-windows-sycl
artifact-path: ./build/*.zip
shell: cmd
Expand All @@ -94,7 +94,7 @@ jobs:
image: rockylinux:8.7
runs-on: '[ "Linux", "docker", "build" ]'
project: embree
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
artifact-out: release-linux-sycl
artifact-path: ./build/*.tar.gz
pre-cmd: |
Expand All @@ -114,12 +114,12 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
needs: ["release-linux-sycl"]
with:
image: embree/ubuntu:20.04
image: embree/ubuntu:22.04
options: --device=/dev/dri:/dev/dri
runs-on: '[ "Linux", "docker", "dg2" ]'
project: embree
env-from-files: ./.github/workflows/dpcpp-none.env ./.github/workflows/gfx-ubuntu20-release.env
dpcpp-version: intel-llvm/nightly-2023-09-20-rk
dpcpp-version: intel-llvm/nightly-2023-09-22-rk
artifact-in: release-linux-sycl
cmd: |
cd build
Expand Down
10 changes: 5 additions & 5 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

{
"name": "release-linux",
"inherits": ["package-linux", "env", "dpcpp", "ispc1_19_0", "tbb2021_9_0"],
"inherits": ["package-linux", "env", "dpcpp", "ispc1_21_0", "tbb2021_10_0"],
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
Expand Down Expand Up @@ -95,7 +95,7 @@

{
"name": "release-linux-sycl",
"inherits": ["package-linux", "env", "dpcpp", "ispc1_19_0", "tbb2021_9_0"],
"inherits": ["package-linux", "env", "dpcpp", "ispc1_21_0", "tbb2021_10_0"],
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
Expand Down Expand Up @@ -148,7 +148,7 @@

{
"name": "release-macos",
"inherits": ["package-macos", "env", "gcc", "ispc1_19_0", "tbb2021_9_0"],
"inherits": ["package-macos", "env", "gcc", "ispc1_21_0", "tbb2021_10_0"],
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
Expand Down Expand Up @@ -190,7 +190,7 @@

{
"name": "release-windows",
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_19_0", "tbb2021_9_0"],
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_21_0", "tbb2021_10_0"],
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
Expand Down Expand Up @@ -250,7 +250,7 @@

{
"name": "release-windows-sycl",
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_19_0", "tbb2021_9_0"],
"inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_21_0", "tbb2021_10_0"],
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
Expand Down
31 changes: 8 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,27 +286,19 @@ C++11. Embree is tested with the following compilers:
Linux

- Intel® oneAPI DPC++/C++ Compiler 2023.1.0
- Intel® oneAPI DPC++/C++ Compiler 2023.0.0
- oneAPI DPC++/C++ Compiler 2023-09-20
- oneAPI DPC++/C++ Compiler 2023-09-22
- Clang 5.0.0
- Clang 4.0.0
- GCC 10.0.1 (Fedora 32) AVX512 support
- GCC 8.3.1 (Fedora 28) AVX512 support
- GCC 7.3.1 (Fedora 27) AVX2 support
- GCC 7.3.1 (Fedora 26) AVX2 support
- GCC 6.4.1 (Fedora 25) AVX2 support
- Intel® Implicit SPMD Program Compiler 1.19.0
- Intel® Implicit SPMD Program Compiler 1.18.1
- Intel® Implicit SPMD Program Compiler 1.17.0
- Intel® Implicit SPMD Program Compiler 1.16.1
- Intel® Implicit SPMD Program Compiler 1.15.0
- Intel® Implicit SPMD Program Compiler 1.14.1
- Intel® Implicit SPMD Program Compiler 1.13.0

- Intel® Implicit SPMD Program Compiler 1.21.0

macOS x86

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

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

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

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

- Intel® oneAPI DPC++/C++ Compiler 2023.1.0
- Intel® oneAPI DPC++/C++ Compiler 2023.0.0
- oneAPI DPC++/C++ Compiler 2023-07-24
- oneAPI DPC++/C++ Compiler 2023-09-22
- Visual Studio 2022
- Visual Studio 2019
- Visual Studio 2017
- Intel® Implicit SPMD Program Compiler 1.19.0
- Intel® Implicit SPMD Program Compiler 1.18.1
- Intel® Implicit SPMD Program Compiler 1.17.0
- Intel® Implicit SPMD Program Compiler 1.16.1
- Intel® Implicit SPMD Program Compiler 1.15.0
- Intel® Implicit SPMD Program Compiler 1.14.1
- Intel® Implicit SPMD Program Compiler 1.13.0
- Intel® Implicit SPMD Program Compiler 1.12.0
- Intel® Implicit SPMD Program Compiler 1.21.0

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

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

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

0 comments on commit be0accf

Please sign in to comment.