Skip to content

Commit 622d3f8

Browse files
lgritzlgritz
committed
ci: GPU/OptiX full build and test
At long last, turn on full execution and testing for OptiX in our CI, using the GitHub GPU-enabled runners. This should greatly reduce the possibility of build breaks from not actually testing OptiX rendering, not to mention making it possible to make changes on the OptiX code path and have it confirmed by our usual CI. Previously, we were building against the OptiX headers, so at least we wouldn't make an obvious build break, but we weren't executing the testsuite on GPUs. So it was still possible to merge code that broke that code path in practice. For PRs that looked obviously risky, I would pull them to my work machine, build and test with real GPUs to confirm. But this was a big pain, extra trouble for me, and very error prone -- sometimes I didn't recognize that a PR needed that extra testing, or sometimes I forgot entirely, and merged broken code. Note that this depends on PAID GitHub runners with GPUs. The bill is paid by ASWF, but it means those runners are only available on the ASWF GitHub account -- that is, they will run for PRs once submitted, but not when you merely push to your own account's fork, sorry. When running on a non-ASWF account, it will select an ordinary free runner and build OSL against the OptiX headers, but will not run the testsuite since there is no GPU. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent fe52953 commit 622d3f8

5 files changed

Lines changed: 84 additions & 20 deletions

File tree

‎.github/workflows/build-steps.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ on:
1818
type: string
1919
container:
2020
type: string
21+
container_options:
22+
type: string
2123
cc_compiler:
2224
type: string
2325
cxx_compiler:
@@ -88,7 +90,7 @@ jobs:
8890
runs-on: ${{ inputs.runner }}
8991
container:
9092
image: ${{ inputs.container }}
91-
93+
options: ${{ inputs.container_options }}
9294
env:
9395
CXX: ${{inputs.cxx_compiler}}
9496
CC: ${{inputs.cc_compiler}}

‎.github/workflows/ci.yml‎

Lines changed: 76 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ permissions: read-all
4040
jobs:
4141

4242
aswf-old:
43-
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
43+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'optix-only') }}
4444
name: "VFX${{matrix.vfxyear}} ${{matrix.desc}}"
4545
strategy:
4646
fail-fast: false
@@ -203,13 +203,14 @@ jobs:
203203
204204
205205
linux:
206-
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
206+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'optix-only') }}
207207
name: "${{matrix.desc}}"
208208
uses: ./.github/workflows/build-steps.yml
209209
with:
210210
nametag: ${{ matrix.nametag || 'unnamed!' }}
211211
runner: ${{ matrix.runner || 'ubuntu-latest' }}
212212
container: ${{ matrix.container }}
213+
container_options: ${{ matrix.container_options || '-e A=x' }}
213214
cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
214215
cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
215216
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -250,20 +251,7 @@ jobs:
250251
pybind11_ver: v2.9.0
251252
simd: avx2,f16c
252253
batched: b8_AVX2
253-
- desc: VP2023 GPU Cuda11 gcc11/C++17 llvm15 py3.10 OIIO-main avx2
254-
nametag: linux-optix7-2023
255-
runner: ubuntu-latest
256-
container: aswftesting/ci-osl:2023-clang15
257-
cxx_std: 17
258-
openimageio_ver: main
259-
python_ver: "3.10"
260-
pybind11_ver: v2.10.0
261-
simd: avx2,f16c
262-
skip_tests: 1
263-
setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
264-
OPTIX_VERSION=7.0.0
265-
OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
266-
- desc: VP2024 gcc11/C++17 llvm17 py3.11 boost1.82 oiio-rel avx2
254+
- desc: VP2024 gcc11/C++17 llvm17 py3.11 oiio-rel avx2
267255
nametag: linux-vfx2024
268256
runner: ubuntu-latest
269257
container: aswftesting/ci-osl:2024-clang17
@@ -486,13 +474,14 @@ jobs:
486474

487475

488476
macos:
489-
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'linux-only') }}
477+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'optix-only') }}
490478
name: "${{matrix.desc}}"
491479
uses: ./.github/workflows/build-steps.yml
492480
with:
493481
nametag: ${{ matrix.nametag || 'unnamed!' }}
494482
runner: ${{ matrix.runner }}
495483
container: ${{ matrix.container }}
484+
container_options: ${{ matrix.container_options || '-e A=x' }}
496485
cc_compiler: ${{ matrix.cc_compiler || 'clang' }}
497486
cxx_compiler: ${{ matrix.cxx_compiler || 'clang++' }}
498487
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -555,13 +544,14 @@ jobs:
555544

556545

