Skip to content

Commit 8c6ba52

Browse files
gregjohnsongregjohnson
committed
Merge branch 'release-2.0.x'
2 parents 8b42f10 + 857957b commit 8c6ba52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+582
-513
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DPCPP_VERSION=icx/compiler_ppkg-rel/20240129

‎.github/deps/dpcpp-sycl-nightly.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DPCPP_VERSION=intel-llvm/nightly-2023-09-22-rk
1+
DPCPP_VERSION=intel-llvm/nightly-2023-10-26-rk

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
GFX_DRIVER_VERSION=windows-101.4826
1+
GFX_DRIVER_VERSION=windows-101.5186

‎.github/workflows/benchmark.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
setup-benny: true
3636
cmd: |
3737
cd ./build/install
38-
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
3938
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
4039
4140
benchmark-x8380-1:
@@ -47,7 +46,6 @@ jobs:
4746
setup-benny: true
4847
cmd: |
4948
cd ./build/install
50-
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
5149
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
5250
5351
benchmark-i9-12900k-1:
@@ -59,7 +57,6 @@ jobs:
5957
setup-benny: true
6058
cmd: |
6159
cd ./build/install
62-
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
6360
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
6461
6562
benchmark-a3970x-1:
@@ -71,7 +68,6 @@ jobs:
7168
setup-benny: true
7269
cmd: |
7370
cd ./build/install
74-
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
7571
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
7672
7773
build-gpu:
@@ -82,13 +78,10 @@ jobs:
8278
image: ubuntu:22.04
8379
artifact-out: build-gpu
8480
artifact-path: ./build/install ./build/openvkl/build
85-
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
8681
env-from-files: .github/deps/dpcpp-sycl-nightly.env
8782
cmd: |
88-
export CC=clang
89-
export CXX=clang++
9083
module load cmake/3.25.3
91-
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
84+
gitlab/build.sh -D BUILD_OPENVDB=OFF \
9285
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
9386
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
9487
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON"
@@ -106,7 +99,6 @@ jobs:
10699
setup-benny: true
107100
cmd: |
108101
cd ./build/install
109-
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
110102
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh GPU
111103
112104
perf-pvc:
@@ -122,5 +114,4 @@ jobs:
122114
setup-benny: true
123115
cmd: |
124116
cd ./build/install
125-
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
126117
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh GPU

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

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
## Copyright 2023 Intel Corporation
2+
## SPDX-License-Identifier: Apache-2.0
3+
4+
name: CI GPU ICX Linux Workflow
5+
on:
6+
push:
7+
workflow_dispatch:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
15+
build-gpu:
16+
secrets: inherit
17+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
18+
with:
19+
submodules: true
20+
image: ubuntu:22.04
21+
artifact-out: build-gpu
22+
artifact-path: ./build/install ./build/openvkl/build
23+
env-from-files: .github/deps/dpcpp-icx.env
24+
cmd: |
25+
module load cmake/3.25.3
26+
gitlab/build.sh -D BUILD_OPENVDB=OFF \
27+
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
28+
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
29+
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON"
30+
31+
build-gpu-rel-with-dbg-info:
32+
secrets: inherit
33+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
34+
with:
35+
submodules: true
36+
image: ubuntu:22.04
37+
env-from-files: .github/deps/dpcpp-icx.env
38+
cmd: |
39+
module load cmake/3.25.3
40+
gitlab/build.sh -D BUILD_OPENVDB=OFF \
41+
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
42+
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
43+
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
44+
-D CMAKE_BUILD_TYPE=RelWithDebInfo"
45+
46+
build-gpu-debug:
47+
secrets: inherit
48+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
49+
with:
50+
submodules: true
51+
image: ubuntu:22.04
52+
env-from-files: .github/deps/dpcpp-icx.env
53+
cmd: |
54+
module load cmake/3.25.3
55+
gitlab/build.sh -D BUILD_OPENVDB=OFF \
56+
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
57+
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
58+
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
59+
-D CMAKE_BUILD_TYPE=Debug"
60+
61+
test-build-from-install-dg2:
62+
needs: [ build-gpu ]
63+
secrets: inherit
64+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
65+
with:
66+
image: ubuntu:22.04
67+
runs-on: '[ "Linux", "docker", "dg2" ]'
68+
artifact-in: build-gpu
69+
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env
70+
options: --device=/dev/dri:/dev/dri
71+
cmd: |
72+
module load cmake/3.25.3
73+
export PATH=`pwd`/build/install/bin:`pwd`/build/install:$PATH
74+
gitlab/build-from-install.sh
75+
76+
test-pvc:
77+
secrets: inherit
78+
needs: [ build-gpu ]
79+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
80+
with:
81+
submodules: true
82+
image: ubuntu:22.04
83+
runs-on: '[ "Linux", "docker", "pvc" ]'
84+
artifact-in: build-gpu
85+
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
86+
options: --device=/dev/dri:/dev/dri
87+
cmd: |
88+
cd ./build/install/bin
89+
./vklTutorialGPU
90+
./vklTestsGPU --durations yes
91+
92+
test-examples-pvc:
93+
secrets: inherit
94+
needs: [ build-gpu ]
95+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
96+
with:
97+
submodules: true
98+
image: ubuntu:22.04
99+
runs-on: '[ "Linux", "docker", "pvc" ]'
100+
artifact-in: build-gpu
101+
artifact-out: test-examples-pvc
102+
artifact-path: ./build/install/bin/*.pfm
103+
artifact-on-failure: true
104+
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
105+
options: --device=/dev/dri:/dev/dri
106+
cmd: |
107+
cd ./build/install/bin
108+
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
109+
110+
test-cpu:
111+
secrets: inherit
112+
needs: [ build-gpu ]
113+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
114+
with:
115+
submodules: true
116+
image: ubuntu:22.04
117+
runs-on: '[ "Linux", "docker", "build" ]'
118+
artifact-in: build-gpu
119+
env-from-files: .github/deps/dpcpp-icx.env
120+
cmd: |
121+
cd ./build/install/bin
122+
./vklTutorialCPU
123+
./vklTestsCPU --durations yes
124+
125+
test-dg2:
126+
secrets: inherit
127+
needs: [ build-gpu ]
128+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
129+
with:
130+
submodules: true
131+
image: ubuntu:22.04
132+
runs-on: '[ "Linux", "docker", "dg2" ]'
133+
artifact-in: build-gpu
134+
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env
135+
options: --device=/dev/dri:/dev/dri
136+
cmd: |
137+
cd ./build/install/bin
138+
./vklTutorialGPU
139+
./vklTestsGPU --durations yes
140+
141+
test-examples-dg2:
142+
secrets: inherit
143+
needs: [ build-gpu ]
144+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
145+
with:
146+
submodules: true
147+
image: ubuntu:22.04
148+
runs-on: '[ "Linux", "docker", "dg2" ]'
149+
artifact-in: build-gpu
150+
artifact-out: test-examples-dg2
151+
artifact-path: ./build/install/bin/*.pfm
152+
artifact-on-failure: true
153+
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env
154+
options: --device=/dev/dri:/dev/dri
155+
cmd: |
156+
cd ./build/install/bin
157+
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
158+
159+
test-examples-big-volume-pvc:
160+
secrets: inherit
161+
needs: [ build-gpu ]
162+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
163+
with:
164+
submodules: true
165+
image: ubuntu:22.04
166+
runs-on: '[ "Linux", "docker", "pvc" ]'
167+
artifact-in: build-gpu
168+
artifact-out: test-examples-big-volume-pvc
169+
artifact-path: ./build/install/*.pfm
170+
artifact-on-failure: true
171+
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
172+
options: --device=/dev/dri:/dev/dri
173+
cmd: |
174+
cd ./build/install
175+
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh

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

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ jobs:
2020
image: ubuntu:22.04
2121
artifact-out: build-gpu
2222
artifact-path: ./build/install ./build/openvkl/build
23-
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
2423
env-from-files: .github/deps/dpcpp-sycl-nightly.env
2524
cmd: |
2625
module load cmake/3.25.3
27-
export CC=clang
28-
export CXX=clang++
29-
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
26+
gitlab/build.sh -D BUILD_OPENVDB=OFF \
3027
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
3128
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
3229
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON"
@@ -37,13 +34,10 @@ jobs:
3734
with:
3835
submodules: true
3936
image: ubuntu:22.04
40-
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
4137
env-from-files: .github/deps/dpcpp-sycl-nightly.env
4238
cmd: |
4339
module load cmake/3.25.3
44-
export CC=clang
45-
export CXX=clang++
46-
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
40+
gitlab/build.sh -D BUILD_OPENVDB=OFF \
4741
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
4842
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
4943
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
@@ -55,13 +49,10 @@ jobs:
5549
with:
5650
submodules: true
5751
image: ubuntu:22.04
58-
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
5952
env-from-files: .github/deps/dpcpp-sycl-nightly.env
6053
cmd: |
6154
module load cmake/3.25.3
62-
export CC=clang
63-
export CXX=clang++
64-
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
55+
gitlab/build.sh -D BUILD_OPENVDB=OFF \
6556
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
6657
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
6758
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
@@ -79,9 +70,6 @@ jobs:
7970
options: --device=/dev/dri:/dev/dri
8071
cmd: |
8172
module load cmake/3.25.3
82-
export CC=clang
83-
export CXX=clang++
84-
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
8573
export PATH=`pwd`/build/install/bin:`pwd`/build/install:$PATH
8674
gitlab/build-from-install.sh
8775
@@ -97,7 +85,6 @@ jobs:
9785
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
9886
options: --device=/dev/dri:/dev/dri
9987
cmd: |
100-
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
10188
cd ./build/install/bin
10289
./vklTutorialGPU
10390
./vklTestsGPU --durations yes
@@ -117,7 +104,6 @@ jobs:
117104
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
118105
options: --device=/dev/dri:/dev/dri
119106
cmd: |
120-
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
121107
cd ./build/install/bin
122108
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
123109
@@ -133,7 +119,6 @@ jobs:
133119
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
134120
options: --device=/dev/dri:/dev/dri
135121
cmd: |
136-
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
137122
cd ./build/install/bin
138123
./vklTutorialGPU
139124
./vklTestsGPU --durations yes
@@ -153,7 +138,6 @@ jobs:
153138
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
154139
options: --device=/dev/dri:/dev/dri
155140
cmd: |
156-
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
157141
cd ./build/install/bin
158142
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
159143
@@ -173,5 +157,4 @@ jobs:
173157
options: --device=/dev/dri:/dev/dri
174158
cmd: |
175159
cd ./build/install
176-
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
177160
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,6 @@ jobs:
437437
artifact-in: build-linux-arch
438438
image: ospray/docker-images:arch
439439
cmd: |
440-
export LD_LIBRARY_PATH=./build/install/lib
441440
./build/openvkl/build/vklTutorialCPU
442441
./build/openvkl/build/vklTutorialISPC
443442
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
@@ -463,15 +462,13 @@ jobs:
463462
prebuild: >
464463
mkdir build &&
465464
cd build &&
466-
export LD_LIBRARY_PATH=`pwd`/install/lib:${LD_LIBRARY_PATH} &&
467465
cmake -DBUILD_JOBS=`nproc` -DBUILD_DEPENDENCIES_ONLY=ON -DBUILD_GLFW=OFF "$@" ../superbuild &&
468466
cmake --build . &&
469467
mkdir openvkl_build &&
470468
cd openvkl_build &&
471469
DEP_INSTALL_DIR=`pwd`/../install &&
472470
export rkcommon_DIR=$DEP_INSTALL_DIR &&
473471
export embree_DIR=$DEP_INSTALL_DIR &&
474-
export ispcrt_DIR=$DEP_INSTALL_DIR &&
475472
cmake -DISPC_EXECUTABLE=$DEP_INSTALL_DIR/bin/ispc -DBUILD_EXAMPLES=OFF -DRKCOMMON_TBB_ROOT=$DEP_INSTALL_DIR ../.. &&
476473
cd ../..
477474
build: cmake --build ./build/openvkl_build

‎.github/workflows/ci.mac.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
runs-on: '[ "macOS", "build", "x86_64" ]'
3232
artifact-in: build-macOS
3333
cmd: |
34-
export DYLD_LIBRARY_PATH=./build/install/lib
3534
./build/openvkl/build/vklTutorialCPU
3635
./build/openvkl/build/vklTutorialISPC
3736
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
@@ -57,7 +56,6 @@ jobs:
5756
runs-on: '[ "macOS", "build", "x86_64" ]'
5857
artifact-in: build-macOS-TBB2020
5958
cmd: |
60-
export DYLD_LIBRARY_PATH=./build/install/lib
6159
./build/openvkl/build/vklTutorialCPU
6260
./build/openvkl/build/vklTutorialISPC
6361
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
@@ -84,7 +82,6 @@ jobs:
8482
runs-on: '[ "macOS", "build", "arm" ]'
8583
artifact-in: build-macOS-arm-neon
8684
cmd: |
87-
export DYLD_LIBRARY_PATH=./build/install/lib
8885
export OPENVKL_LOG_LEVEL=debug # gives prints of current ISA and SIMD width
8986
./build/openvkl/build/vklTutorialCPU
9087
./build/openvkl/build/vklTutorialISPC
@@ -112,7 +109,6 @@ jobs:
112109
runs-on: '[ "macOS", "build", "arm" ]'
113110
artifact-in: build-macOS-arm-neon2x
114111
cmd: |
115-
export DYLD_LIBRARY_PATH=./build/install/lib
116112
export OPENVKL_LOG_LEVEL=debug # gives prints of current ISA and SIMD width
117113
./build/openvkl/build/vklTutorialCPU
118114
./build/openvkl/build/vklTutorialISPC

0 commit comments

Comments
 (0)