Try doing it with build steps

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

.github/workflows/build-steps.yml

@@ -18,7 +18,7 @@ on:
         type: string
       container:
         type: string
-      container_args:
+      container_options:
         type: string
       cc_compiler:
         type: string
@@ -90,9 +90,7 @@ jobs:
     runs-on: ${{ inputs.runner }}
     container:
       image: ${{ inputs.container }}
-      # options: ${{ inputs.container_options }}
-      options: --gpus all,"capabilities=compute,utility"
-
+      options: ${{ inputs.container_options }}
     env:
       CXX: ${{inputs.cxx_compiler}}
       CC: ${{inputs.cc_compiler}}

.github/workflows/ci.yml

@@ -215,6 +215,7 @@ jobs:
       nametag: ${{ matrix.nametag || 'unnamed!' }}
       runner: ${{ matrix.runner || 'ubuntu-latest' }}
       container: ${{ matrix.container }}
+      container_options: ${{ matrix.container_options }}
       cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
       cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
       cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -567,6 +568,7 @@ jobs:
       nametag: ${{ matrix.nametag || 'unnamed!' }}
       runner: ${{ matrix.runner }}
       container: ${{ matrix.container }}
+      container_options: ${{ matrix.container_options }}
       cc_compiler: ${{ matrix.cc_compiler || 'clang' }}
       cxx_compiler: ${{ matrix.cxx_compiler || 'clang++' }}
       cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -636,6 +638,7 @@ jobs:
       nametag: ${{ matrix.nametag || 'unnamed!' }}
       runner: ${{ matrix.runner }}
       container: ${{ matrix.container }}
+      container_options: ${{ matrix.container_options }}
       cc_compiler: ${{ matrix.cc_compiler }}
       cxx_compiler: ${{ matrix.cxx_compiler }}
       cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -715,185 +718,51 @@ jobs:
   linux-optix:
     if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
     name: "${{matrix.desc}}"
