Merge tag 'v25.08' into fix-core-profile

Author: brechtvl

.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
@@ -77,7 +63,8 @@ jobs:
           pip install PySide2 PyOpenGL
       - name: Build USD
         run: |
-          python3 build_scripts/build_usd.py --no-materialx --build USDgen/build --src USDgen/src USDinst -v
+          # Not using '--tests' to avoid building extra dependencies that are unneeded for headless tests
+          python3 build_scripts/build_usd.py --no-materialx --build USDgen/build --src USDgen/src USDinst --build-args USD,"-DPXR_HEADLESS_TEST_MODE=ON -DPXR_BUILD_TESTS=ON" -v
       - name: Save build artifacts to cache
         if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
@@ -90,21 +77,24 @@ jobs:
         with:
           name: usd-linux
           path: USDinst
+      - name: Test USD
+        working-directory: ./USDgen/build/OpenUSD
+        run: |
+          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
@@ -120,16 +110,17 @@ 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
           pip install PySide6 PyOpenGL setuptools
           export -n SYSTEM_VERSION_COMPAT
       - name: Build USD
         run: |
+          # Not using '--tests' to avoid building extra dependencies that are unneeded for headless tests
           export PATH=/Applications/CMake.app/Contents/bin:$PATH
-          python3 build_scripts/build_usd.py --no-materialx --generator Xcode --build USDgen/build --src USDgen/src USDinst -v
+          python3 build_scripts/build_usd.py --no-materialx --generator Xcode --build USDgen/build --src USDgen/src USDinst --build-args USD,"-DPXR_HEADLESS_TEST_MODE=ON -DPXR_BUILD_TESTS=ON" -v
       - name: Save build artifacts to cache
         if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
@@ -142,21 +133,25 @@ jobs:
         with:
           name: usd-macOS
           path: USDinst
+      - name: Test USD
+        working-directory: ./USDgen/build/OpenUSD
+        run: |
+          export PATH=/Applications/CMake.app/Contents/bin:$PATH
+          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' }}
-    runs-on: windows-2019
+      - Validation
+    if: ${{ (github.event_name == 'pull_request' && needs.Validation.outputs.validation-failed != 'true') || github.event_name == 'push' }}
+    runs-on: windows-2022
     env:
       PYTHON_VERSION: "3.9"
     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
@@ -175,7 +170,8 @@ jobs:
           python -m pip install PyOpenGL PySide2
       - name: Build USD
         run: |
-          python build_scripts/build_usd.py --no-materialx --generator "Visual Studio 16 2019" --build USDgen/build --src USDgen/src USDinst --build-args USD,"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF" -v
+          # Not using '--tests' to avoid building extra dependencies that are unneeded for headless tests
+          python build_scripts/build_usd.py --no-materialx --generator "Visual Studio 17 2022" --build USDgen/build --src USDgen/src USDinst --build-args USD,"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF -DPXR_HEADLESS_TEST_MODE=ON -DPXR_BUILD_TESTS=ON" -v
         shell: cmd
       - name: Save build artifacts to cache
         if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
@@ -189,4 +185,12 @@ jobs:
         with:
           name: usd-win64
           path: USDinst
+      - name: Test USD
+        working-directory: ./USDgen/build/OpenUSD
+        run: |
+          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|testExecGeomXformable_Perf_Large"
+        shell: cmd
 

.github/workflows/pypi.yml

@@ -40,7 +40,10 @@ jobs:
           - TAG: cp312
             INTERPRETER: /opt/python/cp312-cp312/bin/python
             VERSION_SPEC: '3.12'
-    runs-on: ubuntu-20.04
+          - TAG: cp313
+            INTERPRETER: /opt/python/cp313-cp313/bin/python
+            VERSION_SPEC: '3.13.5'
+    runs-on: ubuntu-22.04
     timeout-minutes: 60
     steps:
       - name: Checkout code
@@ -54,6 +57,10 @@ jobs:
         run: |
           docker build -t manylinuxwithcmake build_scripts/pypi/docker
           docker run --name usdmanylinux --rm -id -v ./:/opt/USD -v /home/vsts/dist:/opt/USD-dist manylinuxwithcmake
+      - name: Install Dependencies
+        run: |
+          docker exec usdmanylinux ${{ matrix.PYTHON.INTERPRETER }} -m pip install setuptools
+          docker exec usdmanylinux ${{ matrix.PYTHON.INTERPRETER }} -m pip install wheel
       - name: Building USD
         run: |
           # Terrible, terrible hack. The manylinux Docker image used to build the
@@ -71,7 +78,7 @@ jobs:
           # PXR_PY_UNDEFINED_DYNAMIC_LOOKUP flag will ensure that we never try to
           # link against this library anyway, so it doesn't matter.
           docker exec usdmanylinux ${{ matrix.PYTHON.INTERPRETER }} -c "import pathlib,sysconfig; pathlib.Path(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LDLIBRARY')).touch()"
-          docker exec usdmanylinux ${{ 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=../pxr/pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --build /opt/USD/gen/build --src /opt/USD/gen/src /opt/USD/inst -v
+          docker exec usdmanylinux ${{ matrix.PYTHON.INTERPRETER }}  build_scripts/build_usd.py --build-monolithic --build-args USD,"-DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_BUILD_EXEC=OFF -DPXR_INSTALL_LOCATION=../pxr/pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --build /opt/USD/gen/build --src /opt/USD/gen/src /opt/USD/inst -v
       - name: Creating packaging directory
         run: |
           docker exec usdmanylinux mkdir ./packaging
@@ -115,7 +122,10 @@ jobs:
           - VERSION_SPEC: '3.12'
             INTERPRETER: python3.12
             TAG: cp312
-    runs-on: macos-13
+          - VERSION_SPEC: '3.13.5'
+            INTERPRETER: python3.13
+            TAG: cp313
+    runs-on: macos-15
     timeout-minutes: 120
     steps:
       - name: Checkout code
@@ -132,8 +142,8 @@ 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
-          ${{ 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
+          sudo xcode-select -s /Applications/Xcode_16.app/Contents/Developer
+          ${{ matrix.PYTHON.INTERPRETER }} build_scripts/build_usd.py --build-monolithic --build-args USD,"-DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_BUILD_EXEC=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: |
           pwd
@@ -185,7 +195,9 @@ jobs:
             TAG: cp311
           - VERSION_SPEC: '3.12'
             TAG: cp312
-    runs-on: windows-2019
+          - VERSION_SPEC: '3.13.5'
+            TAG: cp313
+    runs-on: windows-2022
     timeout-minutes: 60
     steps:
       - name: Checkout code
@@ -202,10 +214,10 @@ jobs:
         shell: cmd
       - name: Build USD
         run: |
-          call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
+          call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat
           set BOOST_ROOT=
           python --version
-          python build_scripts/build_usd.py --build-args USD,"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF -DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_INSTALL_LOCATION=../pxr/pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --build USDgen/build --src USDgen/src USDinst -v
+          python build_scripts/build_usd.py --build-monolithic --build-args USD,"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF -DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_BUILD_EXEC=OFF -DPXR_INSTALL_LOCATION=../pxr/pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --build USDgen/build --src USDgen/src USDinst -v
         shell: cmd
       - name: Packaging USD
         run: |
@@ -257,63 +269,75 @@ jobs:
         BUILD_CONFIG:
           - NAME: Linux_Python38
             PYTHON_VERSION_SPEC: '3.8'
-            IMAGE: ubuntu-20.04
+            IMAGE: ubuntu-22.04
             PYTHON_INTERPRETER: python3
           - NAME: Linux_Python39
             PYTHON_VERSION_SPEC: '3.9'
-            IMAGE: ubuntu-20.04
+            IMAGE: ubuntu-22.04
             PYTHON_INTERPRETER: python3
           - NAME: Linux_Python310
             PYTHON_VERSION_SPEC: '3.10'
-            IMAGE: ubuntu-20.04
+            IMAGE: ubuntu-22.04
             PYTHON_INTERPRETER: python3
           - NAME: Linux_Python311
             PYTHON_VERSION_SPEC: '3.11'
-            IMAGE: ubuntu-20.04
+            IMAGE: ubuntu-22.04
             PYTHON_INTERPRETER: python3
           - NAME: Linux_Python312
             PYTHON_VERSION_SPEC: '3.12'
-            IMAGE: ubuntu-20.04
+            IMAGE: ubuntu-22.04
+            PYTHON_INTERPRETER: python3
+          - NAME: Linux_Python313
+            PYTHON_VERSION_SPEC: '3.13.5'
+            IMAGE: ubuntu-22.04
             PYTHON_INTERPRETER: python3
           - NAME: Mac_Python38
             PYTHON_VERSION_SPEC: '3.8'
-            IMAGE: macos-13
-            PYTHON_INTERPRETER: python3  
+            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
-            PYTHON_INTERPRETER: python3  
+            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
-            PYTHON_INTERPRETER: python3          
+            IMAGE: macos-15
+            PYTHON_INTERPRETER: python3
+          - NAME: Mac_Python313
+            PYTHON_VERSION_SPEC: '3.13.5'
+            IMAGE: macos-15
+            PYTHON_INTERPRETER: python3
           - NAME: Windows_Python38
             PYTHON_VERSION_SPEC: '3.8'
-            IMAGE: windows-2019
+            IMAGE: windows-2022
             PYTHON_INTERPRETER: python3
           - NAME: Windows_Python39
             PYTHON_VERSION_SPEC: '3.9'
-            IMAGE: windows-2019
+            IMAGE: windows-2022
             PYTHON_INTERPRETER: python3
           - NAME: Windows_Python310
             PYTHON_VERSION_SPEC: '3.10'
-            IMAGE: windows-2019
+            IMAGE: windows-2022
             PYTHON_INTERPRETER: python3
           - NAME: Windows_Python311
             PYTHON_VERSION_SPEC: '3.11'
-            IMAGE: windows-2019
+            IMAGE: windows-2022
             PYTHON_INTERPRETER: python3
           - NAME: Windows_Python312
             PYTHON_VERSION_SPEC: '3.12'
-            IMAGE: windows-2019
+            IMAGE: windows-2022
+            PYTHON_INTERPRETER: python3
+          - NAME: Windows_Python313
+            PYTHON_VERSION_SPEC: '3.13.5'
+            IMAGE: windows-2022
             PYTHON_INTERPRETER: python3
     runs-on: ${{ matrix.BUILD_CONFIG.IMAGE }}
     steps:

BUILDING.md

@@ -393,6 +393,26 @@ ${CMAKE_BINARY_DIR}/Testing/Failed-Diffs/<ctest_run_timestamp>/${TEST_NAME}/${fi
 
 ## Other Build Options
 
+##### Custom Task Management System
+
+USD uses task-based parallelism to improve scalability and performance. This foundation for this is located in the
+"work" library in pxr/base/work. By default, this library is implemented using the Intel TBB or oneAPI oneTBB
+library.
+
+Users may substitute their own task management system by providing a custom implementation for the work library.
+To do so, set the cmake variable `PXR_WORK_IMPL` to the name of the CMake package providing the custom implementation.
+USD must be able to locate a package with that name via a call to `find_package(${PXR_WORK_IMPL}` CONFIG)`, which
+may require specifying additional CMake variables. The package must provide a library target named
+`${PXR_WORK_IMPL}::${PXR_WORK_IMPL}` that specifies interface definitions (include directories, shared libraries,
+etc.) needed to use that library. The library must implement the required functions and classes and have a header
+named `impl.h` that supplies their declarations (either directly or in header files included in `impl.h`). This
+header must be able to be included via `#include <${PXR_WORK_IMPL}/impl.h>`.
+
+For example, a custom work implementation named `workExample` must provide a `workExampleConfig.cmake` file
+specifying a library target named `workExample::workExample`. This library must at minimum provide an `impl.h`
+header with the required implementations and set up interface include directories so that the header can
+be located via an include statement like `#include <workExample/impl.h>`.
+
 ##### Plugin Metadata Location
 
 Each library in the USD core generally has an associated file named 'plugInfo.json' that contains metadata about that library,