Skip to content

Commit

Permalink
Merge branch 'release-2.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
gregjohnson committed Feb 12, 2024
2 parents 8b42f10 + 857957b commit 8c6ba52
Show file tree
Hide file tree
Showing 49 changed files with 582 additions and 513 deletions.
1 change: 1 addition & 0 deletions .github/deps/dpcpp-icx.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DPCPP_VERSION=icx/compiler_ppkg-rel/20240129
2 changes: 1 addition & 1 deletion .github/deps/dpcpp-sycl-nightly.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DPCPP_VERSION=intel-llvm/nightly-2023-09-22-rk
DPCPP_VERSION=intel-llvm/nightly-2023-10-26-rk
2 changes: 1 addition & 1 deletion .github/deps/gfx-windows-public.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GFX_DRIVER_VERSION=windows-101.4826
GFX_DRIVER_VERSION=windows-101.5186
11 changes: 1 addition & 10 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
setup-benny: true
cmd: |
cd ./build/install
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
benchmark-x8380-1:
Expand All @@ -47,7 +46,6 @@ jobs:
setup-benny: true
cmd: |
cd ./build/install
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
benchmark-i9-12900k-1:
Expand All @@ -59,7 +57,6 @@ jobs:
setup-benny: true
cmd: |
cd ./build/install
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
benchmark-a3970x-1:
Expand All @@ -71,7 +68,6 @@ jobs:
setup-benny: true
cmd: |
cd ./build/install
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh CPU
build-gpu:
Expand All @@ -82,13 +78,10 @@ jobs:
image: ubuntu:22.04
artifact-out: build-gpu
artifact-path: ./build/install ./build/openvkl/build
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
env-from-files: .github/deps/dpcpp-sycl-nightly.env
cmd: |
export CC=clang
export CXX=clang++
module load cmake/3.25.3
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
gitlab/build.sh -D BUILD_OPENVDB=OFF \
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON"
Expand All @@ -106,7 +99,6 @@ jobs:
setup-benny: true
cmd: |
cd ./build/install
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh GPU
perf-pvc:
Expand All @@ -122,5 +114,4 @@ jobs:
setup-benny: true
cmd: |
cd ./build/install
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
$GITHUB_WORKSPACE/.github/scripts/run-benchmarks.sh GPU
175 changes: 175 additions & 0 deletions .github/workflows/ci.linux.gpu.icx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
## Copyright 2023 Intel Corporation
## SPDX-License-Identifier: Apache-2.0

name: CI GPU ICX Linux Workflow
on:
push:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:

