Skip to content

Commit e9ff6dc

Browse files
lgritzlgritz
committed
new workflow
Signed-off-by: Larry Gritz <[email protected]>
1 parent f62c2e5 commit e9ff6dc

File tree

2 files changed

+103
-132
lines changed

2 files changed

+103
-132
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ name: CI
99

1010
on:
1111
push:
12-
# Skip jobs when only documentation files are changed
1312
# Skip jobs when only documentation files are changed
1413
paths:
1514
- '**'
@@ -18,6 +17,7 @@ on:
1817
- '!**.tex'
1918
- '!**/analysis.yml'
2019
- '!**/docs.yml'
20+
# - '!**/optix.yml'
2121
- '!**.properties'
2222
- '!doc/**'
2323
pull_request:
@@ -45,7 +45,7 @@ concurrency:
4545
jobs:
4646

4747
aswf-old:
48-
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'gpu-only') }}
48+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'optix-only') }}
4949
name: "VFX${{matrix.vfxyear}} ${{matrix.desc}}"
5050
strategy:
5151
fail-fast: false
@@ -208,14 +208,14 @@ jobs:
208208
209209
210210
linux:
211-
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'gpu-only') }}
211+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'optix-only') }}
212212
name: "${{matrix.desc}}"
213213
uses: ./.github/workflows/build-steps.yml
214214
with:
215215
nametag: ${{ matrix.nametag || 'unnamed!' }}
216216
runner: ${{ matrix.runner || 'ubuntu-latest' }}
217217
container: ${{ matrix.container }}
218-
container_options: ${{ matrix.container_options }}
218+
container_options: ${{ matrix.container_options || -e A=x }}
219219
cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
220220
cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
221221
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -491,84 +491,15 @@ jobs:
491491
CLANG_FORMAT_EXE=clang-format-17
492492

493493

494-
# linux-optix:
495-
# if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
496-
# name: "${{matrix.desc}}"
497-
# uses: ./.github/workflows/build-steps.yml
498-
# with:
499-
# nametag: ${{ matrix.nametag || 'unnamed!' }}
500-
# runner: ${{ matrix.runner || 'ubuntu-latest' }}
501-
# container: ${{ matrix.container }}
502-
# container_args: ${{ matrix.container_args }}
503-
# cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
504-
# cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
505-
# cxx_std: ${{ matrix.cxx_std || '17' }}
506-
# build_type: ${{ matrix.build_type || 'Release' }}
507-
# depcmds: ${{ matrix.depcmds }}
508-
# extra_artifacts: ${{ matrix.extra_artifacts }}
509-
# fmt_ver: ${{ matrix.fmt_ver }}
510-
# opencolorio_ver: ${{ matrix.opencolorio_ver }}
511-
# openexr_ver: ${{ matrix.openexr_ver }}
512-
# openimageio_ver: ${{ matrix.openimageio_ver }}
513-
# pybind11_ver: ${{ matrix.pybind11_ver }}
514-
# python_ver: ${{ matrix.python_ver }}
515-
# setenvs: ${{ matrix.setenvs }}
516-
# simd: ${{ matrix.simd }}
517-
# batched: ${{ matrix.batched }}
518-
# skip_build: ${{ matrix.skip_build }}
519-
# skip_tests: ${{ matrix.skip_tests }}
520-
# abi_check: ${{ matrix.abi_check }}
521-
# build_docs: ${{ matrix.build_docs }}
522-
# generator: ${{ matrix.generator }}
523-
# ctest_args: ${{ matrix.ctest_args }}
524-
# ctest_test_timeout: ${{ matrix.ctest_test_timeout || '800' }}
525-
# coverage: ${{ matrix.coverage || 0 }}
526-
# sonar: ${{ matrix.sonar || 0 }}
527-
# llvm_action_ver: ${{ matrix.llvm_action_ver }}
528-
# clang_format: ${{ matrix.clang_format }}
529-
# strategy:
530-
# fail-fast: false
531-
# matrix:
532-
# include:
533-
# # - desc: VP2023 GPU Cuda11 gcc11/C++17 llvm15 py3.10 OIIO-main avx2
534-
# # nametag: linux-optix7-2023
535-
# # runner: ubuntu-latest
536-
# # container: aswftesting/ci-osl:2023-clang15
537-
# # cxx_std: 17
538-
# # openimageio_ver: main
539-
# # python_ver: "3.10"
540-
# # pybind11_ver: v2.10.0
541-
# # simd: avx2,f16c
542-
# # skip_tests: 1
543-
# # setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
544-
# # OPTIX_VERSION=7.0.0
545-
# # OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
546-
# - desc: VP2025 gcc11/C++17 llvm19 py3.11 oiio-rel avx2
547-
# nametag: linux-optix-vfx2025
548-
# runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
549-
# # runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
550-
# container: aswf/ci-osl:2025
551-
# # container_options: --gpus all,capabilities=compute,utility
552-
# cxx_std: 17
553-
# # openimageio_ver: release
554-
# python_ver: "3.11"
555-
# pybind11_ver: v2.11.1
556-
# simd: avx2,f16c
557-
# setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
558-
# OPTIX_VERSION=9.0.0
559-
# OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
560-
# # setenvs: export CONAN_PACKAGES="ptex/2.4.2@aswf/vfx2024"
561-
562-
563494
macos:
564-
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'gpu-only') }}
495+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'optix-only') }}
565496
name: "${{matrix.desc}}"
566497
uses: ./.github/workflows/build-steps.yml
567498
with:
568499
nametag: ${{ matrix.nametag || 'unnamed!' }}
569500
runner: ${{ matrix.runner }}
570501
container: ${{ matrix.container }}
571-
container_options: ${{ matrix.container_options }}
502+
container_options: ${{ matrix.container_options || -e A=x }}
572503
cc_compiler: ${{ matrix.cc_compiler || 'clang' }}
573504
cxx_compiler: ${{ matrix.cxx_compiler || 'clang++' }}
574505
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -631,14 +562,14 @@ jobs:
631562

