Skip to content

Commit

Permalink
Merge branch 'release-3.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
johguenther committed Oct 18, 2023
2 parents 0811129 + b54e4f4 commit 66fa810
Show file tree
Hide file tree
Showing 365 changed files with 11,130 additions and 6,685 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*.rc text working-tree-encoding=UTF-16LE-BOM eol=CRLF
glfw.patch eol=lf
*.patch eol=lf
2 changes: 1 addition & 1 deletion .github/workflows/baseline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: ubuntu:20.04
runs-on: '["Linux", "avx2"]'
runs-on: '"avx2"'
cmd: |
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH
export PATH=$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
needs: build-centos8
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main
with:
runs-on: '["vis-perf-x8280-1"]'
runs-on: '"vis-perf-x8280-1"'
cmd: |
scripts/tests/run-benchmarks.sh
artifact-in: build-centos8
Expand All @@ -42,7 +42,7 @@ jobs:
needs: build-centos8
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main
with:
runs-on: '["vis-perf-x8380-1"]'
runs-on: '"vis-perf-x8380-1"'
cmd: |
scripts/tests/run-benchmarks.sh
artifact-in: build-centos8
Expand All @@ -51,7 +51,7 @@ jobs:
needs: build-centos8
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main
with:
runs-on: '["vis-perf-a3970x-1"]'
runs-on: '"vis-perf-a3970x-1"'
cmd: |
scripts/tests/run-benchmarks.sh
artifact-in: build-centos8
Expand All @@ -60,7 +60,7 @@ jobs:
needs: build-centos8
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main
with:
runs-on: '["vis-perf-i9-12900k-1"]'
runs-on: '"vis-perf-i9-12900k-1"'
cmd: |
scripts/tests/run-benchmarks.sh
artifact-in: build-centos8
261 changes: 169 additions & 92 deletions .github/workflows/ci.linux.gpu.yml

Large diffs are not rendered by default.

114 changes: 87 additions & 27 deletions .github/workflows/ci.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
cmd: |
export CC=clang
export CXX=clang++
scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DBUILD_OIDN=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_OSPRAY_MODULE_MULTIDEVICE=ON
scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_OSPRAY_MODULE_MULTIDEVICE=ON
build-arch-gcc:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
Expand All @@ -53,7 +53,7 @@ jobs:
force-delete: true # guarantees .gitattributes are respected in working dir
image: ospray/docker-images:arch
cmd: |
scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DBUILD_OIDN=ON
scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON
build-centos7-gcc:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
Expand All @@ -62,7 +62,7 @@ jobs:
force-delete: true # guarantees .gitattributes are respected in working dir
image: centos:7
cmd: |
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_ISA_AVX512=OFF
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OIDN=OFF -DBUILD_ISA_AVX512=OFF -DTBB_VERSION=2021.9.0
artifact-out: build-centos7-gcc
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
export CXXFLAGS="-fhonor-infinities -fhonor-nans"
export CFLAGS=$CXXFLAGS
export LDFLAGS="-static-intel"
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OIDN=OFF -DTBB_VERSION=2021.9.0
artifact-out: build-centos7-icx
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

Expand All @@ -121,7 +121,7 @@ jobs:
cmd: |
module load cmake
module load impi/2021.6
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OIDN=OFF -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF -DTBB_VERSION=2021.9.0
artifact-out: build-centos7-mpi-impi
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

Expand All @@ -134,7 +134,7 @@ jobs:
cmd: |
module load cmake
module load mpi/mpich-x86_64
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OIDN=OFF -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF -DTBB_VERSION=2021.9.0
artifact-out: build-centos7-mpi-mpich
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

Expand All @@ -147,7 +147,7 @@ jobs:
cmd: |
module load cmake
module load mpi/openmpi-x86_64
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OIDN=OFF -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF -DTBB_VERSION=2021.9.0
build-centos8:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
Expand Down Expand Up @@ -180,6 +180,19 @@ jobs:
module load mpi/openmpi-x86_64
scripts/build/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
build-rocky8-oidn-mpi:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
secrets: inherit
with:
force-delete: true # guarantees .gitattributes are respected in working dir
image: rockylinux:8.7
cmd: |
module load cmake/3.15.2
module load mpi/mpich-x86_64
scripts/build/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
artifact-out: build-rocky8-oidn-mpi
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

build-linux-debug:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
secrets: inherit
Expand All @@ -190,7 +203,7 @@ jobs:
export CFLAGS=-fsanitize=address
export CXXFLAGS=-fsanitize=address
export LDFLAGS=-fsanitize=address
scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DCMAKE_BUILD_TYPE=Debug
scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DCMAKE_BUILD_TYPE=Debug -DBUILD_OIDN=OFF
artifact-out: build-linux-debug
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

Expand All @@ -216,6 +229,17 @@ jobs:
artifact-out: build-ubuntu2004-gcc
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

build-ubuntu2204-oidn-mpi:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
secrets: inherit
with:
force-delete: true # guarantees .gitattributes are respected in working dir
image: ubuntu:22.04
cmd: |
scripts/build/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
artifact-out: build-ubuntu2204-oidn-mpi
artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt

### TEST JOBS ###

