Merge remote-tracking branch 'upstream/dev' into fix_skel_crash

Author: roggiezhang-nv

.github/workflows/buildusd.yml

@@ -5,49 +5,35 @@ on:
     branches:
       - dev
       - release
-  issue_comment:
-    types: [created]
+  pull_request:
+    branches:
+      - dev
+    paths:
+      - '**'
+      - '!.github/workflows/**'
 
 jobs:
-  GetUser:
+  Validation:
     runs-on: ubuntu-22.04
-    timeout-minutes: 5
+    timeout-minutes: 30
     outputs:
-      require-result: ${{ steps.check.outputs.require-result }}
+      validation-failed: ${{ steps.changed-workflows.outputs.any_changed }}
     steps:
-      - uses: actions-cool/check-user-permission@v2
-        id: check
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
-          require: 'write'
-          username: ${{ github.event.comment.user.login }}
-
-  GetGitRef:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 5
-    outputs:
-      ref: ${{ steps.setter.outputs.ref }}
-    steps:
-      - name: Get push ref
-        if: ${{ github.event_name == 'push' }}
-        run: |
-          echo "REF=${{ github.ref }}" >> $GITHUB_ENV
-      - name: Get PR ref
-        if: ${{ github.event.issue.pull_request }}
-        run: |
-          echo "REF=refs/pull/${{ github.event.issue.number }}/merge" >> $GITHUB_ENV
-      - name: Print ENV_VAR
-        run: |
-          echo "The value of REF is $REF"
-      - name: Set ENV_VAR
-        id: setter
-        run: |
-          echo "ref=$REF" >> "$GITHUB_OUTPUT"
+          ref: ${{ github.ref }}
+      - name: Check workflows directory
+        id: changed-workflows
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c #v46
+        with:
+          files: |
+            .github/workflows/**
 
   Linux:
     needs:
-      - GetUser
-      - GetGitRef
-    if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
+      - Validation
+    if: ${{ (github.event_name == 'pull_request' && needs.Validation.outputs.validation-failed != 'true') || github.event_name == 'push' }}
     runs-on: ubuntu-22.04
     env:
       PYTHON_VERSION: "3.9"
@@ -56,7 +42,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{needs.GetGitRef.outputs.ref}}
+          ref: ${{ github.ref }}
       - name: Restore cached artifacts
         id: cache-usd-build-dependency
         uses: actions/cache/restore@v4
@@ -94,22 +80,21 @@ jobs:
       - name: Test USD
         working-directory: ./USDgen/build/OpenUSD
         run: |
-          ctest -V -C Release
+          ctest -V -C Release --exclude-regex "testExecGeomXformable_Perf_Large"
 
   macOS:
     needs:
-      - GetUser
-      - GetGitRef
-    if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
-    runs-on: macos-13
+      - Validation
+    if: ${{ (github.event_name == 'pull_request' && needs.Validation.outputs.validation-failed != 'true') || github.event_name == 'push' }}
+    runs-on: macos-15
     env:
       PYTHON_VERSION: "3.11"
     timeout-minutes: 120
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{needs.GetGitRef.outputs.ref}}
+          ref: ${{ github.ref }}
       - name: Restore cached artifacts
         id: cache-usd-build-dependency
         uses: actions/cache/restore@v4
@@ -125,7 +110,7 @@ jobs:
       - name: Install dependencies
         run: |
           export PATH=/Applications/CMake.app/Contents/bin:$PATH
-          sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
+          sudo xcode-select -s /Applications/Xcode_16.app/Contents/Developer
           # Set SYSTEM_VERSION_COMPAT while installing Python packages to
           # accommodate the macOS version numbering change from 10.x to 11
           export SYSTEM_VERSION_COMPAT=1
@@ -152,13 +137,12 @@ jobs:
         working-directory: ./USDgen/build/OpenUSD
         run: |
           export PATH=/Applications/CMake.app/Contents/bin:$PATH
-          ctest -V -C Release
+          ctest -V -C Release --exclude-regex "testExecGeomXformable_Perf_Large"
 
   Windows:
     needs:
-      - GetUser
-      - GetGitRef
-    if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
+      - Validation
+    if: ${{ (github.event_name == 'pull_request' && needs.Validation.outputs.validation-failed != 'true') || github.event_name == 'push' }}
     runs-on: windows-2019
     env:
       PYTHON_VERSION: "3.9"
@@ -167,7 +151,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{needs.GetGitRef.outputs.ref}}
+          ref: ${{ github.ref }}
       - name: Restore cached artifacts
         id: cache-usd-build-dependency
         uses: actions/cache/restore@v4
@@ -204,9 +188,9 @@ jobs:
       - name: Test USD
         working-directory: ./USDgen/build/OpenUSD
         run: |
-          call set PATH=D:\a\OpenUSD\OpenUSD\USDinst\bin;D:\a\OpenUSD\OpenUSD\USDinst\lib;D:\a\OpenUSD\OpenUSD\USDinst\share\usd\examples\plugin;D:\a\OpenUSD\OpenUSD\USDinst\plugin\usd;%PATH%
-          call set PYTHONPATH=D:\a\OpenUSD\OpenUSD\USDinst\lib\python;%PYTHONPATH%
+          call set PATH=${{ github.workspace }}\USDinst\bin;${{ github.workspace }}\USDinst\lib;${{ github.workspace }}\USDinst\share\usd\examples\plugin;${{ github.workspace }}\USDinst\plugin\usd;%PATH%
+          call set PYTHONPATH=${{ github.workspace }}\USDinst\lib\python;%PYTHONPATH%
           # Internal ticket USD-8035
-          ctest -V -C Release --exclude-regex "TfPathUtils"
+          ctest -V -C Release --exclude-regex "TfPathUtils|testExecGeomXformable_Perf_Large"
         shell: cmd
 

.github/workflows/pypi.yml

@@ -115,7 +115,7 @@ jobs:
           - VERSION_SPEC: '3.12'
             INTERPRETER: python3.12
             TAG: cp312
-    runs-on: macos-13
+    runs-on: macos-15
     timeout-minutes: 120
     steps:
       - name: Checkout code
@@ -132,7 +132,7 @@ jobs:
           ${{ matrix.PYTHON.INTERPRETER }} -m pip install delocate~=0.10.2 wheel
       - name: Build USD
         run: |
-          sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
+          sudo xcode-select -s /Applications/Xcode_16.app/Contents/Developer
           ${{ matrix.PYTHON.INTERPRETER }} build_scripts/build_usd.py --build-args USD,"-DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_INSTALL_LOCATION=../pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --generator Xcode --build-target universal --build $GITHUB_WORKSPACE/USDgen/build --src $GITHUB_WORKSPACE/USDgen/src $GITHUB_WORKSPACE/USDinst -v
       - name: Packaging USD
         run: |
@@ -277,23 +277,23 @@ jobs:
             PYTHON_INTERPRETER: python3
           - NAME: Mac_Python38
             PYTHON_VERSION_SPEC: '3.8'
-            IMAGE: macos-13
+            IMAGE: macos-15
             PYTHON_INTERPRETER: python3  
           - NAME: Mac_Python39
             PYTHON_VERSION_SPEC: '3.9'
-            IMAGE: macos-13
+            IMAGE: macos-15
             PYTHON_INTERPRETER: python3
           - NAME: Mac_Python310
             PYTHON_VERSION_SPEC: '3.10'
-            IMAGE: macos-13
+            IMAGE: macos-15
             PYTHON_INTERPRETER: python3  
           - NAME: Mac_Python311
             PYTHON_VERSION_SPEC: '3.11'
-            IMAGE: macos-13
+            IMAGE: macos-15
             PYTHON_INTERPRETER: python3          
           - NAME: Mac_Python312
             PYTHON_VERSION_SPEC: '3.12'
-            IMAGE: macos-13
+            IMAGE: macos-15
             PYTHON_INTERPRETER: python3          
           - NAME: Windows_Python38
             PYTHON_VERSION_SPEC: '3.8'

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [25.05.01] - 2025-05-19
+
+### USD
+
+- Fix GfColor construction when converting color spaces.
+
+- Fixed crash when sampling a float or half-valued TsSpline.
+  (Issue: [#3614](https://github.com/PixarAnimationStudios/OpenUSD/issues/3614)
+
+- Fixed bug where UsdStage would not update when a sublayer was added or removed.
+  (Issue: [#3615](https://github.com/PixarAnimationStudios/OpenUSD/issues/3615)
+
+### UsdImaging
+
+- Fixed typo in release notes for environment variable used to enable scene
+  indexes. The correct variable is `USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX`.
+
 ## [25.05] - 2025-04-28
 
 We anticipate moving to the [VFX Reference Platform CY2023](https://vfxplatform.com/)

USD_CLA_Individual.pdf

@@ -1770,6 +1770,12 @@ def InstallUSD(context, force, buildArgs):
                 extraArgs.append('-DPXR_BUILD_PRMAN_PLUGIN=ON')
             else:
                 extraArgs.append('-DPXR_BUILD_PRMAN_PLUGIN=OFF')                
+
+            if MacOS():
+                if context.buildImageIO:
+                    extraArgs.append('-DPXR_BUILD_IMAGEIO_PLUGIN=ON')
+                else:
+                    extraArgs.append('-DPXR_BUILD_IMAGEIO_PLUGIN=OFF')
 
             if context.buildOIIO:
                 extraArgs.append('-DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON')
@@ -2160,6 +2166,12 @@ def InstallUSD(context, force, buildArgs):
                       help="Build OpenImageIO plugin for USD")
 subgroup.add_argument("--no-openimageio", dest="build_oiio", action="store_false",
                       help="Do not build OpenImageIO plugin for USD (default)")
+if MacOS():
+    group.add_argument("--imageio", dest="build_imageio", action="store_true", 
+                      default=True,
+                      help="Build the ImageIO.framework plugin for USD (default).")
+    group.add_argument("--no-imageio", dest="build_imageio", action="store_false",
+                       help="Do not build build the ImageIO.framework plugin for USD.")
 subgroup = group.add_mutually_exclusive_group()
 subgroup.add_argument("--opencolorio", dest="build_ocio", action="store_true", 
                       default=False,
@@ -2373,6 +2385,8 @@ def __init__(self, args):
         self.buildOIIO = ((args.build_oiio or (self.buildUsdImaging
                                                and self.buildTests))
                           and not embedded)
+        if MacOS():
+            self.buildImageIO = args.build_imageio
         self.buildOCIO = args.build_ocio and not embedded
 
         # - Alembic Plugin
@@ -2678,8 +2692,10 @@ def _JoinVersion(v):
     Imaging                     {buildImaging}
       Ptex support:             {enablePtex}
       OpenVDB support:          {enableOpenVDB}
+      ImageIO support:          {buildImageIO}
       OpenImageIO support:      {buildOIIO} 
       OpenColorIO support:      {buildOCIO} 
+      Embree support:           {buildEmbree}
       PRMan support:            {buildPrman}
       Vulkan support:           {enableVulkan}
     UsdImaging                  {buildUsdImaging}
@@ -2742,8 +2758,10 @@ def FormatBuildArguments(buildArgs):
     buildImaging=("On" if context.buildImaging else "Off"),
     enablePtex=("On" if context.enablePtex else "Off"),
     enableOpenVDB=("On" if context.enableOpenVDB else "Off"),
+    buildImageIO=("On" if (MacOS() and context.buildImageIO) else "Off"),
     buildOIIO=("On" if context.buildOIIO else "Off"),
     buildOCIO=("On" if context.buildOCIO else "Off"),
+    buildEmbree=("On" if context.buildEmbree else "Off"),
     buildPrman=("On" if context.buildPrman else "Off"),
     buildUsdImaging=("On" if context.buildUsdImaging else "Off"),
     buildUsdview=("On" if context.buildUsdview else "Off"),

build_scripts/build_usd.py

@@ -14,6 +14,9 @@ option(PXR_BUILD_USD_TOOLS "Build commandline tools" ON)
 option(PXR_BUILD_IMAGING "Build imaging components" ON)
 option(PXR_BUILD_EMBREE_PLUGIN "Build embree imaging plugin" OFF)
 option(PXR_BUILD_OPENIMAGEIO_PLUGIN "Build OpenImageIO plugin" OFF)
+if(APPLE)
+    option(PXR_BUILD_IMAGEIO_PLUGIN "Build the ImageIO.framework plugin for Apple platforms" ON)
+endif()
 option(PXR_BUILD_OPENCOLORIO_PLUGIN "Build OpenColorIO plugin" OFF)
 option(PXR_BUILD_USD_IMAGING "Build USD imaging components" ON)
 option(PXR_BUILD_USD_VALIDATION "Build USD validation library and core USD validators" ON)

cmake/defaults/Options.cmake

@@ -914,6 +914,12 @@ function(pxr_register_test TEST_NAME)
         set(testWrapperCmd ${testWrapperCmd} --expected-return-code=${bt_EXPECTED_RETURN_CODE})
     endif()
 
+    # Ensure that TF_FATAL_VERIFY is enabled for tests, so that failed verifies
+    # turn into test failures.
+    # Set this first, so that env vars passed to pxr_register_test can turn off
+    # TF_FATAL_VERIFY where desired.
+    set(testWrapperCmd ${testWrapperCmd} --env-var=TF_FATAL_VERIFY=1)
+
     if (bt_ENV)
         foreach(env ${bt_ENV})
             set(testWrapperCmd ${testWrapperCmd} --env-var=${env})

cmake/macros/Public.cmake

@@ -672,7 +672,7 @@ Options:
   --outputType validity|summary|outline|pseudoLayer|layer
                               Specify output format; 'summary' reports overall statistics,
                               'outline' is a flat text report of paths and fields,
-                              'pseudoLayer' is similar to the sdf file format but with truncated
+                              'pseudoLayer' is similar to the usda file format but with truncated
                               array values and timeSamples for human readability, and 'layer' is
                               true layer output, with the format controlled by the 'outputFile'
                               and 'outputFormat' arguments. Default: outline

docs/toolset.help

@@ -511,8 +511,8 @@ NcRGB NcTransformColor(const NcColorSpace* dst, const NcColorSpace* src, NcRGB r
         return rgb;
     }
 
-    NcM33f tx = _M33fMultiply(NcGetRGBToXYZMatrix(src),
-                               NcGetXYZToRGBMatrix(dst));
+    NcM33f tx = _M33fMultiply(NcGetRGBToXYZMatrix(dst),
+                              NcGetXYZToRGBMatrix(src));
 
     // if the source color space indicates a curve remove it.
     rgb.r = _ToLinear(src, rgb.r);
@@ -536,8 +536,8 @@ void NcTransformColors(const NcColorSpace* dst, const NcColorSpace* src, NcRGB*
     if (!dst || !src || !rgb)
         return;
 
-    NcM33f tx = _M33fMultiply(NcGetRGBToXYZMatrix(src),
-                               NcGetXYZToRGBMatrix(dst));
+    NcM33f tx = _M33fMultiply(NcGetRGBToXYZMatrix(dst),
+                              NcGetXYZToRGBMatrix(src));
 
     // if the source color space indicates a curve remove it.
     for (size_t i = 0; i < count; i++) {
@@ -629,8 +629,8 @@ void NcTransformColorsWithAlpha(const NcColorSpace* dst, const NcColorSpace* src
     if (!dst || !src || !rgba)
         return;
 
-    NcM33f tx = _M33fMultiply(NcGetRGBToXYZMatrix(src),
-                               NcGetXYZToRGBMatrix(dst));
+    NcM33f tx = _M33fMultiply(NcGetRGBToXYZMatrix(dst),
+                              NcGetXYZToRGBMatrix(src));
 
     // if the source color space indicates a curve remove it.
     for (size_t i = 0; i < count; i++) {

pxr/base/gf/nc/nanocolor.c

@@ -204,19 +204,19 @@ main(int argc, char *argv[])
         TF_AXIOM(colG22Rec709.GetColorSpace() == csG22Rec709);
 
         TF_AXIOM(colLinRec709.GetColorSpace() == csLinearRec709);
-        GfColorTest colSRGB_2(colLinRec709, csSRGB);
-        GfVec2f xy1 = colG22Rec709.GetChromaticity();
-        GfVec2f xy2 = colSRGB_2.GetChromaticity();
-        TF_AXIOM(GfIsClose(xy1, xy2, 1e-5f));
+        const GfColorTest colSRGB_2(colLinRec709, csSRGB);
+        const GfVec2f chromaRec709 = colG22Rec709.GetChromaticity();
+        const GfVec2f chromaRec709_2 = colSRGB_2.GetChromaticity();
+        TF_AXIOM(GfIsClose(chromaRec709, chromaRec709_2, 1e-5f));
+
         GfColorTest colAp0(colSRGB_2, csAp0);
-        GfVec2f xy3 = colAp0.GetChromaticity();
-        TF_AXIOM(GfIsClose(xy1, xy3, 3e-2f));
+        const GfVec2f chroma_AP0 = colAp0.GetChromaticity();
         GfColorTest colSRGB_3(colAp0, csSRGB);
-        GfVec2f xy4 = colAp0.GetChromaticity();
-        TF_AXIOM(GfIsClose(xy1, xy4, 3e-2f));
         GfColorTest col_SRGBP3(colSRGB_3, csSRGBP3);
-        GfVec2f xy5 = col_SRGBP3.GetChromaticity();
-        TF_AXIOM(GfIsClose(xy1, xy5, 3e-2f));
+
+        GfColorTest colToAp0(col_SRGBP3, csAp0);
+        const GfVec2f xy6 = colToAp0.GetChromaticity();
+        TF_AXIOM(GfIsClose(chroma_AP0, xy6, 3e-2f));
 
         // all the way back to rec709
         GfColorTest colLinRec709_2(col_SRGBP3, csLinearRec709);