Merge branch 'AcademySoftwareFoundation:main' into R3D

Author: 1div0

.github/workflows/build-steps.yml

@@ -50,6 +50,8 @@ on:
         type: string
       abi_check:
         type: string
+      benchmark:
+        type: string
       build_docs:
         type: string
       clang_format:
@@ -104,8 +106,6 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: '0'
       - name: Prepare ccache timestamp
         id: ccache_cache_keys
         shell: bash
@@ -147,6 +147,10 @@ jobs:
         if: inputs.skip_tests != '1'
         shell: bash
         run: src/build-scripts/ci-test.bash
+      - name: Benchmarks
+        if: inputs.benchmark == '1'
+        shell: bash
+        run: src/build-scripts/ci-benchmark.bash
       - name: clang-format
         if: inputs.clang_format == '1'
         shell: bash
@@ -195,13 +199,14 @@ jobs:
             time make sphinx
       - name: Upload testsuite debugging artifacts
         uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
-        if: ${{ failure() || inputs.build_docs == '1'}}
+        if: ${{ failure() || inputs.build_docs == '1' || inputs.benchmark == '1' }}
         with:
           name: oiio-${{github.job}}-${{inputs.nametag}}
           path: |
             build/cmake-save
             build/compat_reports
             build/sphinx
+            build/benchmarks
             build/testsuite/*/*.*
             !build/testsuite/oiio-images
             !build/testsuite/openexr-images

.github/workflows/ci.yml

@@ -176,8 +176,6 @@ jobs:
       #     egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: '0'
       - name: Prepare ccache timestamp
         id: ccache_cache_keys
         run: echo "date=`date -u +'%Y-%m-%dT%H:%M:%SZ'`" >> $GITHUB_OUTPUT
@@ -202,6 +200,10 @@ jobs:
       - name: Testsuite
         if: matrix.skip_tests != '1'
         run: src/build-scripts/ci-test.bash
+      - name: Benchmarks
+        if: matrix.benchmark == '1'
+        shell: bash
+        run: src/build-scripts/ci-benchmark.bash
       - name: Check out ABI standard
         if: matrix.abi_check != ''
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -234,6 +236,7 @@ jobs:
             build/cmake-save
             build/compat_reports
             build/sphinx
+            build/benchmarks
             build/testsuite/*/*.*
             !build/testsuite/oiio-images
             !build/testsuite/openexr-images
@@ -269,6 +272,7 @@ jobs:
       skip_build: ${{ matrix.skip_build }}
       skip_tests: ${{ matrix.skip_tests }}
       abi_check: ${{ matrix.abi_check }}
+      benchmark: ${{ matrix.benchmark }}
       build_docs: ${{ matrix.build_docs }}
       clang_format: ${{ matrix.clang_format }}
       generator: ${{ matrix.generator }}
@@ -314,6 +318,7 @@ jobs:
             python_ver: "3.10"
             pybind11_ver: v2.10.0
             simd: "avx2,f16c"
+            benchmark: 1
             setenvs: export USE_OPENVDB=0
                             xOPENCOLORIO_CXX=g++
                             UHDR_CMAKE_C_COMPILER=gcc
@@ -328,6 +333,7 @@ jobs:
             simd: "avx2,f16c"
             fmt_ver: 10.1.1
             pybind11_ver: v2.12.0
+            benchmark: 1
             setenvs: PUGIXML_VERSION=v1.14
           - desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
             nametag: linux-vfx2024.clang
@@ -339,8 +345,19 @@ jobs:
             simd: "avx2,f16c"
             fmt_ver: 10.1.1
             pybind11_ver: v2.12.0
+            benchmark: 1
             setenvs: PUGIXML_VERSION=v1.14
-          - desc: VFX2024 sanitizers
+          - desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
+            nametag: linux-vfx2025
+            runner: ubuntu-latest
+            container: aswftesting/ci-oiio:2025
+            python_ver: "3.11"
+            simd: "avx2,f16c"
+            fmt_ver: 11.1.4
+            pybind11_ver: v2.13.6
+            benchmark: 1
+            setenvs: PUGIXML_VERSION=v1.15
+          - desc: Sanitizers
             nametag: sanitizer
             runner: ubuntu-latest
             container: aswf/ci-osl:2024-clang17
@@ -366,8 +383,8 @@ jobs:
             python_ver: "3.11"
             simd: "avx2,f16c"
             skip_tests: 1
-            # abi_check: v2.6.2.0
-            abi_check: 730687ae79bb6c3290afff535aa0e98b0531d165
+            # abi_check: v3.1.3.0
+            abi_check: 488dfb240884fcb58c889f340c869c2226ca2a28
             setenvs: export OIIO_CMAKE_FLAGS="-DOIIO_BUILD_TOOLS=0 -DOIIO_BUILD_TESTS=0 -DUSE_PYTHON=0"
                             USE_OPENCV=0 USE_FFMPEG=0 USE_PYTHON=0 USE_FREETYPE=0
 
@@ -397,7 +414,7 @@ jobs:
             cc_compiler: gcc-13
             cxx_compiler: g++-13
             cxx_std: 20
-            fmt_ver: 11.1.4
+            fmt_ver: 11.2.0
             opencolorio_ver: v2.4.2
             openexr_ver: v3.3.3
             pybind11_ver: v2.13.6