-    # name: "${{matrix.cxx_compiler}} c++${{matrix.cxx_std}} py${{matrix.python_ver}}"
+    uses: ./.github/workflows/build-steps.yml
+    with:
+      nametag: ${{ matrix.nametag || 'unnamed!' }}
+      runner: ${{ matrix.runner || 'ubuntu-latest' }}
+      container: ${{ matrix.container }}
+      container_options: ${{ matrix.container_options }}
+      cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
+      cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
+      cxx_std: ${{ matrix.cxx_std || '17' }}
+      build_type: ${{ matrix.build_type || 'Release' }}
+      depcmds: ${{ matrix.depcmds }}
+      extra_artifacts: ${{ matrix.extra_artifacts }}
+      fmt_ver: ${{ matrix.fmt_ver }}
+      opencolorio_ver: ${{ matrix.opencolorio_ver }}
+      openexr_ver: ${{ matrix.openexr_ver }}
+      openimageio_ver: ${{ matrix.openimageio_ver }}
+      pybind11_ver: ${{ matrix.pybind11_ver }}
+      python_ver: ${{ matrix.python_ver }}
+      setenvs: ${{ matrix.setenvs }}
+      simd: ${{ matrix.simd }}
+      batched: ${{ matrix.batched }}
+      skip_build: ${{ matrix.skip_build }}
+      skip_tests: ${{ matrix.skip_tests }}
+      abi_check: ${{ matrix.abi_check }}
+      build_docs: ${{ matrix.build_docs }}
+      generator: ${{ matrix.generator }}
+      ctest_args: ${{ matrix.ctest_args }}
+      ctest_test_timeout: ${{ matrix.ctest_test_timeout || '800' }}
+      coverage: ${{ matrix.coverage || 0 }}
+      sonar: ${{ matrix.sonar || 0 }}
+      llvm_action_ver: ${{ matrix.llvm_action_ver }}
+      clang_format: ${{ matrix.clang_format }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          # - desc: VP2023 GPU Cuda11 gcc11/C++17 llvm15 py3.10 OIIO-main avx2
-          #   nametag: linux-optix7-2023
-          #   runner: ubuntu-latest
-          #   container: aswftesting/ci-osl:2023-clang15
-          #   cxx_std: 17
-          #   openimageio_ver: main
-          #   python_ver: "3.10"
-          #   pybind11_ver: v2.10.0
-          #   simd: avx2,f16c
-          #   skip_tests: 1
-          #   setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
-          #                   OPTIX_VERSION=7.0.0
-          #                   OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-
-          # runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
-
-          # Failures so far:
-
-          # with 'ubuntu-20.04-gpu-t4-4c-16g-176h'
           - desc: VP2025 gcc11/C++17 llvm19 py3.11 oiio-rel avx2
             nametag: linux-optix-vfx2025
-            # runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
+            runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
             container: aswf/ci-osl:2025
-            # container_options: --gpus "all,\"capabilities=compute,utility\""
+            container_options: -e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all
             cxx_std: 17
             python_ver: "3.11"
             pybind11_ver: v2.11.1
             simd: avx2,f16c
             setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
                             OPTIX_VERSION=8.0.0
                             OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-
-    runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
-    container:
-      image: ${{ matrix.container }}
-      options: -e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all
-
-    env:
-      CXX: ${{matrix.cxx_compiler}}
-      CC: ${{matrix.cc_compiler}}
-      CMAKE_BUILD_TYPE: ${{matrix.build_type}}
-      CMAKE_CXX_STANDARD: ${{matrix.cxx_std}}
-      CMAKE_GENERATOR: ${{matrix.generator}}
-      CTEST_ARGS: ${{matrix.ctest_args}}
-      CTEST_TEST_TIMEOUT: ${{matrix.ctest_test_timeout}}
-      USE_SIMD: ${{matrix.simd}}
-      FMT_VERSION: ${{matrix.fmt_ver}}
-      OPENCOLORIO_VERSION: ${{matrix.opencolorio_ver}}
-      OPENEXR_VERSION: ${{matrix.openexr_ver}}
-      OPENIMAGEIO_VERSION: ${{matrix.openimageio_ver}}
-      PYBIND11_VERSION: ${{matrix.pybind11_ver}}
-      PYTHON_VERSION: ${{matrix.python_ver}}
-      USE_BATCHED: ${{matrix.batched}}
-      ABI_CHECK: ${{matrix.abi_check}}
-      ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: '0'
-      - name: Prepare ccache timestamp
-        id: ccache_cache_keys
-        shell: bash
-        run: echo "date=`date -u +'%Y-%m-%dT%H:%M:%SZ'`" >> $GITHUB_OUTPUT
-      - name: ccache-restore
-        id: ccache-restore
-        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        with:
-          path: ./ccache
-          key: ${{github.job}}-${{matrix.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
-          restore-keys: ${{github.job}}-
-      - name: Build setup
-        shell: bash
-        run: |
-            ${{matrix.setenvs}}
-            src/build-scripts/ci-startup.bash
-      - name: Install LLVM and Clang
-        if: matrix.llvm_action_ver != ''
-        uses: KyleMayes/install-llvm-action@6ba6e2cd3813def9879be378609d87cb3ef3bac3 # v2.0.6
-        with:
-          version: ${{ matrix.llvm_action_ver }}
-      - name: Dependencies
-        shell: bash
-        run: |
-            ${{matrix.depcmds}}
-            if [[ "$RUNNER_OS" == "Linux" ]]; then
-                src/build-scripts/gh-installdeps.bash
-            elif [[ "$RUNNER_OS" == "macOS" ]]; then
-                src/build-scripts/install_homebrew_deps.bash
-                if [[ "$OPENIMAGEIO_VERSION" != "" ]] ; then \
-                    OPENIMAGEIO_CMAKE_FLAGS="-DOIIO_BUILD_TESTS=0 -DUSE_OPENGL=0 -DCMAKE_UNITY_BUILD=ON" ; \
-                    source src/build-scripts/build_openimageio.bash ; \
-                else \
-                    brew install --display-times -q openimageio ; \
-                    PYTHONPATH=$PYTHONPATH:/usr/local/lib/python${PYTHON_VERSION}/site-packages ; \
-                fi
-                src/build-scripts/save-env.bash
-            elif [[ "$RUNNER_OS" == "Windows" ]]; then
-                src/build-scripts/gh-win-installdeps.bash
-            fi
-      - name:  Install sonar-scanner and build-wrapper
-        if: matrix.sonar == '1'
-        uses: sonarsource/sonarcloud-github-c-cpp@e4882e1621ad2fb48dddfa48287411bed34789b1 # v2.0.2
-      - name: Build
-        if: matrix.skip_build != '1'
-        shell: bash
-        run: src/build-scripts/ci-build.bash
-      - name: Testsuite
-        if: matrix.skip_tests != '1'
-        shell: bash
-        run: src/build-scripts/ci-test.bash
-      - name: clang-format
-        if: matrix.clang_format == '1'
-        shell: bash
-        run: src/build-scripts/run-clang-format.bash
-      - name: Code coverage
-        if: matrix.coverage == '1'
-        run: src/build-scripts/ci-coverage.bash
-      - name: Sonar-scanner
-        if: matrix.sonar == 1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-            which sonar-scanner
-            ls -l /__w/OpenShadingLanguage/OpenShadingLanguage/bw_output
-            echo "BUILD_OUTPUT_DIR is " "${{ env.BUILD_WRAPPER_OUT_DIR }}"
-            find . -name "*.gcov" -print
-            # sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
-            time sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="$BUILD_WRAPPER_OUT_DIR" --define sonar.cfamily.gcov.reportsPath="_coverage" --define sonar.cfamily.threads="$PARALLEL"
-        # Consult https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ for more information and options
-      - name: Check out ABI standard
-        if: matrix.abi_check != ''
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{matrix.abi_check}}
-          path: abi_standard
-      - name: Build ABI standard
-        if: matrix.abi_check != ''
-        shell: bash
-        run: |
-            mkdir -p abi_standard/build
-            pushd abi_standard
-            src/build-scripts/ci-build.bash
-            popd
-      - name: Check ABI
-        if: matrix.abi_check != ''
-        shell: bash
-        run: |
-            src/build-scripts/ci-abicheck.bash ./build abi_standard/build \
-                  liboslexec liboslcomp liboslquery liboslnoise
-      - name: Build Docs
-        if: matrix.build_docs == '1'
-        shell: bash
-        run: |
-            cd src/doc
-            time make doxygen
-            time make sphinx
-      - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
-        if: ${{ failure() || matrix.build_docs == '1'}}
-        with:
-          name: osl-${{github.job}}-${{matrix.nametag}}
-          path: |
-            build/cmake-save
-            build/compat_reports
-            build/sphinx
-            build/*.cmake
-            build/CMake*
-            build/testsuite/*/*.*
-            ${{ matrix.extra_artifacts }}
-      - name: ccache-save
-        id: ccache-save
-        uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        with:
-          path: ./ccache
-          key: ${{github.job}}-${{matrix.nametag}}-${{steps.ccache_cache_keys.outputs.date}}

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

@@ -6,7 +6,7 @@
 
 failthresh = 0.01
 failpercent = 1
-allowfailures = 2
+allowfailures = 5
 idiff_program = "idiff"
 
 outputs = [ "out.exr" ]