test-centos7-gcc-avx2:
Expand All @@ -224,7 +248,7 @@ jobs:
with:
image: centos:7
cmd: |
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2
artifact-in: build-centos7-gcc
artifact-out: test-centos7-gcc-avx2
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
Expand All @@ -235,12 +259,12 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: centos:7
runs-on: '["Linux", "avx2"]'
runs-on: '"avx2"'
cmd: |
module load cmake
I_MPI_OFI_LIBRARY_INTERNAL=no module load impi/2021.6
export FI_PROVIDER=sockets
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2 TEST_MPI
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2 TEST_MPI
artifact-in: build-centos7-mpi-impi
artifact-out: test-centos7-gcc-mpi-impi-avx2
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
Expand All @@ -254,7 +278,7 @@ jobs:
cmd: |
module load cmake
module load mpi/mpich-x86_64
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2 TEST_MPI
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2 TEST_MPI
artifact-in: build-centos7-mpi-mpich
artifact-out: test-centos7-gcc-mpi-mpich-avx2
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
Expand All @@ -265,9 +289,9 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: centos:7
runs-on: '["Linux", "avx2"]'
runs-on: '"avx2"'
cmd: |
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2
artifact-in: build-centos7-icx
artifact-out: test-centos7-icx-avx2
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
Expand All @@ -278,9 +302,9 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: centos:7
runs-on: '["Linux", "avx512"]'
runs-on: '"avx512"'
cmd: |
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX
artifact-in: build-centos7-icx
artifact-out: test-centos7-icx-avx512skx
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
Expand All @@ -291,14 +315,30 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: centos:8
runs-on: '["Linux", "avx512"]'
runs-on: '"avx512"'
cmd: |
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX
artifact-in: build-centos8
artifact-out: test-centos8-avx512skx
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
artifact-on-failure: true

test-rocky8-oidn-mpi-avx512skx:
needs: build-rocky8-oidn-mpi
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: rockylinux:8.7
runs-on: '"avx512"'
cmd: |
module load cmake/3.15.2
module load mpi/mpich-x86_64
export OIDN_DEFAULT_DEVICE=cpu
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX TEST_MPI
artifact-in: build-rocky8-oidn-mpi
artifact-out: test-rocky8-oidn-mpi-avx512skx
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
artifact-on-failure: true

test-find-ospray:
needs: build-centos7-gcc
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
Expand All @@ -317,9 +357,9 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: ubuntu:18.04
runs-on: '["Linux", "avx512"]'
runs-on: '"avx512"'
cmd: |
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX
artifact-in: build-ubuntu1804-gcc
artifact-out: test-ubuntu1804-gcc-avx512skx
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
Expand All @@ -330,9 +370,9 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: ubuntu:20.04
runs-on: '["Linux", "avx2"]'
runs-on: '"avx2"'
cmd: |
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX2
artifact-in: build-ubuntu2004-gcc
artifact-out: test-ubuntu2004-gcc-avx2
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
Expand All @@ -343,14 +383,36 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: ubuntu:20.04
runs-on: '["Linux", "avx512"]'
runs-on: '"avx512"'
cmd: |
LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX TEST_MULTIDEVICE
PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$GITHUB_WORKSPACE" AVX512SKX TEST_MULTIDEVICE
artifact-in: build-ubuntu2004-gcc
artifact-out: test-ubuntu2004-gcc-avx512skx
artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
artifact-on-failure: true

test-ubuntu2204-oidn-mpi-avx2-dg2:
needs: build-ubuntu2204-oidn-mpi
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
secrets: inherit
with:
image: ubuntu:22.04
env-from-files: .github/workflows/dpcpp-release.env .github/workflows/gfx-ubuntu22-release.env
submodules: true
options: --device=/dev/dri:/dev/dri
runs-on: '"dg2"'
cmd: |
export PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH"
export OIDN_DEFAULT_DEVICE=sycl
export OIDN_VERBOSE=2
mkdir build_regression_tests
cd build_regression_tests
cmake -D OSPRAY_TEST_ISA=AVX2 $GITHUB_WORKSPACE/test_image_data
cmake --build . --target ospray_test_data
ospTestSuite --baseline-dir=regression_test_baseline --gtest_filter="DenoiserOp.DenoiserOp"
OMPI_ALLOW_RUN_AS_ROOT=1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 mpiexec -np 1 ospTestSuite --baseline-dir=regression_test_baseline --gtest_filter="DenoiserOp.DenoiserOp" --osp:load-modules=mpi_offload --osp:device=mpiOffload : -np 2 ospray_mpi_worker
artifact-in: build-ubuntu2204-oidn-mpi

test-tutorials:
needs: build-centos7-gcc
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
Expand All @@ -364,12 +426,10 @@ jobs:
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
with:
image: ospray/docker-images:arch
# Uses WA for LeakSanitizer fatal error, https://github.com/google/sanitizers/issues/1322
cmd: |
export LSAN_OPTIONS="suppressions=$GITHUB_WORKSPACE/scripts/tests/sanitize_ignore.txt"
export ASAN_OPTIONS="intercept_tls_get_addr=0"
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/build/install/ospray/lib:$LD_LIBRARY_PATH
export PATH=$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH
export TBB_ENABLE_SANITIZERS=1
scripts/tests/run_tests.sh $GITHUB_WORKSPACE AVX512SKX
build/install/ospray/bin/ospBenchmark --benchmark_min_time=0
artifact-in: build-linux-debug
Expand Down
Loading

0 comments on commit 66fa810

Please sign in to comment.