Merge branch 'release-0.13.x'

RenderKit · Oct 25, 2023 · d2c83a6 · d2c83a6
2 parents 38b2ad7 + 6526b2f
commit d2c83a6
Show file tree

Hide file tree

Showing 94 changed files with 24,719 additions and 820 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/cache-ospray.yml b/.github/workflows/cache-ospray.yml
@@ -55,18 +55,6 @@ jobs:
           if [[ ! -d "${{ inputs.cache-dir }}/ospray-${{ inputs.ospray-version }}" ]]
           then
             echo "Building " ${{ inputs.cache-dir }}/ospray-${{ inputs.ospray-version }}
-            if [ "${{ inputs.image }}" = "centos:7" ]
-            then
-              # *** CentOS 7 specific build ***
-              # CentOS 7, due to its extremely old glibc, requires everything built from source
-              echo "... CentOS 7 build"
-              module load intel/2022.1
-              export CC=icx
-              export CXX=icpx
-              export CXXFLAGS="-fhonor-infinities -fhonor-nans"
-              export CFLAGS=$CXXFLAGS
-            fi
-
             cmake -L -S ospray-${{ inputs.ospray-version }}/scripts/superbuild -B ospray-${{ inputs.ospray-version }}/build -DBUILD_OIDN=ON -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_RKCOMMON_VERSION=${{ inputs.rkcommon-version }} -DINSTALL_IN_SEPARATE_DIRECTORIES=OFF
             cmake --build ospray-${{ inputs.ospray-version }}/build
             cp -r ospray-${{ inputs.ospray-version }} ${{ inputs.cache-dir }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,7 +72,7 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       image: rockylinux:8.7
       cmd: |
-        module load cmake/3.15.2
+        module load cmake/3.25.3
         module load intel/2023.0
         export CC=icx
         export CXX=icpx
@@ -85,34 +85,34 @@ jobs:
 
   ## Dev Build Jobs ##
   ## Linux
-  cache-ospray-centos7:
+  cache-ospray-rocky8-7:
     secrets: inherit
     uses: ./.github/workflows/cache-ospray.yml
     with:
-      image: centos:7
+      image: rockylinux:8.7
       ospray-version: devel
       rkcommon-version: devel
 
-  build-centos7-dev:
-    needs: cache-ospray-centos7
+  build-rocky8-7-dev:
+    needs: cache-ospray-rocky8-7
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: centos:7
+      image: rockylinux:8.7
       cmd: |
-        module load cmake/3.15.2
+        module load cmake/3.25.3
         module load intel/2022.1
         export CC=icx
         export CXX=icpx
         export CXXFLAGS="-fhonor-infinities -fhonor-nans"
         export CFLAGS=$CXXFLAGS
-        export CACHE_DIR=${{ needs.cache-ospray-centos7.outputs.cache-dir }}
-        export OSPRAY_VER=${{ needs.cache-ospray-centos7.outputs.ospray-version }}
+        export CACHE_DIR=${{ needs.cache-ospray-rocky8-7.outputs.cache-dir }}
+        export OSPRAY_VER=${{ needs.cache-ospray-rocky8-7.outputs.ospray-version }}
         export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install
         export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb
         cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
         cmake --build build -- -j`nproc`
       artifact-path: build
-      artifact-out: build-centos7-dev
+      artifact-out: build-rocky8-7-dev
 
   ## MacOS
   build-macos-clang-dev:
@@ -142,32 +142,37 @@ jobs:
         cmake --build build-win-msvc16 --parallel $env:NUMBER_OF_PROCESSORS --config Release --target install
 
   ## Dev Test Jobs
-  test-run-centos7-dev:
-    needs: build-centos7-dev
+  test-run-rocky8-7-dev:
+    needs: build-rocky8-7-dev
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      # Run the centos07-dev build on the ubuntu 18.04 image as a test, and because it has vncserver installed
-      image: ubuntu:18.04
+      # Run the rocky8-7-dev build on the ubuntu 18.04 image as a test, and because it has vncserver installed
+      image: rockylinux:8.7-tgt-rebuild
+      pre-cmd: yum -y install tigervnc-server mesa-libGLU
       cmd: |
         module load intel/2023.0
         build/ospStudio --verify_install
         export CACHE_DIR=/NAS/ci-cache
         export OSPRAY_VER=devel
         gitlab/run-dev.sh
         gitlab/run-dev-img-cmp.sh
-      artifact-in: build-centos7-dev
-      artifact-path: build/model-results
-      artifact-out: test-run-centos7-dev
+      artifact-in: build-rocky8-7-dev
+      artifact-path: build/model-results build/cert-tests/*
+      artifact-out: test-run-rocky8-7-dev
       artifact-on-failure: true
 
-  ### KW Jobs ###
-# static-analysis:
-#   secrets: inherit
-#   uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@tgt/ospray-studio
-#   with:
-#     project: ospray_studio
-#     image: ubuntu:18.04-tgt-klockwork
-#     prebuild: |
-#       cmake -L -S . -B build -DCMAKE_INSTALL_PREFIX=install -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
-#     build: cmake --build build
-
+  ### Devel Coverity Job ###
+  static-analysis:
+    needs: cache-ospray-rocky8-7
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@main
+    with:
+      project: OSPRay Studio
+      prebuild: >
+        module load cmake/3.25.3 &&
+        export CACHE_DIR=${{ needs.cache-ospray-rocky8-7.outputs.cache-dir }} &&
+        export OSPRAY_VER=${{ needs.cache-ospray-rocky8-7.outputs.ospray-version }} &&
+        export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install/lib64/cmake/ospray-3.0.0 &&
+        export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb &&
+        cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
+      build: cmake --build build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,9 +26,10 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       force-delete: true    # guarantees .gitattributes are respected in working dir
-      image: rockylinux:8.7
+#      image: rockylinux:8.7
+      image: ubuntu:22.04 # temp, to use OSPRay v3.0.0 SYCL build
       cmd: |
-        module load cmake/3.15.2
+        module load cmake/3.25.3
         module load intel/2023.0
         export CC=icx
         export CXX=icpx
@@ -68,8 +69,10 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       # Run the rockylinux 8.7 build on the ubuntu 18.04 image as a test, and because it has vncserver installed
-      image: ubuntu:18.04
-      pre-cmd: apt install libglu1-mesa
+      #image: ubuntu:18.04
+      #image: rockylinux:8.7-tgt-rebuild
+      image: ubuntu:22.04 # temp, to use OSPRay v3.0.0 SYCL build
+      #pre-cmd: yum -y install tigervnc-server mesa-libGLU
       cmd: |
         module load intel/2023.0
         tar -xzf build/package/ospray_studio*.gz
@@ -81,6 +84,21 @@ jobs:
         gitlab/run.sh
       artifact-in: release-linux
 
+  test-run-linux-gpu:
+    needs: release-linux
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    with:
+      image: ubuntu:22.04
+      runs-on: '"dg2"'
+      options: --device=/dev/dri:/dev/dri
+      gfx-driver-version: linux-latest
+      cmd: |
+        module load intel/2023.0
+        tar -xzf build/package/ospray_studio*.gz
+        export PATH=$GITHUB_WORKSPACE/$(ls -d1 ./ospray_studio-*/bin):$PATH
+        gitlab/run.sh --osp:load-modules=gpu --osp:device=gpu
+      artifact-in: release-linux
+
   ## Windows ##
   test-release-windows-zip:
     needs: release-windows
