Merge branch 'AcademySoftwareFoundation:main' into CUDA

Author: 1div0

.github/workflows/ci.yml

@@ -463,7 +463,7 @@ jobs:
                             LIBRAW_VERSION=0.21.4
                             LIBTIFF_VERSION=v4.7.1
                             OPENJPEG_VERSION=v2.5.4
-                            PTEX_VERSION=v2.4.3
+                            PTEX_VERSION=v2.5.0
                             PUGIXML_VERSION=v1.15
                             WEBP_VERSION=v1.6.0
                             FREETYPE_VERSION=VER-2-14-0
@@ -502,7 +502,7 @@ jobs:
             # Ensure we are testing all the deps we think we are. We would
             # like this test to have minimal missing dependencies.
             required_deps: all
-            optional_deps: 'CUDAToolkit;DCMTK;JXL;Nuke;OpenCV;OpenGL;OpenVDB;R3DSDK'
+            optional_deps: 'CUDAToolkit;DCMTK;JXL;libuhdr;Nuke;OpenCV;OpenGL;openjph;R3DSDK;'
           - desc: all local builds gcc12 C++17 avx2 exr3.2 ocio2.3
             nametag: linux-local-builds
             runner: ubuntu-22.04
@@ -517,18 +517,19 @@ jobs:
                             PTEX_VERSION=v2.4.2
                             PUGIXML_VERSION=v1.14
                             WEBP_VERSION=v1.4.0
-          - desc: clang15 C++17 avx2 exr3.1 ocio2.3
-            nametag: linux-clang15
-            runner: ubuntu-22.04
-            cxx_compiler: clang++-15
-            cc_compiler: clang-15
+          - desc: clang18 C++17 avx2 exr3.1 ocio2.3
+            nametag: linux-clang18
+            runner: ubuntu-24.04
+            cxx_compiler: clang++
+            cc_compiler: clang
             cxx_std: 17
             fmt_ver: 10.1.1
             opencolorio_ver: v2.3.0
             openexr_ver: v3.1.13
             pybind11_ver: v2.12.0
-            python_ver: "3.10"
+            python_ver: "3.12"
             simd: avx2,f16c
+            setenvs: export USE_OPENVDB=0
           - desc: Linux ARM latest releases gcc14 C++20 py3.12 exr3.4 ocio2.4
             nametag: linux-arm-latest-releases
             runner: ubuntu-24.04-arm

INSTALL.md

@@ -71,7 +71,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
  * If you want support for WebP images:
      * WebP >= 1.1 (tested through 1.6)
  * If you want support for Ptex:
-     * Ptex >= 2.3.1 (probably works for older; tested through 2.4.3)
+     * Ptex >= 2.3.1 (probably works for older; tested through 2.5)
  * If you want to be able to do font rendering into images:
      * Freetype >= 2.10.0 (tested through 2.14)
  * If you want to be able to read "ultra-HDR" embedded in JPEG files:

src/build-scripts/build_Ptex.bash

@@ -33,6 +33,7 @@ git checkout ${PTEX_VERSION} --force
 
 time cmake -S . -B ${PTEX_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_INSTALL_PREFIX=${PTEX_INSTALL_DIR} \
+           -DCMAKE_CXX_STANDARD=17 \
            ${PTEX_CONFIG_OPTS}
 time cmake --build ${PTEX_BUILD_DIR} --config Release --target install
 

src/build-scripts/gh-installdeps.bash

@@ -96,14 +96,17 @@ else
     if [[ "${SKIP_SYSTEM_DEPS_INSTALL}" != "1" ]] ; then
         time sudo apt-get -q install -y --fix-missing \
             git cmake ninja-build ccache g++ \
-            libilmbase-dev libopenexr-dev \
-            libtiff-dev libgif-dev libpng-dev \
+            libtiff-dev libgif-dev libpng-dev libjpeg-dev \
             libraw-dev libwebp-dev \
             libavcodec-dev libavformat-dev libswscale-dev libavutil-dev \
             dcmtk libopenvdb-dev \
             libfreetype6-dev \
             libopencolorio-dev \
-            libtbb-dev || true
+            libtbb-dev \
+            libdeflate-dev bzip2
+        # Iffy ones get the "|| true" treatment so failure is ok
+        time sudo apt-get -q install -y --fix-missing \
+            libjxl-dev || true
     fi
     if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV}" != "0" ]] ; then
         sudo apt-get -q install -y --fix-missing libopencv-dev || true
@@ -133,6 +136,10 @@ else
             libheif-plugin-x265 libheif-dev || true
     fi
 
+    if [[ "${USE_FFMPEG}" != "0" ]] ; then
+        time sudo apt-get -q install -y ffmpeg || true
+    fi
+
     export CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu:$CMAKE_PREFIX_PATH
 
     if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" || "$USE_ICX" != "" ]] ; then

src/build-scripts/install_homebrew_deps.bash

@@ -19,6 +19,7 @@ if [[ `which brew` == "" ]] ; then
     exit 1
 fi
 
+set -ex
 
 if [[ "${DO_BREW_UPDATE:=0}" != "0" ]] ; then
     brew update >/dev/null
@@ -27,42 +28,38 @@ echo ""
 echo "Before my brew installs:"
 brew list --versions
 
