[usdLux] normalized lights divide by surfaceArea expressed in meters^2

.github/pull_request_template.md

@@ -6,14 +6,14 @@
 
 ### Checklist
 
-[ ] I have created this PR based on the dev branch
+- [ ] I have created this PR based on the dev branch
 
-[ ] I have followed the [coding conventions](https://openusd.org/release/api/_page__coding__guidelines.html)
+- [ ] I have followed the [coding conventions](https://openusd.org/release/api/_page__coding__guidelines.html)
 
-[ ] I have added unit tests that exercise this functionality (Reference: 
-[testing guidelines](https://openusd.org/release/api/_page__testing__guidelines.html))
+- [ ] I have added unit tests that exercise this functionality (Reference: 
+  [testing guidelines](https://openusd.org/release/api/_page__testing__guidelines.html))
 
-[ ] I have verified that all unit tests pass with the proposed changes
+- [ ] I have verified that all unit tests pass with the proposed changes
 
-[ ] I have submitted a signed Contributor License Agreement (Reference: 
-[Contributor License Agreement instructions](https://openusd.org/release/contributing_to_usd.html#contributor-license-agreement))
+- [ ] I have submitted a signed Contributor License Agreement (Reference: 
+  [Contributor License Agreement instructions](https://openusd.org/release/contributing_to_usd.html#contributor-license-agreement))

.github/workflows/buildusd.yml

@@ -5,16 +5,12 @@ on:
     branches:
       - dev
       - release
-  issue_comment:                                     
+  issue_comment:
     types: [created]
 
-env:
-  PYTHON_VERSION: "3.9"
-  PYTHON_VERSION_MAC: "3.11"
-
 jobs:
   GetUser:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
     outputs:
       require-result: ${{ steps.check.outputs.require-result }}
@@ -24,8 +20,9 @@ jobs:
         with:
           require: 'write'
           username: ${{ github.event.comment.user.login }}
+
   GetGitRef:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
     outputs:
       ref: ${{ steps.setter.outputs.ref }}
@@ -45,13 +42,17 @@ jobs:
         id: setter
         run: |
           echo "ref=$REF" >> "$GITHUB_OUTPUT"
+
   Linux:
-    needs: [GetUser, GetGitRef]
+    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: ubuntu-20.04
+    runs-on: ubuntu-22.04
+    env:
+      PYTHON_VERSION: "3.9"
     timeout-minutes: 120
     steps:
-      - run: echo ${{ needs.GetUser.outputs.require-result }}
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -83,20 +84,23 @@ jobs:
         with:
           path: |
             USDinst
-          key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
+          key: ${{ steps.cache-usd-build-dependency.outputs.cache-primary-key }}
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: usd-linux
           path: USDinst
 
   macOS:
-    needs: [GetUser, GetGitRef]
+    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
+    env:
+      PYTHON_VERSION: "3.11"
     timeout-minutes: 120
     steps:
-      - run: echo ${{ needs.GetUser.outputs.require-result }}
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -107,11 +111,11 @@ jobs:
         with:
           path: |
             USDinst
-          key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION_MAC }}-${{ hashFiles('build_scripts/**/*') }}
+          key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ env.PYTHON_VERSION_MAC }}
+          python-version: ${{ env.PYTHON_VERSION }}
           check-latest: false
       - name: Install dependencies
         run: |
@@ -132,20 +136,23 @@ jobs:
         with:
           path: |
             USDinst
-          key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION_MAC }}-${{ hashFiles('build_scripts/**/*') }}
+          key: ${{ steps.cache-usd-build-dependency.outputs.cache-primary-key }}
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: usd-macOS
           path: USDinst
 
   Windows:
-    needs: [GetUser, GetGitRef]
+    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
+    env:
+      PYTHON_VERSION: "3.9"
     timeout-minutes: 120
     steps:
-      - run: echo ${{ needs.GetUser.outputs.require-result }}
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -168,23 +175,18 @@ jobs:
           python -m pip install PyOpenGL PySide2
       - name: Build USD
         run: |
-          REM Unset BOOST_ROOT on Windows. The VS2017-Win2016 image
-          REM sets this env var to a pre-installed boost which causes
-          REM the USD build to favor this over the boost built by
-          REM build_usd.py. This causes the build to fail, because
-          REM the pre-installed boost does not include boost_python27
-          call set BOOST_ROOT=
           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
-        shell: cmd          
+        shell: cmd
       - name: Save build artifacts to cache
         if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
         with:
           path: |
             USDinst
-          key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
+          key: ${{ steps.cache-usd-build-dependency.outputs.cache-primary-key }}
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: usd-win64
-          path: USDinst
+          path: USDinst
+

BUILDING.md

@@ -333,9 +333,9 @@ Alembic library specified in ALEMBIC_DIR.
 
 See [3rd Party Library and Application Versions](VERSIONS.md) for version information.
 
-Support for Alembic files using the HDF5 backend is enabled by default but can be
-disabled by specifying the cmake flag `PXR_ENABLE_HDF5_SUPPORT=FALSE`. HDF5
-support requires the following dependencies:
+Support for Alembic files using the HDF5 backend can be enabled by specifying
+the cmake flag `PXR_ENABLE_HDF5_SUPPORT=TRUE`. HDF5 support requires the
+following dependencies:
 
 | Dependency Name    | Description     |
 | ------------------ |---------------- |
@@ -469,25 +469,6 @@ pxr/pxr.h, which facilitates using namespaces:
 | PXR_NS                         | Explicit qualification on items, e.g. `PXR_NS::TfToken foo = ...`|
 | PXR_NAMESPACE_USING_DIRECTIVE  | Enacts a using-directive, e.g. `using namespace PXR_NS;`         |
 
-##### ASCII Parser Editing/Validation
-
-There is an ASCII parser for the USD file format, which can be found in
-[sdf](pxr/usd/sdf). Most users will not have a need to edit the parser, but
-for the adventurous ones, there are a couple additional requirements.
-
-If you choose to edit the ASCII parsers, make sure
-`PXR_VALIDATE_GENERATED_CODE` is set to `TRUE`.  This flag enables tests
-that check the generated code in [sdf](pxr/usd/lib/sdf) and
-[gf](pxr/base/lib/gf).
-
-| Dependency Name    | Description                                             |
-| ------------------ | ------------------------------------------------------- |
-| FLEX_EXECUTABLE    | Path to [flex](http://flex.sourceforge.net/) executable |
-| BISON_EXECUTABLE   | Path to [bison](https://www.gnu.org/software/bison/) executable  |
-
-See [3rd Party Library and Application Versions](VERSIONS.md) for version information.
-
-
 ##### USD Schema Generation
 
 USD generates some code through a process called [schema

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.26)
 
 project(usd)
 
@@ -71,4 +71,4 @@ if (PXR_BUILD_DOCUMENTATION)
     endif()
 endif()   
 
-pxr_toplevel_epilogue()
+pxr_toplevel_epilogue()

README.md

@@ -10,10 +10,10 @@ For more details, please visit the web site [here](http://openusd.org).
 Build Status
 ------------
 
-|         |   Linux   |  Windows  |   macOS   |
-|:-------:|:---------:|:---------:|:---------:|
-|   dev   | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=dev&jobName=Linux)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=dev) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=dev&jobName=Windows)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=dev) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=dev&jobName=macOS)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=dev) |
-|  release | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=release&jobName=Linux)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=release) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=release&jobName=Windows)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=release) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=release&jobName=macOS)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=release) |
+|         |   Status   |
+|:-------:|:---------:|
+|   dev   | [![BuildUSD](https://github.com/PixarAnimationStudios/OpenUSD/actions/workflows/buildusd.yml/badge.svg?branch=dev)](https://github.com/PixarAnimationStudios/OpenUSD/actions/workflows/buildusd.yml) |
+|  release | [![BuildUSD](https://github.com/PixarAnimationStudios/OpenUSD/actions/workflows/buildusd.yml/badge.svg?branch=release)](https://github.com/PixarAnimationStudios/OpenUSD/actions/workflows/buildusd.yml) |
 
 Additional Documentation
 ------------------------
@@ -174,9 +174,14 @@ Or for visionOS:
 
 ##### Windows:
 
-Launch the "x64 Native Tools Command Prompt" for your version of Visual Studio
-and run the script in the opened shell. Make sure to use the 64-bit (x64) 
-command prompt and not the 32-bit (x86) command prompt.
+On Windows, it is possible to compile for either x64, or ARM64.
+**Note**: ARM64EC is not compatible at this time.
+**Note 2**: usdview is not supported on ARM64 at present, due to lack of PySide
+
+Launch the "x64 Native Tools Command Prompt" (or "ARM64 Native Tools Command
+Prompt" where appropriate) for your version of Visual Studio, and run the script
+in the opened shell. Make sure to use the appropriate version of the command
+prompt (e.g. on x64, use the x64 version, not the x86 version).
 
 See https://docs.microsoft.com/en-us/cpp/build/how-to-enable-a-64-bit-visual-cpp-toolset-on-the-command-line for more details.
 

VERSIONS.md

@@ -15,7 +15,7 @@ Our test machines have the following software versions installed.
 | ------------- | -------------------- | ---------------------------- | ------------------------------ |
 | OS            | CentOS Linux 7       | 12.6.3, 14.5 for visionOS  | Windows 10                     |
 | C++ Compiler  | gcc 9.3.1            | Apple clang 13.1.6 (Xcode 13.3)<br>Apple clang 15.0.0 (Xcode 15.4) for visionOS | Visual Studio 2017 15.9     |
-| CMake         | 3.17.5               | 3.19.5                       | 3.25.3                         |
+| CMake         | 3.26.5               | 3.26.5                       | 3.26.4                         |
 | Python        | 3.9.16               | 3.9.13                       | 3.9.13                         |
 | Intel TBB     | 2020.3               | 2020.3                       | 2020.3                         |
 | OneTBB        | 2021.9               | 2021.9                       | 2021.9                         |
@@ -30,12 +30,12 @@ Our test machines have the following software versions installed.
 | RenderMan     | 25.3                 | 25.3                         | 25.3                           |
 | Alembic       | 1.8.5                | 1.8.5                        | 1.8.5                          |
 | OpenEXR       | 3.1.11               | 3.1.11                       | 3.1.11                         |
-| MaterialX     | 1.38.10              | 1.38.10                      | 1.38.10                        |
+| MaterialX     | 1.39.3               | 1.39.3                       | 1.39.3                         |
 | Jinja2        | 3.1.2                |                              |                                |
 | Flex          | 2.5.39               |                              |                                |
 | Bison         | 2.4.1                |                              |                                |
 | Doxygen       | 1.9.6                |                              |                                |
 | GraphViz      | 2.40.1               |                              |                                |
 | OpenVDB       | 9.1.0                | 7.1.0, 9.1.0                 | 9.1.0                          |
-| Vulkan SDK    | 1.3.243.0            | 1.3.243.0                    | 1.3.243.0                      |
+| Vulkan SDK    | 1.3.296.0            | 1.3.296.0                    | 1.3.296.0                      |
 | Draco         | 1.3.6                | 1.3.6                        | 1.3.6                          |