support onetbb and boost 1.87.0

.github/workflows/main.yml

@@ -30,73 +30,71 @@ jobs:
         # and then use `include` to define their settings.
 
         name: [
-          linux-gcc9,
-          linux-debug-gcc9,
           linux-gcc11,
+          linux-debug-gcc11,
           windows,
-          windows-debug
+          windows-debug,
+          macos-arm64
         ]
 
         include:
 
-          - name: linux-gcc9
+          - name: linux-gcc11
             os: ubuntu-20.04
             buildType: RELEASE
-            containerImage: ghcr.io/gafferhq/build/build:2.1.2
+            containerImage: ghcr.io/gafferhq/build/build:3.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc9.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
+            jobs: 4
 
-          - name: linux-debug-gcc9
+          - name: linux-debug-gcc11
             os: ubuntu-20.04
             buildType: DEBUG
-            containerImage: ghcr.io/gafferhq/build/build:2.1.2
-            options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc9.tar.gz
-            tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
-            publish: false
-
-          - name: linux-gcc11
-            os: ubuntu-20.04
-            buildType: RELEASE
             containerImage: ghcr.io/gafferhq/build/build:3.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
-            publish: true
+            publish: false
+            jobs: 4
 
           - name: windows
-            os: windows-2019
+            os: windows-2022
             buildType: RELEASE
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
+            jobs: 4
 
           - name: windows-debug
-            os: windows-2019
+            os: windows-2022
             buildType: RELWITHDEBINFO
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: false
+            jobs: 4
+
+          - name: macos-arm64
+            os: macos-14
+            buildType: RELEASE
+            options: .github/workflows/main/options.posix
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-macos-arm64.tar.gz
+            tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
+            publish: true
+            jobs: 3
 
     runs-on: ${{ matrix.os }}
 
     container: ${{ matrix.containerImage }}
 
-    env:
-      # GitHub have moved to running actions on Node20, which prevents them from
-      # running on CentOS 7. The below allows actions to continue running on Node16
-      # until October.
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: ilammy/msvc-dev-cmd@v1.12.1
+    - uses: ilammy/msvc-dev-cmd@v1.13.0
       with:
         sdk: 10.0.17763.0
 
@@ -108,16 +106,8 @@ jobs:
       if: runner.os == 'Windows'
 
     - name: Install toolchain (MacOS)
-      # Prefer `pip install` because it is faster
-      # than `brew install`.
       run: |
-        sudo pip3 install scons==4.0.1
-        # Brew installs all manner of headers into `/usr/local/include`, including
-        # OpenEXR and Imath versions that conflict with our own. We can't stop Clang
-        # finding them because Clang is hardcoded to look in `/usr/local/include`
-        # _before_ anything we specify with `-isystem`, despite documentation to the
-        # contrary. So we nuke the headers.
-        rm -rf /usr/local/include/*
+        pipx install scons==4.6.0
         echo PACKAGE_COMMAND=tar -czf >> $GITHUB_ENV
         echo PACKAGE_EXTENSION=tar.gz >> $GITHUB_ENV
       if: runner.os == 'macOS'
@@ -161,7 +151,7 @@ jobs:
       shell: bash
 
     - name: Cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: sconsCache
         key: ${{ runner.os }}-${{ matrix.containerImage }}-${{env.CORTEX_DEPENDENCIES_HASH}}-${{ matrix.buildType }}-${{ github.sha }}
@@ -170,7 +160,7 @@ jobs:
 
     - name: Build
       run: |
-       scons -j 2 BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
+       scons -j ${{ matrix.jobs }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
        # Copy the config log for use in the "Debug Failures" step, because it
        # gets clobbered by the `scons test*` call below.
        cp config.log buildConfig.log
@@ -188,10 +178,13 @@ jobs:
        ${{ env.PACKAGE_COMMAND }} ${{ env.CORTEX_BUILD_NAME }}.${{env.PACKAGE_EXTENSION}} ${{ env.CORTEX_BUILD_NAME }}
       if: matrix.publish
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ env.CORTEX_BUILD_NAME }}
         path: ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }}
+        # Using compression-level 0 avoids compressing our already compressed
+        # package and results in a significantly faster upload.
+        compression-level: 0
       if: matrix.publish
 
     - name: Publish Release

.github/workflows/main/options.windows

@@ -2,7 +2,7 @@ import os
 
 deps = os.environ.get( "CORTEX_BUILD_NAME" )
 includes = os.path.join( deps, "include" )
-libs = os.path.join( deps, "lib" )
+libs = os.path.join( deps, "lib" ) + os.pathsep + os.path.join( deps, "bin" )
 
 build = os.environ.get( "CORTEX_BUILD_NAME" )
 

Changes

@@ -1,8 +1,115 @@
-10.5.x.x (relative to 10.5.9.2)
+10.5.x.x (relative to 10.5.13.0)
 ========
 
 
 
+10.5.13.0 (relative to 10.5.12.0)
+=========
+
+Features
+--------
+
+- PointInstancerAlgo : Added support for the env var IECOREUSD_POINTINSTANCER_RELATIVEPROTOTYPES. If this is set to "1", then when USD PointInstancers are loaded as point clouds, if they contain prototype paths beneath themselves in the hierarchy, those prototype paths will be loaded as relative paths, starting with "./". This aligns with how Gaffer will now handle prototype paths, and allows point instancers to be relocated in the hierarchy.
+
+Fixes
+-----
+
+- USDScene :
+  - Fixed timecodes used when writing animated attributes.
+  - Fixed timecodes used when writing animated bounds.
+
+10.5.12.0 (relative to 10.5.11.0)
+========
+
+Features
+--------
+
+- IECoreImage::DisplayDriverServer: Adds option to display server to client driver to write to the same display driver.
+
+Fixes
+-----
+
+- IECore : Fixed bug that was causing imath vectors and colors with values of `inf` / `std::numeric_limits<float>::infinity()` to be serialised in a way that could not be evaluated with `eval()`.
+
+Build
+-----
+
+- CI :
+  - IECoreHoudini.LiveSceneTest : Reverted recent update since #1441 made it unnecessary.
+
+10.5.11.0 (relative to 10.5.10.0)
+=========
+
+Improvements
+------------
+
+- OpenImageIOAlgo::DataView : Added support for Int64Data, UInt64Data, Int64VectorData and UInt64VectorData.
+- IECoreHoudini : Updated to support Houdini 20.0 and 20.5.
+- IECoreMaya : Avoid compilation warnings with new gcc.
+
+Fixes
+-----
+
+- MeshAlgo::MeshSplitter/segment : Fixed so that we now preserve vertex order while splitting. This matches the old behvaviour before 1.4.6.0 when segment was optimized. This doesn't affect the correctness of the result, but is a better convention to match user expectations - when combining meshes followed by splitting, it's better if you get back the same vertex ids you started with.
+
+Build
+-----
+
+- SConstruct :
+  - Added `PYBIND11_INCLUDE_PATH` option.
+  - Added `VDB_PYTHON_PATH` to USD tests.
+  - Added `INSTALL_CREATE_SYMLINKS`, which allows you to disable the creation of version symlinks at the end of the install.
+  - Added `USG_SHIMLIB_PATH` which may be necessary to run nuke tests.
+
+- CI :
+  - IECoreHoudini tests updated to pass on newer environments.
+  - IECoreGL tests updated with relaxed precisions for image comparisons.
+  - Updated to GafferHQ/dependencies 9.0.0.
+  - Updated Windows build to use MSVC 2022.
+
+10.5.10.0 (relative to 10.5.9.5)
+=========
+
+Improvements
+------------
+
+- USDScene : PointInstancers are now loaded with `invisibleIds` and `inactiveIds` as primitive variables.
+- IECoreUSD::DataAlgo :
+  - Made `valueTypeName` argument to `fromUSD( const VtValue & )` optional. This allows VtValue to be converted without having additional type information available.
+  - Added conversions between `VtDictionary` and `CompoundData`.
+- IECoreUSD::ShaderAlgo :
+  - Stopped writing `cortex_autoAdaptor` metadata, which would cause errors in DCCs without the definition registered.
+  - Added round-tripping of all blind data stored on Shaders.
+- IECoreScene::ShaderNetworkAlgo : Added a mechanism for customising the adapter shaders used by `addComponentConnectionAdapters()`.
+
+10.5.9.5 (relative to 10.5.9.4)
+========
+
+Fixes
+-----
+
+- USDScene : Fixed crash loading skinned facevarying normals (bug introduced in 10.5.9.3).
+
+10.5.9.4 (relative to 10.5.9.3)
+========
+
+Fixes
+-----
+
+- USDScene : Fixed crash loading a Volume with an empty field.
+
+10.5.9.3 (relative to 10.5.9.2)
+========
+
+Fixes
+-----
+
+- USDScene :
+  - Fixed crash attempting to write to a file that is already open for reading. An exception is now thrown instead.
+  - Fixed loading of skinned facevarying normals.
+  - `lightLink` and `shadowLink` collections on UsdLuxLightAPI are no longer treated as sets.
+- Version.h : Fixed `*Version()` functions to return the runtime version of the library, not the version that client code was compiled with. Use the `CORTEX_*_VERSION` macros for compile time checks.
+- IECoreUSD : Asset and volume paths now use `/` in the resolved path on all operating systems. This behavior can be disabled by setting the `IECOREUSD_FORCE_ASSET_PATH_FORWARD_SLASH` environment variable to a value of `0`.
 
 10.5.9.2 (relative to 10.5.9.1)
 ========