@@ -117,30 +135,31 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/cache-ospray.yml
     with:
-      image: centos:7
+      image: rockylinux:8.7
       ospray-version: devel
       rkcommon-version: devel
 
+  composition-analysis:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/composition_analysis.yml@main
+
   static-analysis:
     needs: cache-ospray
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@main
     with:
-      image: centos:7
-      project: ospray_studio
+      coverity: true
+      image: rockylinux:8.7
+      project: OSPRay Studio
       ignore-files: pysg.cpp
-      prebuild: |
-        module load cmake/3.15.2
-        module load intel/2022.1
-        export CC=icx
-        export CXX=icpx
-        export CXXFLAGS="-fhonor-infinities -fhonor-nans"
-        export CFLAGS=$CXXFLAGS
-        export CACHE_DIR=${{ needs.cache-ospray.outputs.cache-dir }}
-        export OSPRAY_VER=${{ needs.cache-ospray.outputs.ospray-version }}
-        export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install
-        export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb
-        cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
+      prebuild: >
+        module load cmake/3.25.3 &&
+        export CACHE_DIR=${{ needs.cache-ospray.outputs.cache-dir }} &&
+        export OSPRAY_VER=${{ needs.cache-ospray.outputs.ospray-version }} &&
+        export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install &&
+        export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb &&
+        cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF &&
+        echo "Done: Configure OSPRay Studio"
       build: cmake --build build
 
   binary-analysis: