OSL v1.13.5.0

* build(deps): Raise minimum CMake dependency from 3.12 to 3.15 (AcademySoftwareFoundation#1724) * Change RendererServices::get_texture_handle back to ustring (AcademySoftwareFoundation#1726) * The recently added SS::find_symloc can have const args (AcademySoftwareFoundation#1723) * perf(gpu): Move qualifying GroupData params onto stack (AcademySoftwareFoundation#1710) * OptiX PTX pipeline overhaul (AcademySoftwareFoundation#1680) * Fix default fmt logic changing in latest openimageio release (AcademySoftwareFoundation#1725) * feat: Add API for building attribute getter free functions. (AcademySoftwareFoundation#1704) * fix: Handle mixed string casting that plagues optix codegen (AcademySoftwareFoundation#1718) * Rs fmt specification - Journaling Algorithm for error, warning, fprintf (AcademySoftwareFoundation#1702)
chellmuth · Sep 19, 2023 · 2dc722f · 2dc722f
1 parent def9af4
commit 2dc722f
Show file tree

Hide file tree

Showing 9 changed files with 19,944 additions and 16,825 deletions.
diff --git a/.spdev.yaml b/.spdev.yaml
@@ -1,37 +1,45 @@
-version: 1.13.4.3
+version: 1.13.5.0
 
 # release notes are used when creating gitlab tags/releases
 # for this project, and are required to be updated with
 # each change to the version number
 release_notes: |
-  * fix: Zero derivs for interactive params when needed (#1700)
+  * build(deps): Raise minimum CMake dependency from 3.12 to 3.15 (#1724)
+  * Change RendererServices::get_texture_handle back to ustring (#1726)
+  * The recently added SS::find_symloc can have const args (#1723)
+  * perf(gpu): Move qualifying GroupData params onto stack (#1710)
+  * OptiX PTX pipeline overhaul (#1680)
+  * Fix default fmt logic changing in latest openimageio release (#1725)
+  * feat: Add API for building attribute getter free functions. (#1704)
+  * fix: Handle mixed string casting that plagues optix codegen (#1718)
+  * Rs fmt specification - Journaling Algorithm for error, warning, fprintf (#1702)
 
 toolchain:
   - kind: Rez
   - kind: CCache
 
 components:
-  # - kind: SPKPackage
-  #   name: spk
-  #   version: 1.13.4.3
-  #   spec_file: osl.spk.yaml
-  #   ci_config:
-  #     parallel: true
-  # - kind: RezCppPackage
-  #   name: rez
-  #   version: 1.13.4.3
-  #   ci_config:
-  #     parallel: true
-  #     tags: ["proxy"]
+  - kind: SPKPackage
+    name: spk
+    version: 1.13.5.0
+    spec_file: osl.spk.yaml
+    ci_config:
+      parallel: true
+  - kind: RezCppPackage
+    name: rez
+    version: 1.13.5.0
+    ci_config:
+      parallel: true
+      tags: ["proxy"]
   - kind: SPKPackage
     name: spk-sparnold
-    version: 1.13.4.3
+    version: 1.13.5.0
     spec_file: osl-sparnold.spk.yaml
     ci_config:
       parallel: true
   - kind: RezCppPackage
     name: rez-sparnold
-    version: 1.13.4.3
+    version: 1.13.5.0
     location: rez-sparnold
     ci_config:
       parallel: true

diff --git a/OpenShadingLanguage b/OpenShadingLanguage
diff --git a/abi/abi-liboslexec-ref.dump → abi/abi-liboslexec.dump b/abi/abi-liboslexec-ref.dump → abi/abi-liboslexec.dump
diff --git a/abi/abi-liboslquery-ref.dump → abi/abi-liboslquery.dump b/abi/abi-liboslquery-ref.dump → abi/abi-liboslquery.dump
diff --git a/build.sh b/build.sh
@@ -23,7 +23,7 @@ export CTEST_PARALLEL_LEVEL
 OSL_CI=1
 
 # Special sauce for version overrides:
-: ${VERSION_OVERRIDE:="-DOSL_VERSION_OVERRIDE=1.13.4.3"}
+# : ${VERSION_OVERRIDE:="-DOSL_VERSION_OVERRIDE=1.13.5.0"}
 
 BUILD_DIR=`realpath ${BUILD_DIR}`
 # ARGS=()
@@ -54,6 +54,12 @@ while [[ $# -gt 0 ]]; do
       --sparnold)
         export BUILD_OSL_FOR_SPARNOLD=1
         ;;
+      --debug)
+        export CMAKE_BUILD_TYPE="Debug"
+        ;;
+      --reldeb)
+        export CMAKE_BUILD_TYPE="RelWithDebInfo"
+        ;;
       *)
         # ARGS+=("$1")
         ;;
@@ -84,7 +90,7 @@ fi
 if [[ "${SPFS_RUNTIME}" != "" ]] ; then
     # env | grep -i spk | sort
     CMAKE_PREFIX_PATH=/spfs
-    PYTHON_VERSION_MAJMIN=${SPK_PKG_python_VERSION_MAJOR}.${SPK_PKG_python_VERSION_MINOR=2}
+    PYTHON_VERSION_MAJMIN=${SPK_PKG_python_VERSION_MAJOR}.${SPK_PKG_python_VERSION_MINOR}
     Python_EXECUTABLE=/spfs/bin/python
     : ${OpenImageIO_ROOT:=/spfs}
     # CMAKE_ARGS=" \
@@ -130,6 +136,7 @@ elif [[ "$REZ_BUILD_ENV" != "" ]] ; then
         -DSP_OS=rhel7 \
         -DCMAKE_DEBUG_POSTFIX=_d \
         -DPYTHON_SITE_DIR=${REZ_BUILD_INSTALL_PATH}/python \
+        -DPython_FIND_STRATEGY=VERSION \
         -DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_PREFIX}/lib \
         -DOIIO_REZ_INSTALL_PATH=${CMAKE_INSTALL_PREFIX} \
         -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
@@ -262,11 +269,11 @@ if [[ -n ${DO_ABI_CHECK} && ( ${CMAKE_BUILD_TYPE} == "Debug" || ${CMAKE_BUILD_TY
     ABI_ARGS+="-public-headers ${CMAKE_INSTALL_PREFIX}/include/OSL "
     echo " "
     echo -e "${COLOR_UNDERLINE}Checking ABI for liboslexec:${COLOR_NORMAL}"
-    abi-dumper $ABI_ARGS ${CMAKE_INSTALL_PREFIX}/lib/liboslexec.so -o build/abi-liboslexec-${SPK_PKG_VERSION_BASE}.dump
-    abi-compliance-checker -l liboslexec -old abi/abi-liboslexec-ref.dump -new build/abi-liboslexec-${SPK_PKG_VERSION_BASE}.dump || true
+    abi-dumper $ABI_ARGS ${CMAKE_INSTALL_PREFIX}/lib/liboslexec.so -o build/abi-liboslexec.dump
+    abi-compliance-checker -l liboslexec -old abi/abi-liboslexec.dump -new build/abi-liboslexec.dump || true
     echo " "
     echo -e "${COLOR_UNDERLINE}Checking ABI for liboslquery:${COLOR_NORMAL}"
-    abi-dumper $ABI_ARGS ${CMAKE_INSTALL_PREFIX}/lib/liboslquery.so -o build/abi-liboslquery-${SPK_PKG_VERSION_BASE}.dump
-    abi-compliance-checker -l liboslquery -old abi/abi-liboslquery-ref.dump -new build/abi-liboslquery-${SPK_PKG_VERSION_BASE}.dump || true
+    abi-dumper $ABI_ARGS ${CMAKE_INSTALL_PREFIX}/lib/liboslquery.so -o build/abi-liboslquery.dump
+    abi-compliance-checker -l liboslquery -old abi/abi-liboslquery.dump -new build/abi-liboslquery.dump || true
     echo " "
 fi
diff --git a/osl-sparnold.spk.yaml b/osl-sparnold.spk.yaml
@@ -1,4 +1,4 @@
-pkg: osl-sparnold/1.13.4.3
+pkg: osl-sparnold/1.13.5.0
   # - name: "Open Shading Language"
   # - description: "Shading language for modern physically based renderers"
   # - url: https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
@@ -50,7 +50,7 @@ build:
     # Other packages not determined by the platform, we chose our own
     # versions of these:
     - pkg: cuda/Binary:11.6
-    - pkg: openimageio-sparnold/Binary:2.5.1.1
+    - pkg: openimageio-sparnold/Binary:2.6.0.0
     - pkg: llvm/Binary:14.0.3
     - pkg: optix/Binary:7.4.0
     - pkg: pugixml/~1.11.0
@@ -71,45 +71,30 @@ build:
     # constraints). Then we'll build variants that set one at a time to the
     # current version of the platform.
     - pkg: spi-platform/=1.0
+    - pkg: houdini195-platform/=1.0
+    - pkg: houdini200-platform/=1.0
     - pkg: katana4-platform/=1.0
-    - pkg: katana5-platform/=1.0
     - pkg: katana6-platform/=1.0
     - pkg: maya2023-platform/=1.0
-    - pkg: houdini195-platform/=1.0
     - pkg: nuke12-platform/=1.0
     - pkg: nuke13-platform/=1.0
+    - pkg: nuke14-platform/=1.0
 
   # variants declares the default set of variants to build and publish
   # using the spk build and make-* commands
   variants:
     # One variant per platform. The others will default to harmless 1.0.
     # Variants redundantly specify some dependency versions that should
     # come from the platforms, in order to greatly speed up solve times.
-    - { spi-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.7.7
-      }
-    - { houdini195-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.9.7
-      }
-    - { katana4-platform: ~2023.01.1.0, osl_cxx: 14, pybind11: =2.6.2,
-        gcc: Binary:6.3.1, python: Binary:2.7.5, boost: Binary:1.70.0
-      }
-    - { katana5-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.7.7
-      }
-    - { katana6-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.9.7
-      }
-    - { maya2023-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.9.7,
-        boost: Binary:1.73.0, imath: Binary:3.1.5
-      }
-    - { nuke12-platform: ~2023.01.1.0, osl_cxx: 14, pybind11: =2.6.2,
-        boost: Binary:1.70.0, imath: Binary:2.4.0,
-      }
-    - { nuke13-platform: ~2023.01.1.0, osl_cxx: 14,
-        boost: Binary:1.70.0, imath: Binary:2.4.0,
-      }
+    - { spi-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { houdini195-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { houdini200-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { katana4-platform: ~2023.10.0.0, osl_cxx: 14, pybind11: =2.6.2 }
+    - { katana6-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { maya2023-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { nuke12-platform: ~2023.10.0.0, osl_cxx: 14, pybind11: =2.6.2 }
+    - { nuke13-platform: ~2023.10.0.0, osl_cxx: 14 }
+    - { nuke14-platform: ~2023.10.0.0, osl_cxx: 17 }
     # NOTE: we've found that pybind11 2.9, combined with Python 2.7, leads
     # to errors. Works fine with python 3.x. So for safety, the variants
     # that still use python 2.7 are locked down to pybind11/2.6.2.

diff --git a/osl.spk.yaml b/osl.spk.yaml
@@ -1,4 +1,4 @@
-pkg: osl/1.13.4.3
+pkg: osl/1.13.5.0
   # - name: "Open Shading Language"
   # - description: "Shading language for modern physically based renderers"
   # - url: https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
@@ -50,7 +50,7 @@ build:
     # Other packages not determined by the platform, we chose our own
     # versions of these:
     - pkg: cuda/Binary:11.6
-    - pkg: openimageio/Binary:2.5.1.1
+    - pkg: openimageio/Binary:2.6.0.0
     - pkg: llvm/Binary:14.0.3
     - pkg: optix/Binary:7.4.0
     - pkg: pugixml/~1.11.0
@@ -71,45 +71,30 @@ build:
     # constraints). Then we'll build variants that set one at a time to the
     # current version of the platform.
     - pkg: spi-platform/=1.0
+    - pkg: houdini195-platform/=1.0
+    - pkg: houdini200-platform/=1.0
     - pkg: katana4-platform/=1.0
-    - pkg: katana5-platform/=1.0
     - pkg: katana6-platform/=1.0
     - pkg: maya2023-platform/=1.0
-    - pkg: houdini195-platform/=1.0
     - pkg: nuke12-platform/=1.0
     - pkg: nuke13-platform/=1.0
+    - pkg: nuke14-platform/=1.0
 
   # variants declares the default set of variants to build and publish
   # using the spk build and make-* commands
   variants:
     # One variant per platform. The others will default to harmless 1.0.
     # Variants redundantly specify some dependency versions that should
     # come from the platforms, in order to greatly speed up solve times.
-    - { spi-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.7.7
-      }
-    - { houdini195-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.9.7
-      }
-    - { katana4-platform: ~2023.01.1.0, osl_cxx: 14, pybind11: =2.6.2,
-        gcc: Binary:6.3.1, python: Binary:2.7.5, boost: Binary:1.70.0
-      }
-    - { katana5-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.7.7
-      }
-    - { katana6-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.9.7
-      }
-    - { maya2023-platform: ~2023.01.1.0, osl_cxx: 17,
-        gcc: Binary:9.3.1, python: Binary:3.9.7,
-        boost: Binary:1.73.0, imath: Binary:3.1.5
-      }
-    - { nuke12-platform: ~2023.01.1.0, osl_cxx: 14, pybind11: =2.6.2,
-        boost: Binary:1.70.0, imath: Binary:2.4.0,
-      }
-    - { nuke13-platform: ~2023.01.1.0, osl_cxx: 14,
-        boost: Binary:1.70.0, imath: Binary:2.4.0,
-      }
+    - { spi-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { houdini195-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { houdini200-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { katana4-platform: ~2023.10.0.0, osl_cxx: 14, pybind11: =2.6.2 }
+    - { katana6-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { maya2023-platform: ~2023.10.0.0, osl_cxx: 17 }
+    - { nuke12-platform: ~2023.10.0.0, osl_cxx: 14, pybind11: =2.6.2 }
+    - { nuke13-platform: ~2023.10.0.0, osl_cxx: 14 }
+    - { nuke14-platform: ~2023.10.0.0, osl_cxx: 17 }
     # NOTE: we've found that pybind11 2.9, combined with Python 2.7, leads
     # to errors. Works fine with python 3.x. So for safety, the variants
     # that still use python 2.7 are locked down to pybind11/2.6.2.

diff --git a/package.py b/package.py
@@ -4,7 +4,7 @@
 
 name = 'OSL'
 
-version = '1.13.4.3'
+version = '1.13.5.0'
 # NOTE: must keep this in sync with the master CMakeLists.txt
 # TODO: can we auto-substitute?
 # @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.@PROJECT_VERSION_TWEAK@'
@@ -23,7 +23,7 @@
 # (including what they need to link to as a result of using our package).
 requires = [
     'OpenEXR-2.4',
-    'OpenImageIO-2.5.1.1',
+    'OpenImageIO-2.6.0.0',
     'llvm-14.0.3',
     'partio-1.14.6',
     'cuda-11.6',
@@ -36,6 +36,7 @@
 # Things we need for our build, but don't need to propagate to downstream
 # projects at all.
 private_build_requires = [
+    'cmake-3.16.4+',
     'pugixml-1.11.4',
     'pybind11-2.9.0'
 ]

diff --git a/rez-sparnold/package.py b/rez-sparnold/package.py
@@ -4,7 +4,7 @@
 
 name = 'OSL_sparnold'
 
-version = '1.13.4.3'
+version = '1.13.5.0'
 # NOTE: must keep this in sync with the master CMakeLists.txt
 # TODO: can we auto-substitute?
 # @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.@PROJECT_VERSION_TWEAK@'
@@ -23,7 +23,7 @@
 # (including what they need to link to as a result of using our package).
 requires = [
     'OpenEXR-2.4',
-    'OpenImageIO_sparnold-2.5.1.1',
+    'OpenImageIO_sparnold-2.6.0.0',
     'llvm-14.0.3',
     'partio-1.14.6',
     'cuda-11.6',
@@ -36,6 +36,7 @@
 # Things we need for our build, but don't need to propagate to downstream
 # projects at all.
 private_build_requires = [
+    'cmake-3.16.4+',
     'pugixml-1.11.4',
     'pybind11-2.9.0'
 ]