Merge branch 'release-2.12.x'

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

@@ -15,60 +15,90 @@ jobs:
 
 ### BUILD JOBS ###
 
-  build-ubuntu2204-DG2-JIT:
+  build-ubuntu2204:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
     secrets: inherit
     with:
       force-delete: true    # guarantees .gitattributes are respected in working dir
-      gfx-driver-version: neo-builds/ci/master/ci-neo-master-025731/artifacts/linux/ubuntu/22.04
-      dpcpp-version: sycl-nightly/20221214
-      install-gfx-driver: true
-      submodules: true
       image: ubuntu:22.04
+      env-from-files: .github/workflows/dpcpp-sycl-nightly.env
+      level-zero-version: public/1.9.9
+      submodules: true
       cmd: |
         export SYCL_BUNDLE_ROOT=$DPCPP_ROOT
         export CC=clang
         export CXX=clang++
-        scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_MODULE_MULTIDEVICE=OFF -DBUILD_GPU_SUPPORT=ON -DOPENVKL_URL=https://${RENDERKIT_GITHUB_TOKEN}@github.com/intel-innersource/libraries.graphics.renderkit.openvkl.git -DOPENVKL_BRANCH=gpu-devel
-      artifact-out: build-ubuntu2204-DG2-JIT
+        scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_MODULE_MULTIDEVICE=OFF -DBUILD_GPU_SUPPORT=ON -DBUILD_OIDN=ON -DOPENVKL_URL=https://${RENDERKIT_GITHUB_TOKEN}@github.com/intel-innersource/libraries.graphics.renderkit.openvkl.git -DOPENVKL_BRANCH=gpu-devel -DRKCOMMON_VERSION=devel
+      artifact-out: build-ubuntu2204
       artifact-path: build/install/ospray build/install/embree build/CMakeCache.txt build/*/build/CMakeCache.txt
 
-  build-ubuntu2204-DG2-JIT-mpi:
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@tgt/support_oneapi_icx
+  build-ubuntu2204-devel:
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
     secrets: inherit
     with:
       force-delete: true    # guarantees .gitattributes are respected in working dir
-      gfx-driver-version: neo-builds/ci/master/ci-neo-master-025731/artifacts/linux/ubuntu/22.04
-      dpcpp-version: intel/2023.0
-      install-gfx-driver: true
+      image: ubuntu:22.04
+      env-from-files: .github/workflows/dpcpp-sycl-nightly.env
+      level-zero-version: public/1.9.9
       submodules: true
+      cmd: |
+        export SYCL_BUNDLE_ROOT=$DPCPP_ROOT
+        export CC=clang
+        export CXX=clang++
+        scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_MODULE_MULTIDEVICE=OFF -DBUILD_GPU_SUPPORT=ON -DBUILD_OIDN=ON -DOPENVKL_URL=https://${RENDERKIT_GITHUB_TOKEN}@github.com/intel-innersource/libraries.graphics.renderkit.openvkl.git -DOPENVKL_BRANCH=gpu-devel -DRKCOMMON_VERSION=devel
+      artifact-out: build-ubuntu2204-devel
+      artifact-path: build/install/ospray build/install/embree build/CMakeCache.txt build/*/build/CMakeCache.txt
+
+  build-ubuntu2204-mpi:
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    secrets: inherit
+    with:
+      force-delete: true    # guarantees .gitattributes are respected in working dir
       image: ubuntu:22.04
+      env-from-files: .github/workflows/dpcpp-sycl-public.env
+      level-zero-version: public/1.9.9
+      submodules: true
       cmd: |
         sudo apt remove openmpi-* libopenmpi3 -y
-        module load level-zero/1.9.4
         module load mpi
         export CC=icx
         export CXX=icpx
