Skip to content
This repository was archived by the owner on Jan 12, 2026. It is now read-only.

Commit d2c83a6

Browse files
johguentherjohguenther
committed
Merge branch 'release-0.13.x'
2 parents 38b2ad7 + 6526b2f commit d2c83a6

File tree

94 files changed

+24719
-820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+24719
-820
lines changed

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "pip" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

‎.github/workflows/cache-ospray.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,6 @@ jobs:
5555
if [[ ! -d "${{ inputs.cache-dir }}/ospray-${{ inputs.ospray-version }}" ]]
5656
then
5757
echo "Building " ${{ inputs.cache-dir }}/ospray-${{ inputs.ospray-version }}
58-
if [ "${{ inputs.image }}" = "centos:7" ]
59-
then
60-
# *** CentOS 7 specific build ***
61-
# CentOS 7, due to its extremely old glibc, requires everything built from source
62-
echo "... CentOS 7 build"
63-
module load intel/2022.1
64-
export CC=icx
65-
export CXX=icpx
66-
export CXXFLAGS="-fhonor-infinities -fhonor-nans"
67-
export CFLAGS=$CXXFLAGS
68-
fi
69-
7058
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
7159
cmake --build ospray-${{ inputs.ospray-version }}/build
7260
cp -r ospray-${{ inputs.ospray-version }} ${{ inputs.cache-dir }}

‎.github/workflows/ci.yml‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
force-delete: true # guarantees .gitattributes are respected in working dir
7373
image: rockylinux:8.7
7474
cmd: |
75-
module load cmake/3.15.2
75+
module load cmake/3.25.3
7676
module load intel/2023.0
7777
export CC=icx
7878
export CXX=icpx
@@ -85,34 +85,34 @@ jobs:
8585

8686
## Dev Build Jobs ##
8787
## Linux
88-
cache-ospray-centos7:
88+
cache-ospray-rocky8-7:
8989
secrets: inherit
9090
uses: ./.github/workflows/cache-ospray.yml
9191
with:
92-
image: centos:7
92+
image: rockylinux:8.7
9393
ospray-version: devel
9494
rkcommon-version: devel
9595

96-
build-centos7-dev:
97-
needs: cache-ospray-centos7
96+
build-rocky8-7-dev:
97+
needs: cache-ospray-rocky8-7
9898
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
9999
with:
100-
image: centos:7
100+
image: rockylinux:8.7
101101
cmd: |
102-
module load cmake/3.15.2
102+
module load cmake/3.25.3
103103
module load intel/2022.1
104104
export CC=icx
105105
export CXX=icpx
106106
export CXXFLAGS="-fhonor-infinities -fhonor-nans"
107107
export CFLAGS=$CXXFLAGS
108-
export CACHE_DIR=${{ needs.cache-ospray-centos7.outputs.cache-dir }}
109-
export OSPRAY_VER=${{ needs.cache-ospray-centos7.outputs.ospray-version }}
108+
export CACHE_DIR=${{ needs.cache-ospray-rocky8-7.outputs.cache-dir }}
109+
export OSPRAY_VER=${{ needs.cache-ospray-rocky8-7.outputs.ospray-version }}
110110
export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install
111111
export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb
112112
cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
113113
cmake --build build -- -j`nproc`
114114
artifact-path: build
115-
artifact-out: build-centos7-dev
115+
artifact-out: build-rocky8-7-dev
116116

