Skip to content

Commit 3c73d1c

Browse files
johguentherjohguenther
committed
CI updates, remove benny, fix coverity issues
1 parent e0492b8 commit 3c73d1c

13 files changed

+21
-92
lines changed

‎.github/scripts/run-benchmarks.sh‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,16 @@ BENCHMARK_FLAGS="--benchmark_repetitions=5 --benchmark_min_time=10"
3434
#
3535
################################# PLEASE READ ###################################
3636

37-
initContext() {
38-
if [ -z "$HAVE_CONTEXT" ]; then
39-
HAVE_CONTEXT=1
40-
benny insert code_context "${PROJECT_NAME}" ${SOURCE_ROOT} --save-json code_context.json
41-
benny insert run_context ${BENNY_SYSTEM_TOKEN} ./code_context.json --save-json run_context.json
42-
fi
43-
}
44-
45-
4637
SUITE_NAME="ExampleRenderers"
4738

48-
initContext
49-
5039
SUBSUITE_NAME="StructuredVolume"
5140
SUBSUITE_REGEX="structured_regular"
5241
./bin/vklBenchmark${BENCHMARK_DEVICE} ${BENCHMARK_FLAGS} --benchmark_filter=${SUBSUITE_REGEX} --benchmark_out=results-${SUITE_NAME}-${SUBSUITE_NAME}.json
53-
benny insert googlebenchmark ./run_context.json ${SUITE_NAME} ${SUBSUITE_NAME} ./results-${SUITE_NAME}-${SUBSUITE_NAME}.json
5442

5543
SUBSUITE_NAME="VDBVolume"
5644
SUBSUITE_REGEX="vdb"
5745
./bin/vklBenchmark${BENCHMARK_DEVICE} ${BENCHMARK_FLAGS} --benchmark_filter=${SUBSUITE_REGEX} --benchmark_out=results-${SUITE_NAME}-${SUBSUITE_NAME}.json
58-
benny insert googlebenchmark ./run_context.json ${SUITE_NAME} ${SUBSUITE_NAME} ./results-${SUITE_NAME}-${SUBSUITE_NAME}.json
5946

6047
SUBSUITE_NAME="UnstructuredVolume"
6148
SUBSUITE_REGEX="unstructured"
6249
./bin/vklBenchmark${BENCHMARK_DEVICE} ${BENCHMARK_FLAGS} --benchmark_filter=${SUBSUITE_REGEX} --benchmark_out=results-${SUITE_NAME}-${SUBSUITE_NAME}.json
63-
benny insert googlebenchmark ./run_context.json ${SUITE_NAME} ${SUBSUITE_NAME} ./results-${SUITE_NAME}-${SUBSUITE_NAME}.json

‎.github/scripts/run-examples-big-volume-tests.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# These tests are to verify if rendered image is correct for big volume size on PVC.
66
# `time` command used here is just to see what is total execution time (for roughly estimation).
77

8-
IMG_DIFF_TOOL=$STORAGE_PATH/tools/img_diff/img_diff
8+
IMG_DIFF_TOOL=$STORAGE_PATH/tools/img-diff/dist_linux/img_diff
99