632563

633564
windows:
634-
if: ${{ ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'gpu-only') }}
565+
if: ${{ ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'optix-only') }}
635566
name: "${{matrix.desc}}"
636567
uses: ./.github/workflows/build-steps.yml
637568
with:
638569
nametag: ${{ matrix.nametag || 'unnamed!' }}
639570
runner: ${{ matrix.runner }}
640571
container: ${{ matrix.container }}
641-
container_options: ${{ matrix.container_options }}
572+
container_options: ${{ matrix.container_options || -e A=x }}
642573
cc_compiler: ${{ matrix.cc_compiler }}
643574
cxx_compiler: ${{ matrix.cxx_compiler }}
644575
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -711,58 +642,3 @@ jobs:
711642
OSL_CMAKE_FLAGS="-DUSE_LLVM_BTCODE=ON"
712643
PUGIXML_VERSION=v1.14
713644
OpenImageIO_BUILD_MISSING_DEPS="Freetype;TIFF;libdeflate;libjpeg-turbo"
714-
715-
716-
717-
718-
linux-optix:
719-
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
720-
name: "${{matrix.desc}}"
721-
uses: ./.github/workflows/build-steps.yml
722-
with:
723-
nametag: ${{ matrix.nametag || 'unnamed!' }}
724-
runner: ${{ matrix.runner || 'ubuntu-latest' }}
725-
container: ${{ matrix.container }}
726-
container_options: ${{ matrix.container_options }}
727-
cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
728-
cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
729-
cxx_std: ${{ matrix.cxx_std || '17' }}
730-
build_type: ${{ matrix.build_type || 'Release' }}
731-
depcmds: ${{ matrix.depcmds }}
732-
extra_artifacts: ${{ matrix.extra_artifacts }}
733-
fmt_ver: ${{ matrix.fmt_ver }}
734-
opencolorio_ver: ${{ matrix.opencolorio_ver }}
735-
openexr_ver: ${{ matrix.openexr_ver }}
736-
openimageio_ver: ${{ matrix.openimageio_ver }}
737-
pybind11_ver: ${{ matrix.pybind11_ver }}
738-
python_ver: ${{ matrix.python_ver }}
739-
setenvs: ${{ matrix.setenvs }}
740-
simd: ${{ matrix.simd }}
741-
batched: ${{ matrix.batched }}
742-
skip_build: ${{ matrix.skip_build }}
743-
skip_tests: ${{ matrix.skip_tests }}
744-
abi_check: ${{ matrix.abi_check }}
745-
build_docs: ${{ matrix.build_docs }}
746-
generator: ${{ matrix.generator }}
747-
ctest_args: ${{ matrix.ctest_args }}
748-
ctest_test_timeout: ${{ matrix.ctest_test_timeout || '800' }}
749-
coverage: ${{ matrix.coverage || 0 }}
750-
sonar: ${{ matrix.sonar || 0 }}
751-
llvm_action_ver: ${{ matrix.llvm_action_ver }}
752-
clang_format: ${{ matrix.clang_format }}
753-
strategy:
754-
fail-fast: false
755-
matrix:
756-
include:
757-
- desc: OptiX VP2025 gcc11/C++17 llvm19 py3.11 oiio-rel avx2
758-
nametag: linux-optix-vfx2025
759-
runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
760-
container: aswf/ci-osl:2025
761-
container_options: -e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all
762-
cxx_std: 17
763-
python_ver: "3.11"
764-
pybind11_ver: v2.11.1
765-
simd: avx2,f16c
766-
setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
767-
OPTIX_VERSION=8.0.0
768-
OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0

