cleanup

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

Author: lgritz

.github/workflows/ci.yml

@@ -739,34 +739,7 @@ jobs:
           # Failures so far:
 
           # with 'ubuntu-20.04-gpu-t4-4c-16g-176h'
-          # 1 container_options: --gpus all,"capabilities=compute,utility"
-          #    invalid argument "all,capabilities=compute,utility" for "--gpus" flag: invalid count (utility): value must be either "all" or an integer: invalid syntax
-          # 2 container_options: --gpus 'all,"capabilities=compute,utility"'
-          #    invalid argument "'all,capabilities=compute,utility'" for "--gpus" flag: invalid count ('all): value must be either "all" or an integer: invalid syntax
-          # 3 container_options: --gpus 'all,\"capabilities=compute,utility\"'
-          #    invalid argument "all,capabilities=compute,utility" for "--gpus" flag: invalid count (utility): value must be either "all" or an integer: invalid syntax
-          # same with ubuntu-22.04-8c-32g-300h
-
-          # 1 container_options: --gpus "all,\"capabilities=compute,utility\""
-          # Error response from daemon: could not select device driver "" with capabilities: [[compute utility gpu]]
-          # 2 container_options: --gpus all,\"capabilities=compute,utility\"
-          # Error response from daemon: could not select device driver "" with capabilities: [[compute utility gpu]]
-          # 3 --gpus all
-          # Error response from daemon: could not select device driver "" with capabilities: [[gpu]]
-  
-          - desc: 0 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' }}
-            container: aswf/ci-osl:2025
-            # container_options: --gpus "all,\"capabilities=compute,utility\""
-            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=7.0.0
-                            OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-          - desc: 1 VP2025 gcc11/C++17 llvm19 py3.11 oiio-rel avx2
+          - 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' }}
             container: aswf/ci-osl:2025
@@ -778,50 +751,10 @@ jobs:
             setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
                             OPTIX_VERSION=8.0.0
                             OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-          # - desc: 1 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' }}
-          #   container: aswf/ci-osl:2025
-          #   container_options: --gpus "all,\"capabilities=compute,utility\""
-          #   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=9.0.0
-          #                   OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-          # - desc: 2 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' }}
-          #   container: aswf/ci-osl:2025
-          #   container_options: --gpus all,\"capabilities=compute,utility\"
-          #   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=9.0.0
-          #                   OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-          # - desc: 3 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' }}
-          #   container: aswf/ci-osl:2025
-          #   container_options: --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=9.0.0
-          #                   OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
 
-    # runs-on: ${{ matrix.runner }}
     runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
-    # runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
     container:
       image: ${{ matrix.container }}
-      # options: ${{ matrix.container_options }}
-      # options: --gpus 'all,"capabilities=compute,utility"'
       options: -e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all
 
     env: