Merge branch 'main' of https://github.com/johnfea/OpenShadingLanguage

Signed-off-by: Tuomas Tonteri <[email protected]>
AcademySoftwareFoundation · Aug 16, 2024 · e0197db · e0197db
2 parents ae76938 + 28b71e7
commit e0197db
Show file tree

Hide file tree

Showing 46 changed files with 1,365 additions and 509 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,43 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - desc: gcc6/C++14 llvm9 py2.7 exr2.4 oiio2.3 sse2
-            nametag: linux-vfx2020
-            runner: ubuntu-latest
-            container: aswftesting/ci-osl:2019-clang9
-            vfxyear: 2019
-            cxx_std: 14
-            openexr_ver: v2.4.3
-            openimageio_ver: v2.4.13.0
-            python_ver: 2.7
-            pybind11_ver: v2.4.2
-            setenvs: export CMAKE_VERSION=3.15.5
-          - desc: clang9/C++14 llvm9 oiio-release avx2 exr2.4 py2.7
-            nametag: linux-clang9-llvm9
-            runner: ubuntu-20.04
-            container: aswftesting/ci-osl:2019-clang9
-            vfxyear: 2019
-            cc_compiler: clang
-            cxx_compiler: clang++
-            cxx_std: 14
-            openexr_ver: v2.4.3
-            openimageio_ver: release
-            python_ver: 2.7
-            # pybind11_ver: v2.9.0
-            simd: avx
-            setenvs: export CMAKE_VERSION=3.15.5
-          - desc: gcc6/C++14 llvm10 py3.7 exr2.4 oiio2.2 sse4
-            nametag: linux-vfx2020
-            runner: ubuntu-latest
-            container: aswftesting/ci-osl:2020
-            vfxyear: 2020
-            cxx_std: 14
-            openimageio_ver: v2.4.13.0
-            python_ver: 3.7
-            pybind11_ver: v2.5.0
-            simd: sse4.2
-            setenvs: export CONAN_LLVM_VERSION=10.0.1
-          - desc: gcc9/C++17 llvm11 py3.7 exr2.5 oiio2.3 sse2 batch-b4sse2
+          - desc: gcc9/C++17 llvm11 py3.7 exr2.5 oiio2.3 sse4 batch-b8avx2
             nametag: linux-vfx2021
             runner: ubuntu-latest
             container: aswftesting/ci-osl:2021-clang11
@@ -83,9 +47,9 @@ jobs:
             openimageio_ver: v2.4.13.0
             python_ver: 3.7
             pybind11_ver: v2.7.0
-            simd: sse2
-            batched: b4_SSE2
-          - desc: gcc9/C++17 llvm11 py3.7 exr2.5 oiio2.3 avx2 batch-b8avx2
+            simd: sse4.2
+            batched: b8_AVX2_noFMA
+          - desc: gcc9/C++17 llvm11 py3.7 exr2.5 oiio2.3 sse2 batch-b4sse2
             nametag: linux-vfx2021
             runner: ubuntu-latest
             container: aswftesting/ci-osl:2021-clang11
@@ -94,8 +58,8 @@ jobs:
             openimageio_ver: v2.4.13.0
             python_ver: 3.7
             pybind11_ver: v2.7.0
-            simd: avx2,f16c
-            batched: b8_AVX2_noFMA
+            simd: sse2
+            batched: b4_SSE2
           - desc: gcc9/C++17 llvm13 py3.9 exr3.1 oiio-rel avx2
             nametag: linux-vfx2022
             runner: ubuntu-latest
@@ -158,6 +122,7 @@ jobs:
             simd: avx2,f16c
             batched: b8_AVX2_noFMA
             setenvs: export OSL_CMAKE_FLAGS="-DSTOP_ON_WARNING=OFF" USE_OPENVDB=0
+                            OPENCOLORIO_VERSION=v2.3.2 OPENCOLORIO_CXX=g++
           - desc: gcc11/C++17 llvm15 py3.10 exr3.1 oiio-rel avx2
             nametag: linux-vfx2023
             runner: ubuntu-latest
@@ -182,15 +147,15 @@ jobs:
             skip_tests: 1
             setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1" OPTIX_VERSION=7.0
                             OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-          - desc: oldest everything gcc6/C++14 llvm9 py2.7 oiio2.3 no-simd exr2.4
+          - desc: oldest everything gcc9/C++17 llvm9 py3.7 oiio2.3 no-simd exr2.4
             nametag: linux-oldest
             runner: ubuntu-latest
-            container: aswftesting/ci-osl:2019-clang9
-            vfxyear: 2019
-            cxx_std: 14
+            container: aswftesting/ci-osl:2021-clang11
+            vfxyear: 2021
+            cxx_std: 17
             openexr_ver: v2.4.3
             openimageio_ver: v2.4.13.0
-            python_ver: 2.7
+            python_ver: 3.7
             pybind11_ver: v2.7.0
             simd: 0
             setenvs: export PUGIXML_VERSION=v1.8
@@ -276,6 +241,8 @@ jobs:
       USE_BATCHED: ${{matrix.batched}}
       USE_SIMD: ${{matrix.simd}}
       ABI_CHECK: ${{matrix.abi_check}}
+      ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:
       # We would like to use harden-runner, but it flags too many false
       # positives, every time we download a dependency. We should use it only
@@ -353,11 +320,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - desc: Debug gcc7/C++14 llvm9 py2.7 oiio2.3 exr2.4 sse4 exr2.4
+          - desc: Debug gcc7/C++17 llvm9 py3.7 oiio2.3 exr2.4 sse4 exr2.4
             nametag: linux-debug-gcc7-llvm9
             runner: ubuntu-20.04
-            cxx_compiler: g++-7
-            cxx_std: 14
+            cxx_compiler: g++-9
+            cxx_std: 17
             openexr_ver: v2.4.3
             openimageio_ver: v2.4.13.0
             pybind11_ver: v2.6.2