-        scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_OSPRAY_MODULE_MULTIDEVICE=OFF -DBUILD_GPU_SUPPORT=ON -DOPENVKL_URL=https://${RENDERKIT_GITHUB_TOKEN}@github.com/intel-innersource/libraries.graphics.renderkit.openvkl.git -DOPENVKL_BRANCH=gpu-devel
-      artifact-out: build-ubuntu2204-DG2-JIT-mpi
+        scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_OSPRAY_MODULE_MULTIDEVICE=OFF -DBUILD_GPU_SUPPORT=ON -DOPENVKL_URL=https://${RENDERKIT_GITHUB_TOKEN}@github.com/intel-innersource/libraries.graphics.renderkit.openvkl.git -DOPENVKL_BRANCH=gpu-devel -DRKCOMMON_VERSION=devel
+      artifact-out: build-ubuntu2204-mpi
       artifact-path: build/install/ospray build/install/embree build/CMakeCache.txt build/*/build/CMakeCache.txt
 
+  build-suse:
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    secrets: inherit
+    with:
+      force-delete: true    # guarantees .gitattributes are respected in working dir
+      image: opensuse/leap:15.3
+      env-from-files: .github/workflows/dpcpp-sycl-nightly.env
+      level-zero-version: public/1.9.9
+      submodules: true
+      cmd: |
+        export SYCL_BUNDLE_ROOT=$DPCPP_ROOT
+        export CC=clang
+        export CXX=clang++
+        scripts/build/linux.sh -DBUILD_GLFW=ON -DBUILD_OSPRAY_MODULE_MULTIDEVICE=OFF -DBUILD_GPU_SUPPORT=ON -DOPENVKL_URL=https://${RENDERKIT_GITHUB_TOKEN}@github.com/intel-innersource/libraries.graphics.renderkit.openvkl.git -DOPENVKL_BRANCH=gpu-devel -DRKCOMMON_VERSION=devel
+      artifact-out: build-suse
+      artifact-path: build/install/ospray build/install/embree build/CMakeCache.txt build/*/build/CMakeCache.txt
+
+
 ### TEST JOBS ###
 
-  test-ubuntu2204-DG2-JIT:
-    needs: [build-ubuntu2204-DG2-JIT]
+  test-ubuntu2204-dg2:
+    needs: [build-ubuntu2204]
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
     secrets: inherit
     with:
-      gfx-driver-version: neo-builds/ci/master/ci-neo-master-025731/artifacts/linux/ubuntu/22.04
-      dpcpp-version: sycl-nightly/20221214
-      install-gfx-driver: true
-      submodules: true
       image: ubuntu:22.04
+      env-from-files: .github/workflows/dpcpp-sycl-nightly.env .github/workflows/gfx-ubuntu22.env
+      submodules: true
       options: --device=/dev/dri:/dev/dri
       runs-on: '[ "Linux", "docker", "dg2" ]'
-      artifact-in: build-ubuntu2204-DG2-JIT
-      artifact-out: test-ubuntu2204-DG2-JIT
+      artifact-in: build-ubuntu2204
+      artifact-out: test-ubuntu2204-dg2
       artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
       artifact-on-failure: true
       cmd: |
@@ -79,26 +109,70 @@ jobs:
         export PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH"
         scripts/tests/run_gpu_tests.sh "$GITHUB_WORKSPACE"
 
-  test-ubuntu2204-DG2-JIT-mpi:
-    needs: [build-ubuntu2204-DG2-JIT-mpi]
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@tgt/support_oneapi_icx
+  test-ubuntu2204-pvc:
+    needs: [build-ubuntu2204]
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
     secrets: inherit
     with:
-      gfx-driver-version: neo-builds/ci/master/ci-neo-master-025731/artifacts/linux/ubuntu/22.04
-      dpcpp-version: intel/2023.0
-      install-gfx-driver: true
+      image: ubuntu:22.04
+      env-from-files: .github/workflows/dpcpp-sycl-nightly.env .github/workflows/gfx-ubuntu22.env
       submodules: true
+      options: --device=/dev/dri:/dev/dri
+      runs-on: '[ "Linux", "docker", "pvc" ]'
+      artifact-in: build-ubuntu2204
+      artifact-out: test-ubuntu2204-pvc
+      artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
+      artifact-on-failure: true
+      cmd: |
+        export SYCL_BUNDLE_ROOT=$DPCPP_ROOT
+        export CC=clang
+        export CXX=clang++
+        export LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$GITHUB_WORKSPACE/build/install/embree/lib:$LD_LIBRARY_PATH"
+        export PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH"
+        scripts/tests/run_gpu_tests.sh "$GITHUB_WORKSPACE"
+
+  test-ubuntu2204-devel-dg2:
+    needs: [build-ubuntu2204-devel]
+    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-sycl-nightly.env .github/workflows/gfx-ubuntu22-internal.env
+      submodules: true
       options: --device=/dev/dri:/dev/dri
       runs-on: '[ "Linux", "docker", "dg2" ]'