@@ -424,6 +441,7 @@ jobs:
             pybind11_ver: master
             python_ver: "3.12"
             simd: avx2,f16c
+            benchmark: 1
             setenvs: export LIBJPEGTURBO_VERSION=main
                             LIBRAW_VERSION=master
                             LIBTIFF_VERSION=master
@@ -494,6 +512,46 @@ jobs:
             depcmds: |
               sudo rm -rf /usr/local/include/OpenEXR
               sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
+          - desc: Linux ARM latest releases gcc14 C++20 py3.12 exr3.3 ocio2.4
+            nametag: linux-latest-releases
+            runner: ubuntu-24.04-arm
+            cc_compiler: gcc-14
+            cxx_compiler: g++-14
+            cxx_std: 20
+            fmt_ver: 11.1.4
+            opencolorio_ver: v2.4.2
+            openexr_ver: v3.3.3
+            pybind11_ver: v2.13.6
+            python_ver: "3.12"
+            setenvs: export LIBJPEGTURBO_VERSION=3.1.0
+                            LIBRAW_VERSION=0.21.3
+                            LIBTIFF_VERSION=v4.7.0
+                            OPENJPEG_VERSION=v2.5.3
+                            PTEX_VERSION=v2.4.3
+                            PUGIXML_VERSION=v1.15
+                            WEBP_VERSION=v1.5.0
+                            FREETYPE_VERSION=VER-2-13-3
+                            USE_OPENVDB=0
+          - desc: Linux ARM latest releases clang18 C++20 py3.12 exr3.3 ocio2.4
+            nametag: linux-latest-releases
+            runner: ubuntu-24.04-arm
+            cc_compiler: clang-18
+            cxx_compiler: clang++-18
+            cxx_std: 20
+            fmt_ver: 11.1.4
+            opencolorio_ver: v2.4.2
+            openexr_ver: v3.3.3
+            pybind11_ver: v2.13.6
+            python_ver: "3.12"
+            setenvs: export LIBJPEGTURBO_VERSION=3.1.0
+                            LIBRAW_VERSION=0.21.3
+                            LIBTIFF_VERSION=v4.7.0
+                            OPENJPEG_VERSION=v2.5.3
+                            PTEX_VERSION=v2.4.3
+                            PUGIXML_VERSION=v1.15
+                            WEBP_VERSION=v1.5.0
+                            FREETYPE_VERSION=VER-2-13-3
+                            USE_OPENVDB=0
 
 
   #
@@ -522,6 +580,7 @@ jobs:
       simd: ${{ matrix.simd }}
       skip_build: ${{ matrix.skip_build }}
       skip_tests: ${{ matrix.skip_tests }}
+      benchmark: ${{ matrix.benchmark }}
       abi_check: ${{ matrix.abi_check }}
       build_docs: ${{ matrix.build_docs }}
       generator: ${{ matrix.generator }}
@@ -543,6 +602,7 @@ jobs:
             simd: sse4.2,avx2
             ctest_test_timeout: 1200
             setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0
+            benchmark: 1
           - desc: MacOS-14-ARM aclang15/C++20/py3.12
             runner: macos-14
             nametag: macos14-arm-py312
@@ -557,6 +617,7 @@ jobs:
             cxx_compiler: clang++
             cxx_std: 20
             python_ver: "3.13"
+            benchmark: 1
 
 
   #
@@ -585,6 +646,7 @@ jobs:
       simd: ${{ matrix.simd }}
       skip_build: ${{ matrix.skip_build }}
       skip_tests: ${{ matrix.skip_tests }}
+      benchmark: ${{ matrix.benchmark }}
       abi_check: ${{ matrix.abi_check }}
       build_docs: ${{ matrix.build_docs }}
       generator: ${{ matrix.generator }}
@@ -598,13 +660,23 @@ jobs:
         include:
           - desc: Windows-2019 VS2019
             runner: windows-2019
+            nametag: windows-2019
             vsver: 2019
             generator: "Visual Studio 16 2019"
             python_ver: "3.9"
             setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
           - desc: Windows-2022 VS2022
             runner: windows-2022
+            nametag: windows-2022
+            vsver: 2022
+            generator: "Visual Studio 17 2022"
+            python_ver: "3.9"
+            setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
+          - desc: Windows-2025 VS2022
+            runner: windows-2025
+            nametag: windows-2025
             vsver: 2022
             generator: "Visual Studio 17 2022"
             python_ver: "3.9"
             setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
+            benchmark: 1

.github/workflows/release-sign.yml

@@ -48,8 +48,8 @@ jobs:
           echo OPENIMAGEIO_TARBALL=OpenImageIO-${TAG//v}.tar.gz >> $GITHUB_ENV
         shell: bash
 
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Create archive
         run: git archive --format=tar.gz -o ${OPENIMAGEIO_TARBALL} --prefix ${OPENIMAGEIO_PREFIX} ${TAG}

.github/workflows/scorecard.yml

@@ -40,11 +40,10 @@ jobs:
       actions: read
 
     steps:
-      - name: "Checkout code"
+      - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-          fetch-depth: '0'
 
       - name: "Run analysis"
         uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
@@ -66,7 +65,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: SARIF file
           path: results.sarif