1010
# Enable persistent JIT cache
1111
export SYCL_CACHE_PERSISTENT=1
@@ -29,4 +29,4 @@ time ./bin/vklExamplesCPU -renderer interval_iterator_debug -batch -printStats -
2929
$IMG_DIFF_TOOL density_pathtracer.pfm density_pathtracer_gpu.pfm
3030
$IMG_DIFF_TOOL ray_march_iterator.pfm ray_march_iterator_gpu.pfm 0.0001
3131
$IMG_DIFF_TOOL hit_iterator_renderer.pfm hit_iterator_renderer_gpu.pfm 0.00006
32-
$IMG_DIFF_TOOL interval_iterator_debug.pfm interval_iterator_debug_gpu.pfm 0.00003
32+
$IMG_DIFF_TOOL interval_iterator_debug.pfm interval_iterator_debug_gpu.pfm 0.00003

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ jobs:
6464
run: |
6565
# Adding execution bit to binaries is needed since upload/download GHA is using zip compression
6666
# and it can't preserve files permissions - https://github.com/actions/upload-artifact/issues/38
67-
chmod +x ./bin/*
67+
chmod +x ./bin/* ./lib/*
6868
6969
./bin/vklTutorialCPU
7070
./bin/vklTutorialISPC
71+
export LD_LIBRARY_PATH=./lib:$LD_LIBRARY_PATH
7172
./bin/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
7273
./bin/vklTestsCPU --durations yes
7374

‎.github/workflows/internal.benchmark.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,10 @@ jobs:
2121
force-delete: true # guarantees .gitattributes are respected in working dir
2222
submodules: true
2323
image: rockylinux:8
24+
dpcpp-version: intel/2025.2
2425
artifact-out: build-rocky8-icx
2526
artifact-path: ./build/install ./build/openvkl/build
2627
cmd: |
27-
module load cmake
28-
module load intel/2022.1
29-
export CC=icx
30-
export CXX=icpx
3128
export CXXFLAGS="-fPIC -fp-model=precise"
3229
export LDFLAGS="-static-intel"
3330
.github/scripts/build.sh
@@ -38,7 +35,6 @@ jobs:
3835
with:
3936
runs-on: '["vis-perf-x8280-1"]'
4037
artifact-in: build-rocky8-icx
41-
setup-benny: true
4238
cmd: |
4339
cd ./build/install
4440
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
@@ -49,7 +45,6 @@ jobs:
4945
with:
5046
runs-on: '["vis-perf-x8380-1"]'
5147
artifact-in: build-rocky8-icx
52-
setup-benny: true
5348
cmd: |
5449
cd ./build/install
5550
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
@@ -60,7 +55,6 @@ jobs:
6055
with:
6156
runs-on: '["vis-perf-i9-12900k-1"]'
6257
artifact-in: build-rocky8-icx
63-
setup-benny: true
6458
cmd: |
6559
cd ./build/install
6660
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
@@ -71,7 +65,6 @@ jobs:
7165
with:
7266
runs-on: '["vis-perf-a3970x-1"]'
7367
artifact-in: build-rocky8-icx
74-
setup-benny: true
7568
cmd: |
7669
cd ./build/install
7770
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
@@ -102,7 +95,6 @@ jobs:
10295
artifact-in: build-gpu
10396
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
10497
options: --device=/dev/dri:/dev/dri
105-
setup-benny: true
10698
cmd: |
10799
cd ./build/install
108100
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh GPU
@@ -113,11 +105,10 @@ jobs:
113105
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
114106
with:
115107
image: ubuntu:22.04
116-
runs-on: '[ "vis-perf-spr-pvc-01" ]'
108+
runs-on: '[ "pvc" ]'
117109
artifact-in: build-gpu
118110
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
119111
options: --device=/dev/dri:/dev/dri
120-
setup-benny: true
121112
cmd: |
122113
cd ./build/install
123-
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh GPU
114+
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh GPU

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,4 @@ jobs:
173173
options: --device=/dev/dri:/dev/dri
174174
cmd: |
175175
cd ./build/install
176-
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh
176+
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,4 @@ jobs:
158158
options: --device=/dev/dri:/dev/dri
159159
cmd: |
160160
cd ./build/install
161-
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh
161+
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
artifact-out: build-vdb
9696
artifact-path: ./build/install ./build/openvkl/build
9797
cmd: |
98+
dnf install gcc-toolset-11 -y
9899
.github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=ON"
99100
100101
# test jobs - per volume type
@@ -167,4 +168,4 @@ jobs:
167168
artifact-in: build-vdb
168169
image: rockylinux:8
169170
cmd: |
170-
./build/openvkl/build/vklTestsCPU --durations yes
171+
./build/openvkl/build/vklTestsCPU --durations yes

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

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
artifact-out: build-rocky8
2424
artifact-path: ./build/install ./build/openvkl/build
2525
cmd: |
26-
sudo dnf install gcc-toolset-11 -y
26+
dnf install gcc-toolset-11 -y
2727
scl enable gcc-toolset-11 .github/scripts/build.sh
2828
2929
test-rocky8:
@@ -46,13 +46,10 @@ jobs:
4646
force-delete: true # guarantees .gitattributes are respected in working dir
4747
submodules: true
4848
image: rockylinux:8
49+
dpcpp-version: intel/2025.2
4950
artifact-out: build-rocky8-icx
5051
artifact-path: ./build/install ./build/openvkl/build
5152
cmd: |
52-
module load cmake
53-
module load intel/2022.1
54-
export CC=icx
55-
export CXX=icpx
5653
export CXXFLAGS="-fPIC -fp-model=precise"
5754
export LDFLAGS="-static-intel"
5855
.github/scripts/build.sh
@@ -77,13 +74,10 @@ jobs:
7774
force-delete: true # guarantees .gitattributes are respected in working dir
7875
submodules: true
7976
image: rockylinux:8
77+
dpcpp-version: intel/2025.2
8078
artifact-out: build-rocky8-icx-tbb2020
8179
artifact-path: ./build/install ./build/openvkl/build
8280
cmd: |
83-
module load cmake
84-
module load intel/2022.1
85-
export CC=icx
86-
export CXX=icpx
8781
export CXXFLAGS="-fPIC -fp-model=precise"
8882
export LDFLAGS="-static-intel"
8983
.github/scripts/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH=""
@@ -108,13 +102,10 @@ jobs:
108102
force-delete: true # guarantees .gitattributes are respected in working dir
109103
submodules: true
110104
image: rockylinux:8
105+
dpcpp-version: intel/2025.2
111106
artifact-out: build-rocky8-icx-tbb2020-avx512_8
112107
artifact-path: ./build/install ./build/openvkl/build
113108
cmd: |
114-
module load cmake
115-
module load intel/2022.1
116-
export CC=icx
117-
export CXX=icpx
118109
export CXXFLAGS="-fPIC -fp-model=precise"
119110
export LDFLAGS="-static-intel"
120111
.github/scripts/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ISA_AVX512SKX_8_WIDE=ON -DOPENVKL_ISA_AVX512SKX=OFF"
@@ -157,33 +148,6 @@ jobs:
157148
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
158149
./build/openvkl/build/vklTestsCPU --durations yes
159150
160-
# uses a newer CMake which allows OpenVDB to build
161-
build-rocky9-module-cmake:
162-
secrets: inherit
163-
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
164-
with:
165-
force-delete: true # guarantees .gitattributes are respected in working dir
166-
submodules: true
167-
image: rockylinux:9
168-
artifact-out: build-rocky9-module-cmake
169-
artifact-path: ./build/install ./build/openvkl/build
170-
cmd: |
171-
module load cmake
172-
.github/scripts/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH=""
173-
174-
test-rocky9-module-cmake:
175-
needs: build-rocky9-module-cmake
176-
secrets: inherit
177-
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
178-
with:
179-
artifact-in: build-rocky9-module-cmake
180-
image: rockylinux:9
181-
cmd: |
182-
./build/openvkl/build/vklTutorialCPU
183-
./build/openvkl/build/vklTutorialISPC
184-
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
185-
./build/openvkl/build/vklTestsCPU --durations yes
186-
187151
build-ubuntu20_04:
188152
secrets: inherit
189153
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
@@ -194,7 +158,7 @@ jobs:
194158
artifact-out: build-ubuntu20_04
195159
artifact-path: ./build/install ./build/openvkl/build
196160
cmd: |
197-
.github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF -D BUILD_OPENVDB=OFF # OpenVDB need gcc v11.2, not available on Ubuntu 20.04
161+
.github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF
198162
199163
build-ubuntu22_04:
200164
secrets: inherit

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,5 @@ jobs:
8383
artifact-path: ./build/install/bin/*.pfm
8484
artifact-on-failure: true
8585
cmd: |
86-
# Prepare img_diff tool to be ready for CI usage (copy it on local runner)
87-
$img_diff_dir = $env:STORAGE_PATH + '\tools\img-diff\dist_windows'
88-
Copy-Item -Path "$img_diff_dir" -Destination $pwd\img-diff -Recurse
89-
$img_diff_path = "$pwd\img-diff\img_diff.exe"
90-
9186
cd $env:GITHUB_WORKSPACE/build/install/bin
92-
python $env:GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py "$img_diff_path"
87+
python $env:GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py "img_diff.exe"

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,5 @@ jobs:
6666
artifact-path: ./build/install/bin/*.pfm
6767
artifact-on-failure: true
6868
cmd: |
69-
# Prepare img_diff tool to be ready for CI usage (copy it on local runner)
70-
$img_diff_dir = $env:STORAGE_PATH + '\tools\img-diff\dist_windows'
71-
Copy-Item -Path "$img_diff_dir" -Destination $pwd\img-diff -Recurse
72-
$img_diff_path = "$pwd\img-diff\img_diff.exe"
73-
7469
cd $env:GITHUB_WORKSPACE/build/install/bin
75-
python $env:GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py "$img_diff_path"
70+
python $env:GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py "img_diff.exe"

0 commit comments

Comments
 (0)