build-gpu:
secrets: inherit
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
artifact-out: build-gpu
artifact-path: ./build/install ./build/openvkl/build
env-from-files: .github/deps/dpcpp-icx.env
cmd: |
module load cmake/3.25.3
gitlab/build.sh -D BUILD_OPENVDB=OFF \
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON"
build-gpu-rel-with-dbg-info:
secrets: inherit
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
env-from-files: .github/deps/dpcpp-icx.env
cmd: |
module load cmake/3.25.3
gitlab/build.sh -D BUILD_OPENVDB=OFF \
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
-D CMAKE_BUILD_TYPE=RelWithDebInfo"
build-gpu-debug:
secrets: inherit
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
env-from-files: .github/deps/dpcpp-icx.env
cmd: |
module load cmake/3.25.3
gitlab/build.sh -D BUILD_OPENVDB=OFF \
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
-D CMAKE_BUILD_TYPE=Debug"
test-build-from-install-dg2:
needs: [ build-gpu ]
secrets: inherit
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
image: ubuntu:22.04
runs-on: '[ "Linux", "docker", "dg2" ]'
artifact-in: build-gpu
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env
options: --device=/dev/dri:/dev/dri
cmd: |
module load cmake/3.25.3
export PATH=`pwd`/build/install/bin:`pwd`/build/install:$PATH
gitlab/build-from-install.sh
test-pvc:
secrets: inherit
needs: [ build-gpu ]
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
runs-on: '[ "Linux", "docker", "pvc" ]'
artifact-in: build-gpu
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
options: --device=/dev/dri:/dev/dri
cmd: |
cd ./build/install/bin
./vklTutorialGPU
./vklTestsGPU --durations yes
test-examples-pvc:
secrets: inherit
needs: [ build-gpu ]
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
runs-on: '[ "Linux", "docker", "pvc" ]'
artifact-in: build-gpu
artifact-out: test-examples-pvc
artifact-path: ./build/install/bin/*.pfm
artifact-on-failure: true
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
options: --device=/dev/dri:/dev/dri
cmd: |
cd ./build/install/bin
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
test-cpu:
secrets: inherit
needs: [ build-gpu ]
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
runs-on: '[ "Linux", "docker", "build" ]'
artifact-in: build-gpu
env-from-files: .github/deps/dpcpp-icx.env
cmd: |
cd ./build/install/bin
./vklTutorialCPU
./vklTestsCPU --durations yes
test-dg2:
secrets: inherit
needs: [ build-gpu ]
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
runs-on: '[ "Linux", "docker", "dg2" ]'
artifact-in: build-gpu
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env
options: --device=/dev/dri:/dev/dri
cmd: |
cd ./build/install/bin
./vklTutorialGPU
./vklTestsGPU --durations yes
test-examples-dg2:
secrets: inherit
needs: [ build-gpu ]
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
runs-on: '[ "Linux", "docker", "dg2" ]'
artifact-in: build-gpu
artifact-out: test-examples-dg2
artifact-path: ./build/install/bin/*.pfm
artifact-on-failure: true
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env
options: --device=/dev/dri:/dev/dri
cmd: |
cd ./build/install/bin
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
test-examples-big-volume-pvc:
secrets: inherit
needs: [ build-gpu ]
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
with:
submodules: true
image: ubuntu:22.04
runs-on: '[ "Linux", "docker", "pvc" ]'
artifact-in: build-gpu
artifact-out: test-examples-big-volume-pvc
artifact-path: ./build/install/*.pfm
artifact-on-failure: true
env-from-files: .github/deps/dpcpp-icx.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
options: --device=/dev/dri:/dev/dri
cmd: |
cd ./build/install
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh
23 changes: 3 additions & 20 deletions .github/workflows/ci.linux.gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@ jobs:
image: ubuntu:22.04
artifact-out: build-gpu
artifact-path: ./build/install ./build/openvkl/build
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
env-from-files: .github/deps/dpcpp-sycl-nightly.env
cmd: |
module load cmake/3.25.3
export CC=clang
export CXX=clang++
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
gitlab/build.sh -D BUILD_OPENVDB=OFF \
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON"
Expand All @@ -37,13 +34,10 @@ jobs:
with:
submodules: true
image: ubuntu:22.04
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
env-from-files: .github/deps/dpcpp-sycl-nightly.env
cmd: |
module load cmake/3.25.3
export CC=clang
export CXX=clang++
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
gitlab/build.sh -D BUILD_OPENVDB=OFF \
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
Expand All @@ -55,13 +49,10 @@ jobs:
with:
submodules: true
image: ubuntu:22.04
level-zero-version: public/1.12.0 # It's needed to build ISPCRT
env-from-files: .github/deps/dpcpp-sycl-nightly.env
cmd: |
module load cmake/3.25.3
export CC=clang
export CXX=clang++
gitlab/build.sh -D BUILD_OPENVDB=OFF -D BUILD_ISPCRT_GPU=ON \
gitlab/build.sh -D BUILD_OPENVDB=OFF \
-D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \
-DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \
Expand All @@ -79,9 +70,6 @@ jobs:
options: --device=/dev/dri:/dev/dri
cmd: |
module load cmake/3.25.3
export CC=clang
export CXX=clang++
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
export PATH=`pwd`/build/install/bin:`pwd`/build/install:$PATH
gitlab/build-from-install.sh
Expand All @@ -97,7 +85,6 @@ jobs:
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
options: --device=/dev/dri:/dev/dri
cmd: |
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
cd ./build/install/bin
./vklTutorialGPU
./vklTestsGPU --durations yes
Expand All @@ -117,7 +104,6 @@ jobs:
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
options: --device=/dev/dri:/dev/dri
cmd: |
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
cd ./build/install/bin
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
Expand All @@ -133,7 +119,6 @@ jobs:
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
options: --device=/dev/dri:/dev/dri
cmd: |
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
cd ./build/install/bin
./vklTutorialGPU
./vklTestsGPU --durations yes
Expand All @@ -153,7 +138,6 @@ jobs:
env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
options: --device=/dev/dri:/dev/dri
cmd: |
export LD_LIBRARY_PATH=`pwd`/build/install/lib:$LD_LIBRARY_PATH
cd ./build/install/bin
python3 $GITHUB_WORKSPACE/.github/scripts/run-examples-tests.py $STORAGE_PATH/tools/img-diff/dist_linux/img_diff
Expand All @@ -173,5 +157,4 @@ jobs:
options: --device=/dev/dri:/dev/dri
cmd: |
cd ./build/install
export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
$GITHUB_WORKSPACE/.github/scripts/run-examples-big-volume-tests.sh
3 changes: 0 additions & 3 deletions .github/workflows/ci.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,6 @@ jobs:
artifact-in: build-linux-arch
image: ospray/docker-images:arch
cmd: |
export LD_LIBRARY_PATH=./build/install/lib
./build/openvkl/build/vklTutorialCPU
./build/openvkl/build/vklTutorialISPC
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
Expand All @@ -463,15 +462,13 @@ jobs:
prebuild: >
mkdir build &&
cd build &&
export LD_LIBRARY_PATH=`pwd`/install/lib:${LD_LIBRARY_PATH} &&
cmake -DBUILD_JOBS=`nproc` -DBUILD_DEPENDENCIES_ONLY=ON -DBUILD_GLFW=OFF "$@" ../superbuild &&
cmake --build . &&
mkdir openvkl_build &&
cd openvkl_build &&
DEP_INSTALL_DIR=`pwd`/../install &&
export rkcommon_DIR=$DEP_INSTALL_DIR &&
export embree_DIR=$DEP_INSTALL_DIR &&
export ispcrt_DIR=$DEP_INSTALL_DIR &&
cmake -DISPC_EXECUTABLE=$DEP_INSTALL_DIR/bin/ispc -DBUILD_EXAMPLES=OFF -DRKCOMMON_TBB_ROOT=$DEP_INSTALL_DIR ../.. &&
cd ../..
build: cmake --build ./build/openvkl_build
4 changes: 0 additions & 4 deletions .github/workflows/ci.mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
runs-on: '[ "macOS", "build", "x86_64" ]'
artifact-in: build-macOS
cmd: |
export DYLD_LIBRARY_PATH=./build/install/lib
./build/openvkl/build/vklTutorialCPU
./build/openvkl/build/vklTutorialISPC
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
Expand All @@ -57,7 +56,6 @@ jobs:
runs-on: '[ "macOS", "build", "x86_64" ]'
artifact-in: build-macOS-TBB2020
cmd: |
export DYLD_LIBRARY_PATH=./build/install/lib
./build/openvkl/build/vklTutorialCPU
./build/openvkl/build/vklTutorialISPC
./build/openvkl/build/vklExamplesCPU -batch -printStats -spp 50 -framebufferSize 1024 1024
Expand All @@ -84,7 +82,6 @@ jobs:
runs-on: '[ "macOS", "build", "arm" ]'
artifact-in: build-macOS-arm-neon
cmd: |
export DYLD_LIBRARY_PATH=./build/install/lib
export OPENVKL_LOG_LEVEL=debug # gives prints of current ISA and SIMD width
./build/openvkl/build/vklTutorialCPU
./build/openvkl/build/vklTutorialISPC
Expand Down Expand Up @@ -112,7 +109,6 @@ jobs:
runs-on: '[ "macOS", "build", "arm" ]'
artifact-in: build-macOS-arm-neon2x
cmd: |
export DYLD_LIBRARY_PATH=./build/install/lib
export OPENVKL_LOG_LEVEL=debug # gives prints of current ISA and SIMD width
./build/openvkl/build/vklTutorialCPU
./build/openvkl/build/vklTutorialISPC
Expand Down
Loading

0 comments on commit 8c6ba52

Please sign in to comment.