‎.github/workflows/optix.yml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# Copyright Contributors to the Open Shading Language project.
2+
# SPDX-License-Identifier: BSD-3-Clause
3+
# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
4+
5+
# GitHub Actions workflow file for CI
6+
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
7+
8+
name: optix
9+
10+
on:
11+
push:
12+
# Skip jobs when only documentation files are changed
13+
paths:
14+
- '**'
15+
- '!**.md'
16+
- '!**.rst'
17+
- '!**.tex'
18+
- '!**/analysis.yml'
19+
- '!**/docs.yml'
20+
- '!**.properties'
21+
- '!doc/**'
22+
pull_request:
23+
paths:
24+
- '**/optix.yml'
25+
- 'src/liboslexec/**'
26+
- 'src/testshade/**'
27+
- 'src/testrender/**'
28+
schedule:
29+
# Weekly build, for the main project repo (not for forks)
30+
- cron: "0 6 * * 0"
31+
if: github.repository == 'AcademySoftwareFoundation/OpenShadingLanguage'
32+
workflow_dispatch:
33+
# This allows manual triggering of the workflow from the web
34+
35+
permissions: read-all
36+
37+
# Allow subsequent pushes to the same PR or REF to cancel any previous jobs.
38+
concurrency:
39+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
40+
cancel-in-progress: true
41+
42+
43+
jobs:
44+
45+
linux-optix:
46+
if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
47+
name: "${{matrix.desc}}"
48+
uses: ./.github/workflows/build-steps.yml
49+
with:
50+
nametag: ${{ matrix.nametag || 'unnamed!' }}
51+
runner: ${{ matrix.runner || 'ubuntu-latest' }}
52+
container: ${{ matrix.container }}
53+
container_options: ${{ matrix.container_options }}
54+
cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
55+
cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
56+
cxx_std: ${{ matrix.cxx_std || '17' }}
57+
build_type: ${{ matrix.build_type || 'Release' }}
58+
depcmds: ${{ matrix.depcmds }}
59+
extra_artifacts: ${{ matrix.extra_artifacts }}
60+
fmt_ver: ${{ matrix.fmt_ver }}
61+
opencolorio_ver: ${{ matrix.opencolorio_ver }}
62+
openexr_ver: ${{ matrix.openexr_ver }}
63+
openimageio_ver: ${{ matrix.openimageio_ver }}
64+
pybind11_ver: ${{ matrix.pybind11_ver }}
65+
python_ver: ${{ matrix.python_ver }}
66+
setenvs: ${{ matrix.setenvs }}
67+
simd: ${{ matrix.simd }}
68+
batched: ${{ matrix.batched }}
69+
skip_build: ${{ matrix.skip_build }}
70+
skip_tests: ${{ matrix.skip_tests }}
71+
abi_check: ${{ matrix.abi_check }}
72+
build_docs: ${{ matrix.build_docs }}
73+
generator: ${{ matrix.generator }}
74+
ctest_args: ${{ matrix.ctest_args }}
75+
ctest_test_timeout: ${{ matrix.ctest_test_timeout || '800' }}
76+
coverage: ${{ matrix.coverage || 0 }}
77+
sonar: ${{ matrix.sonar || 0 }}
78+
llvm_action_ver: ${{ matrix.llvm_action_ver }}
79+
clang_format: ${{ matrix.clang_format }}
80+
strategy:
81+
fail-fast: false
82+
matrix:
83+
include:
84+
- desc: OptiX VP2025 gcc11/C++17 llvm19 py3.11 oiio-rel avx2
85+
nametag: linux-optix-vfx2025
86+
runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
87+
container: aswf/ci-osl:2025
88+
container_options: -e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all
89+
cxx_std: 17
90+
python_ver: "3.11"
91+
pybind11_ver: v2.11.1
92+
simd: avx2,f16c
93+
setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
94+
OPTIX_VERSION=8.0.0
95+
OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0

0 commit comments

Comments
 (0)