-# All cases except for clang-format target, we need the dependencies.
-brew install --display-times -q gcc ccache cmake ninja || true
-brew link --overwrite gcc
-brew install --display-times -q python@${PYTHON_VERSION} || true
-brew unlink [email protected] || true
-brew unlink [email protected] || true
-brew unlink [email protected] || true
-brew link --overwrite --force python@${PYTHON_VERSION} || true
-#brew upgrade --display-times -q cmake || true
-#brew install --display-times -q libtiff
-brew install --display-times -q imath openexr opencolorio
-#brew install --display-times -q libpng giflib webp
-brew install --display-times -q jpeg-turbo openjpeg libultrahdr
-brew install --display-times -q freetype libraw dcmtk pybind11 numpy || true
-brew install --display-times -q ffmpeg libheif ptex || true
-brew install --display-times -q tbb || true
-brew install --display-times -q openvdb || true
-brew install --display-times -q robin-map || true
-if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
-    brew install --display-times -q opencv || true
-fi
-if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then
-    brew install --display-times -q qt${QT_VERSION}
-fi
-if [[ "${USE_LLVM:=0}" != "0" ]] || [[ "${LLVMBREWVER}" != "" ]]; then
-    brew install --display-times -q llvm${LLVMBREWVER}
-    export PATH=/usr/local/opt/llvm/bin:$PATH
+if [[ "$OIIO_BREW_INSTALL_PACKAGES" == "" ]] ; then
+    OIIO_BREW_INSTALL_PACKAGES=" \
+        ccache \
+        dcmtk \
+        ffmpeg \
+        imath \
+        libheif \
+        libraw \
+        libultrahdr \
+        numpy \
+        opencolorio \
+        openexr \
+        openjpeg \
+        openvdb \
+        ptex \
+        pybind11 \
+        robin-map \
+        tbb \
+        "
+    if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
+        OIIO_BREW_INSTALL_PACKAGES+=" opencv"
+    fi
+    if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then
+        OIIO_BREW_INSTALL_PACKAGES+=" qt${QT_VERSION}"
+    fi
 fi
+brew install --display-times -q $OIIO_BREW_INSTALL_PACKAGES $OIIO_BREW_EXTRA_INSTALL_PACKAGES || true
 
 echo ""
 echo "After brew installs:"
 brew list --versions
 
-# Needed on some systems
-pip${PYTHON_VERSION} install numpy
-
 # Set up paths. These will only affect the caller if this script is
 # run with 'source' rather than in a separate shell.
 export PATH=/usr/local/opt/qt5/bin:$PATH

src/libOpenImageIO/imagebufalgo_yee.cpp

@@ -52,7 +52,7 @@ class GaussianPyramid {
         if (lev >= PYRAMID_MAX_LEVELS)
             return 0.0f;
         else
-            return level[lev].getchannel(x, y, 0, 1);
+            return level[lev].getchannel(x, y, 0, 0);
     }
 
 #if 0 /* unused */
@@ -65,7 +65,7 @@ class GaussianPyramid {
     float operator()(int x, int y, int lev) const
     {
         OIIO_DASSERT(lev < PYRAMID_MAX_LEVELS);
-        return level[lev].getchannel(x, y, 0, 1);
+        return level[lev].getchannel(x, y, 0, 0);
     }
 #endif
 

testsuite/diff/ref/out-fmt6.txt

@@ -16,7 +16,7 @@ Computing diff of "img1.exr" vs "img2.exr"
   121 pixels (2.95%) over 1e-06
 FAILURE
 Computing perceptual diff of "img1.exr" vs "img2.exr"
-  Max error  = 1.0 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
+  Max error  = 10.0 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
   121 pixels (2.95%) failed the perceptual test
 FAILURE
 Computing perceptual diff of "img1.exr" vs "img1.exr"
@@ -26,7 +26,7 @@ Comparing "img1.exr" and "img2.exr"
   Mean error = 0
   RMS error = 0
   Peak SNR = 0
-  Max error  = 1 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
+  Max error  = 10 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
   0 pixels (0%) over 0.008
   121 pixels (2.95%) over 0.004
   121 pixels (2.9541%) failed the perceptual test
@@ -38,7 +38,7 @@ Comparing "img1.exr" and "img2.exr"
   Mean error = 0
   RMS error = 0
   Peak SNR = 0
-  Max error  = 1 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
+  Max error  = 10 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
   0 pixels (0%) over 0.008
   121 pixels (2.95%) over 1.0
   121 pixels (2.9541%) failed the perceptual test

testsuite/diff/ref/out.txt

@@ -16,7 +16,7 @@ Computing diff of "img1.exr" vs "img2.exr"
   121 pixels (2.95%) over 1e-06
 FAILURE
 Computing perceptual diff of "img1.exr" vs "img2.exr"
-  Max error  = 1 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
+  Max error  = 10 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
   121 pixels (2.95%) failed the perceptual test
 FAILURE
 Computing perceptual diff of "img1.exr" vs "img1.exr"
@@ -26,7 +26,7 @@ Comparing "img1.exr" and "img2.exr"
   Mean error = 0
   RMS error = 0
   Peak SNR = 0
-  Max error  = 1 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
+  Max error  = 10 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
   0 pixels (0%) over 0.008
   121 pixels (2.95%) over 0.004
   121 pixels (2.9541%) failed the perceptual test
@@ -38,7 +38,7 @@ Comparing "img1.exr" and "img2.exr"
   Mean error = 0
   RMS error = 0
   Peak SNR = 0
-  Max error  = 1 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
+  Max error  = 10 @ (5, 17, R)  values are 0.1, 0.1, 0.1 vs 0.1, 0.6, 0.1
   0 pixels (0%) over 0.008
   121 pixels (2.95%) over 1
   121 pixels (2.9541%) failed the perceptual test