-      artifact-in: build-ubuntu2204-DG2-JIT-mpi
-      artifact-out: test-ubuntu2204-DG2-JIT-mpi
+      artifact-in: build-ubuntu2204-devel
+      artifact-out: test-ubuntu2204-devel-dg2
       artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
       artifact-on-failure: true
       cmd: |
-        sudo apt remove openmpi-* libopenmpi3 -y
-        module load level-zero/1.9.4
-        module load mpi
+        export SYCL_BUNDLE_ROOT=$DPCPP_ROOT
+        export CC=clang
+        export CXX=clang++
         export LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$GITHUB_WORKSPACE/build/install/embree/lib:$LD_LIBRARY_PATH"
         export PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH"
-        scripts/tests/run_gpu_tests.sh "$GITHUB_WORKSPACE" TEST_MPI
+        scripts/tests/run_gpu_tests.sh "$GITHUB_WORKSPACE"
+
+#  test-ubuntu2204-DG2-JIT-mpi:
+#    needs: [build-ubuntu2204-DG2-JIT-mpi]
+#    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+#    secrets: inherit
+#    with:
+#      allow-failure: true
+#      gfx-driver-version: gfx-driver-builds/ci/comp_igc/gfx-driver-ci-comp_igc-19476/artifacts/Linux/Ubuntu/22.04/Release
+#      dpcpp-version: intel/2023.0
+#      submodules: true
+#      image: ubuntu:22.04
+#      options: --device=/dev/dri:/dev/dri
+#      runs-on: '[ "Linux", "docker", "dg2" ]'
+#      artifact-in: build-ubuntu2204-DG2-JIT-mpi
+#      artifact-out: test-ubuntu2204-DG2-JIT-mpi
+#      artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
+#      artifact-on-failure: true
+#      cmd: |
+#        sudo apt remove openmpi-* libopenmpi3 -y
+#        module load level-zero/1.9.9
+#        module load mpi
+#        export LD_LIBRARY_PATH="$GITHUB_WORKSPACE/build/install/ospray/lib:$GITHUB_WORKSPACE/build/install/embree/lib:$LD_LIBRARY_PATH"
+#        export PATH="$GITHUB_WORKSPACE/build/install/ospray/bin:$PATH"
+#        scripts/tests/run_gpu_tests.sh "$GITHUB_WORKSPACE" TEST_MPI

.github/workflows/ci.linux.yml

@@ -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
+        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
 
   build-arch-gcc:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
@@ -62,7 +62,7 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       image: centos:7
       cmd: |
-        scripts/build/linux.sh -DBUILD_ISA_AVX512=OFF # TODO Embree source build incompatible with older GCC for AVX512
+        scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_ISA_AVX512=OFF
       artifact-out: build-centos7-gcc
       artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt
 
@@ -108,11 +108,10 @@ jobs:
         export CXXFLAGS="-fhonor-infinities -fhonor-nans"
         export CFLAGS=$CXXFLAGS
         export LDFLAGS="-static-intel"
-        scripts/build/linux.sh
+        scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON
       artifact-out: build-centos7-icx
       artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt
 
-  # TODO: Enable AVX512 testing after Embree4 release
   build-centos7-mpi-impi:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     secrets: inherit
@@ -122,11 +121,10 @@ jobs:
       cmd: |
         module load cmake
         module load impi/2021.6
-        scripts/build/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
+        scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
       artifact-out: build-centos7-mpi-impi
       artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt
 
-  # TODO: Enable AVX512 testing after Embree4 release
   build-centos7-mpi-mpich:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     secrets: inherit
@@ -136,11 +134,10 @@ jobs:
       cmd: |
         module load cmake
         module load mpi/mpich-x86_64
-        scripts/build/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
+        scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
       artifact-out: build-centos7-mpi-mpich
       artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt
 
-  # TODO: Enable AVX512 testing after Embree4 release
   build-centos7-mpi-openmpi:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     secrets: inherit
@@ -150,7 +147,7 @@ jobs:
       cmd: |
         module load cmake
         module load mpi/openmpi-x86_64
-        scripts/build/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
+        scripts/build/linux.sh -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_ISA_AVX512=OFF
 
   build-centos8:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
@@ -197,15 +194,14 @@ jobs:
       artifact-out: build-linux-debug
       artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt
 
-  # TODO: Enable AVX512 testing after Embree4 release
   build-ubuntu1804-gcc:
     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:18.04
       cmd: |
-        scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_ISA_AVX512=OFF
+        scripts/build/linux.sh -G Ninja -DBUILD_GLFW=OFF
       artifact-out: build-ubuntu1804-gcc
       artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt
 
@@ -227,7 +223,6 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       image: centos:7
-      runs-on: '["Linux", "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
       artifact-in: build-centos7-gcc
@@ -256,7 +251,6 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       image: centos:7
-      runs-on: '["Linux", "avx2"]'
       cmd: |
         module load cmake
         module load mpi/mpich-x86_64
@@ -279,6 +273,19 @@ jobs:
       artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
       artifact-on-failure: true
 
+  test-centos7-icx-avx512skx:
+    needs: build-centos7-icx
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
+    with:
+      image: centos:7
+      runs-on: '["Linux", "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
+      artifact-in: build-centos7-icx
+      artifact-out: test-centos7-icx-avx512skx
+      artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
+      artifact-on-failure: true
+
   test-centos8-avx512skx:
     needs: build-centos8
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
@@ -305,18 +312,14 @@ jobs:
         cmake --build .
       artifact-in: build-centos7-gcc
 
-  # TODO: Enable AVX512 testing after Embree4 release
   test-ubuntu1804-gcc-avx512skx:
     needs: build-ubuntu1804-gcc
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       image: ubuntu:18.04
-      # runs-on: '["Linux", "avx512"]'
-      runs-on: '["Linux", "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" AVX512SKX
+      runs-on: '["Linux", "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" AVX2
+        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
       artifact-in: build-ubuntu1804-gcc
       artifact-out: test-ubuntu1804-gcc-avx512skx
       artifact-path: build_regression_tests/tests*.xml build_regression_tests/failed*
@@ -353,7 +356,6 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       image: centos:7
-      runs-on: '["Linux", "avx2"]' # TODO: Remove it after Embree4 release
       cmd: scripts/tests/run_tutorials.sh
       artifact-in: build-centos7-gcc
 

.github/workflows/ci.macos.yml

@@ -44,7 +44,7 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '["macOS", "arm", "build"]'
       cmd: |
-        scripts/build/macosx.sh -DCMAKE_TOOLCHAIN_FILE=../scripts/superbuild/toolchains/macos-rosetta.cmake -DBUILD_TBB_FROM_SOURCE=ON -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_ISA_AVX=OFF -DBUILD_ISA_AVX2=OFF -DBUILD_ISA_AVX512=OFF
+        scripts/build/macosx.sh -DCMAKE_TOOLCHAIN_FILE=../scripts/superbuild/toolchains/macos-rosetta.cmake -DBUILD_TBB_FROM_SOURCE=ON -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_OIDN=ON -DBUILD_OIDN_FROM_SOURCE=ON -DBUILD_ISA_AVX=OFF -DBUILD_ISA_AVX2=OFF -DBUILD_ISA_AVX512=OFF
       artifact-out: build-osx-x64
       artifact-path: build/install/ospray build/CMakeCache.txt build/*/build/CMakeCache.txt
 

.github/workflows/dpcpp-sycl-nightly.env

@@ -0,0 +1 @@
+DPCPP_VERSION=sycl-nightly/20230304

.github/workflows/dpcpp-sycl-public.env

@@ -0,0 +1 @@
+DPCPP_VERSION=intel-llvm/sycl-nightly/20230304

.github/workflows/gfx-ubuntu22-internal.env

@@ -0,0 +1 @@
+GFX_DRIVER_VERSION=neo-builds/ci/master/ci-neo-master-026248/artifacts/linux/ubuntu/22.04

.github/workflows/gfx-ubuntu22.env

@@ -0,0 +1 @@
+GFX_DRIVER_VERSION=gfx-driver-builds/ci/comp_igc/gfx-driver-ci-comp_igc-21027/artifacts/Linux/Ubuntu/22.04/Release