557546
windows:
558-
if: ${{ ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'macos-only') }}
547+
if: ${{ ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'optix-only') }}
559548
name: "${{matrix.desc}}"
560549
uses: ./.github/workflows/build-steps.yml
561550
with:
562551
nametag: ${{ matrix.nametag || 'unnamed!' }}
563552
runner: ${{ matrix.runner }}
564553
container: ${{ matrix.container }}
554+
container_options: ${{ matrix.container_options || '-e A=x' }}
565555
cc_compiler: ${{ matrix.cc_compiler }}
566556
cxx_compiler: ${{ matrix.cxx_compiler }}
567557
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -620,3 +610,71 @@ jobs:
620610
OSL_CMAKE_FLAGS="-DUSE_LLVM_BTCODE=ON"
621611
PUGIXML_VERSION=v1.14
622612
OpenImageIO_BUILD_MISSING_DEPS="Freetype;TIFF;libdeflate;libjpeg-turbo"
613+
614+
615+
optix-gpu:
616+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
617+
name: "${{matrix.desc}}"
618+
uses: ./.github/workflows/build-steps.yml
619+
with:
620+
nametag: ${{ matrix.nametag || 'unnamed!' }}
621+
runner: ${{ matrix.runner || 'ubuntu-latest' }}
622+
container: ${{ matrix.container }}
623+
container_options: ${{ matrix.container_options || '-e A=x' }}
624+
cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
625+
cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
626+
cxx_std: ${{ matrix.cxx_std || '17' }}
627+
build_type: ${{ matrix.build_type || 'Release' }}
628+
depcmds: ${{ matrix.depcmds }}
629+
extra_artifacts: ${{ matrix.extra_artifacts }}
630+
fmt_ver: ${{ matrix.fmt_ver }}
631+
opencolorio_ver: ${{ matrix.opencolorio_ver }}
632+
openexr_ver: ${{ matrix.openexr_ver }}
633+
openimageio_ver: ${{ matrix.openimageio_ver }}
634+
pybind11_ver: ${{ matrix.pybind11_ver }}
635+
python_ver: ${{ matrix.python_ver }}
636+
setenvs: ${{ matrix.setenvs }}
637+
simd: ${{ matrix.simd }}
638+
batched: ${{ matrix.batched }}
639+
skip_build: ${{ matrix.skip_build }}
640+
skip_tests: ${{ matrix.skip_tests }}
641+
abi_check: ${{ matrix.abi_check }}
642+
build_docs: ${{ matrix.build_docs }}
643+
generator: ${{ matrix.generator }}
644+
ctest_args: ${{ matrix.ctest_args }}
645+
ctest_test_timeout: ${{ matrix.ctest_test_timeout || '800' }}
646+
coverage: ${{ matrix.coverage || 0 }}
647+
sonar: ${{ matrix.sonar || 0 }}
648+
llvm_action_ver: ${{ matrix.llvm_action_ver }}
649+
clang_format: ${{ matrix.clang_format }}
650+
strategy:
651+
fail-fast: false
652+
matrix:
653+
include:
654+
- desc: OptiX VP2025 gcc11/C++17 llvm18 py3.11 oiio-rel avx2
655+
nametag: linux-optix-vfx2025
656+
if: ${{ github.repository_owner == 'AcademySoftwareFoundation' }}
657+
runner: ubuntu-20.04-gpu-t4-4c-16g-176h
658+
container: aswf/ci-osl:2025-clang18
659+
container_options: -e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all
660+
cxx_std: 17
661+
python_ver: "3.11"
662+
pybind11_ver: v2.11.1
663+
simd: avx2,f16c
664+
setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
665+
OPTIX_VERSION=8.0.0
666+
OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
667+
CTEST_EXCLUSIONS="broken|render-microfacet|example-cuda|python-oslquery"
668+
- desc: OptiX build only VP2025 gcc11/C++17 llvm19 py3.11 oiio-rel avx2
669+
nametag: linux-optix-vfx2025
670+
if: ${{ ! (github.repository_owner != 'AcademySoftwareFoundation') }}
671+
runner: ubuntu-latest
672+
container: aswf/ci-osl:2025-clang19
673+
cxx_std: 17
674+
python_ver: "3.11"
675+
pybind11_ver: v2.11.1
676+
simd: avx2,f16c
677+
skip_tests: 1
678+
setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
679+
OPTIX_VERSION=8.0.0
680+
OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0

‎src/build-scripts/gh-installdeps.bash‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ if [[ "$OPTIX_VERSION" != "" ]] ; then
152152
echo "Requested OPTIX_VERSION = '${OPTIX_VERSION}' from ${OPTIXREPO}"
153153
export OptiX_ROOT=$LOCAL_DEPS_DIR/dist/optix-dev
154154
git clone -b v${OPTIX_VERSION} ${OPTIXREPO} ${OptiX_ROOT}
155+
export PATH=$PATH:/usr/local/cuda-12/bin
156+
export LD_LIBRARY_PATH=/usr/local/cuda-12/lib64:$LD_LIBRARY_PATH
157+
find / -name "*nv*so" -print || true
155158
fi
156159

157160

‎src/cmake/externalpackages.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ if (OSL_USE_OPTIX)
201201
target_link_libraries (${TARGET} PRIVATE ${CUDA_LIBRARIES} ${CUDA_EXTRA_LIBS} ${OPTIX_LIBRARIES} ${OPTIX_EXTRA_LIBS})
202202
endfunction()
203203
else ()
204+
message(STATUS "CUDA/OptiX support disabled")
204205
function (osl_optix_target TARGET)
205206
endfunction()
206207
endif ()

‎testsuite/render-mx-generalized-schlick/run.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
failthresh = 0.01
88
failpercent = 1
9-
allowfailures = 2
9+
allowfailures = 5
1010
idiff_program = "idiff"
1111

1212
outputs = [ "out.exr" ]

0 commit comments

Comments
 (0)