117117
## MacOS
118118
build-macos-clang-dev:
@@ -142,32 +142,37 @@ jobs:
142142
cmake --build build-win-msvc16 --parallel $env:NUMBER_OF_PROCESSORS --config Release --target install
143143
144144
## Dev Test Jobs
145-
test-run-centos7-dev:
146-
needs: build-centos7-dev
145+
test-run-rocky8-7-dev:
146+
needs: build-rocky8-7-dev
147147
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
148148
with:
149-
# Run the centos07-dev build on the ubuntu 18.04 image as a test, and because it has vncserver installed
150-
image: ubuntu:18.04
149+
# Run the rocky8-7-dev build on the ubuntu 18.04 image as a test, and because it has vncserver installed
150+
image: rockylinux:8.7-tgt-rebuild
151+
pre-cmd: yum -y install tigervnc-server mesa-libGLU
151152
cmd: |
152153
module load intel/2023.0
153154
build/ospStudio --verify_install
154155
export CACHE_DIR=/NAS/ci-cache
155156
export OSPRAY_VER=devel
156157
gitlab/run-dev.sh
157158
gitlab/run-dev-img-cmp.sh
158-
artifact-in: build-centos7-dev
159-
artifact-path: build/model-results
160-
artifact-out: test-run-centos7-dev
159+
artifact-in: build-rocky8-7-dev
160+
artifact-path: build/model-results build/cert-tests/*
161+
artifact-out: test-run-rocky8-7-dev
161162
artifact-on-failure: true
162163

163-
### KW Jobs ###
164-
# static-analysis:
165-
# secrets: inherit
166-
# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@tgt/ospray-studio
167-
# with:
168-
# project: ospray_studio
169-
# image: ubuntu:18.04-tgt-klockwork
170-
# prebuild: |
171-
# cmake -L -S . -B build -DCMAKE_INSTALL_PREFIX=install -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
172-
# build: cmake --build build
173-
164+
### Devel Coverity Job ###
165+
static-analysis:
166+
needs: cache-ospray-rocky8-7
167+
secrets: inherit
168+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@main
169+
with:
170+
project: OSPRay Studio
171+
prebuild: >
172+
module load cmake/3.25.3 &&
173+
export CACHE_DIR=${{ needs.cache-ospray-rocky8-7.outputs.cache-dir }} &&
174+
export OSPRAY_VER=${{ needs.cache-ospray-rocky8-7.outputs.ospray-version }} &&
175+
export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install/lib64/cmake/ospray-3.0.0 &&
176+
export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb &&
177+
cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
178+
build: cmake --build build

‎.github/workflows/release.yml‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ jobs:
2626
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
2727
with:
2828
force-delete: true # guarantees .gitattributes are respected in working dir
29-
image: rockylinux:8.7
29+
# image: rockylinux:8.7
30+
image: ubuntu:22.04 # temp, to use OSPRay v3.0.0 SYCL build
3031
cmd: |
31-
module load cmake/3.15.2
32+
module load cmake/3.25.3
3233
module load intel/2023.0
3334
export CC=icx
3435
export CXX=icpx
@@ -68,8 +69,10 @@ jobs:
6869
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
6970
with:
7071
# Run the rockylinux 8.7 build on the ubuntu 18.04 image as a test, and because it has vncserver installed
71-
image: ubuntu:18.04
72-
pre-cmd: apt install libglu1-mesa
72+
#image: ubuntu:18.04
73+
#image: rockylinux:8.7-tgt-rebuild
74+
image: ubuntu:22.04 # temp, to use OSPRay v3.0.0 SYCL build
75+
#pre-cmd: yum -y install tigervnc-server mesa-libGLU
7376
cmd: |
7477
module load intel/2023.0
7578
tar -xzf build/package/ospray_studio*.gz
@@ -81,6 +84,21 @@ jobs:
8184
gitlab/run.sh
8285
artifact-in: release-linux
8386

87+
test-run-linux-gpu:
88+
needs: release-linux
89+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
90+
with:
91+
image: ubuntu:22.04
92+
runs-on: '"dg2"'
93+
options: --device=/dev/dri:/dev/dri
94+
gfx-driver-version: linux-latest
95+
cmd: |
96+
module load intel/2023.0
97+
tar -xzf build/package/ospray_studio*.gz
98+
export PATH=$GITHUB_WORKSPACE/$(ls -d1 ./ospray_studio-*/bin):$PATH
99+
gitlab/run.sh --osp:load-modules=gpu --osp:device=gpu
100+
artifact-in: release-linux
101+
84102
## Windows ##
85103
test-release-windows-zip:
86104
needs: release-windows
@@ -117,30 +135,31 @@ jobs:
117135
secrets: inherit
118136
uses: ./.github/workflows/cache-ospray.yml
119137
with:
120-
image: centos:7
138+
image: rockylinux:8.7
121139
ospray-version: devel
122140
rkcommon-version: devel
123141

142+
composition-analysis:
143+
secrets: inherit
144+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/composition_analysis.yml@main
145+
124146
static-analysis:
125147
needs: cache-ospray
126148
secrets: inherit
127149
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@main
128150
with:
129-
image: centos:7
130-
project: ospray_studio
151+
coverity: true
152+
image: rockylinux:8.7
153+
project: OSPRay Studio
131154
ignore-files: pysg.cpp
132-
prebuild: |
133-
module load cmake/3.15.2
134-
module load intel/2022.1
135-
export CC=icx
136-
export CXX=icpx
137-
export CXXFLAGS="-fhonor-infinities -fhonor-nans"
138-
export CFLAGS=$CXXFLAGS
139-
export CACHE_DIR=${{ needs.cache-ospray.outputs.cache-dir }}
140-
export OSPRAY_VER=${{ needs.cache-ospray.outputs.ospray-version }}
141-
export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install
142-
export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb
143-
cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF
155+
prebuild: >
156+
module load cmake/3.25.3 &&
157+
export CACHE_DIR=${{ needs.cache-ospray.outputs.cache-dir }} &&
158+
export OSPRAY_VER=${{ needs.cache-ospray.outputs.ospray-version }} &&
159+
export CMAKE_PREFIX_PATH=$CACHE_DIR/ospray-$OSPRAY_VER/build/install &&
160+
export TBB_ROOT=$CACHE_DIR/ospray-$OSPRAY_VER/build/tbb/src/tbb &&
161+
cmake -L -S . -B build -DENABLE_OPENIMAGEIO=OFF -DENABLE_OPENVDB=OFF -DENABLE_EXR=OFF &&
162+
echo "Done: Configure OSPRay Studio"
144163
build: cmake --build build
145164

146165
binary-analysis:

0 commit comments

Comments
 (0)