Merge branch 'AcademySoftwareFoundation:main' into render_test_perf

Author: kwokcb

.github/workflows/main.yml

@@ -18,25 +18,25 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - name: Linux_GCC_10_Python37
+        - name: Linux_GCC_10_Python39
           os: ubuntu-22.04
           compiler: gcc
           compiler_version: "10"
-          python: 3.7
+          python: 3.9
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON -DMATERIALX_BUILD_MONOLITHIC=ON
 
-        - name: Linux_GCC_13_Python311
+        - name: Linux_GCC_14_Python39
           os: ubuntu-24.04
           compiler: gcc
-          compiler_version: "13"
-          python: 3.11
-          build_javascript: ON
+          compiler_version: "14"
+          python: 3.9
 
-        - name: Linux_GCC_14_Python312
+        - name: Linux_GCC_14_Python311
           os: ubuntu-24.04
           compiler: gcc
           compiler_version: "14"
-          python: 3.12
+          python: 3.11
+          test_render: ON
 
         - name: Linux_GCC_CoverageAnalysis
           os: ubuntu-24.04
@@ -46,40 +46,39 @@ jobs:
           coverage_analysis: ON
           cmake_config: -DMATERIALX_COVERAGE_ANALYSIS=ON -DMATERIALX_BUILD_RENDER=OFF -DMATERIALX_BUILD_PYTHON=OFF
 
-        - name: Linux_Clang_13_Python37
+        - name: Linux_Clang_13_Python39
           os: ubuntu-22.04
           compiler: clang
           compiler_version: "13"
-          python: 3.7
+          python: 3.9
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
 
-        - name: Linux_Clang_18_Python312
+        - name: Linux_Clang_18_Python311
           os: ubuntu-24.04
           compiler: clang
           compiler_version: "18"
-          python: 3.12
-          test_render: ON
+          python: 3.11
           clang_format: ON
 
-        - name: MacOS_Xcode_14_Python39
-          os: macos-13
+        - name: MacOS_Xcode_15_Python39
+          os: macos-14
           compiler: xcode
-          compiler_version: "14.1"
+          compiler_version: "15.4"
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
           python: 3.9
 
-        - name: MacOS_Xcode_15_Python312
-          os: macos-14
+        - name: MacOS_Xcode_15_Python311
+          os: macos-15
           compiler: xcode
-          compiler_version: "15.4"
-          python: 3.12
+          compiler_version: "16.1"
+          python: 3.11
           test_shaders: ON
 
-        - name: MacOS_Xcode_16_Python313
+        - name: MacOS_Xcode_16_Python311
           os: macos-15
           compiler: xcode
           compiler_version: "16.1"
-          python: 3.13
+          python: 3.11
           static_analysis: ON
           cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
@@ -98,25 +97,25 @@ jobs:
           python: None
           cmake_config: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path` -DCMAKE_OSX_ARCHITECTURES=arm64
 
-        - name: Windows_VS2019_Win32_Python37
-          os: windows-2019
+        - name: Windows_VS2022_Win32_Python39
+          os: windows-2022
           architecture: x86
-          python: 3.7
-          cmake_config: -G "Visual Studio 16 2019" -A "Win32" -DMATERIALX_BUILD_SHARED_LIBS=ON
+          python: 3.9
+          cmake_config: -G "Visual Studio 17 2022" -A "Win32"
 
-        - name: Windows_VS2022_x64_Python312
-          os: windows-2022
+        - name: Windows_VS2022_x64_Python311
+          os: windows-2025
           architecture: x64
-          python: 3.12
+          python: 3.11
           cmake_config: -G "Visual Studio 17 2022" -A "x64"
-          upload_shaders: ON
+          test_shaders: ON
 
-        - name: Windows_VS2022_x64_Python313
+        - name: Windows_VS2022_x64_SharedLibs
           os: windows-2025
           architecture: x64
-          python: 3.13
-          cmake_config: -G "Visual Studio 17 2022" -A "x64"
-          test_shaders: ON
+          python: None
+          cmake_config: -G "Visual Studio 17 2022" -A "x64" -DMATERIALX_BUILD_SHARED_LIBS=ON
+          upload_shaders: ON
 
     steps:
     - name: Sync Repository
@@ -160,11 +159,14 @@ jobs:
     - name: Install Dependencies (Windows)
       if: runner.os == 'Windows'
       run: |
-        git clone https://github.com/Microsoft/vcpkg -b 2021.05.12 -c advice.detachedHead=false
-        vcpkg/bootstrap-vcpkg.bat -disableMetrics
         Add-Content $env:GITHUB_PATH "$PWD/build/installed/bin"
-        Add-Content $env:GITHUB_PATH "$PWD/vcpkg/installed/x64-windows/bin"
-        Add-Content $env:GITHUB_PATH "$PWD/vcpkg/installed/x64-windows/tools"
+
+    - name: Install OpenImageIO
+      if: matrix.build_oiio == 'ON' && runner.os == 'Windows'
+      run: |
+        C:/vcpkg/vcpkg install openimageio --triplet=x64-windows-release
+        Add-Content $env:GITHUB_PATH "C:/vcpkg/installed/x64-windows-release/bin"
+        Add-Content $env:GITHUB_PATH "C:/vcpkg/installed/x64-windows-release/share/openimageio"
 
     - name: Install Python ${{ matrix.python }}
       if: matrix.python != 'None'
@@ -177,21 +179,10 @@ jobs:
       if: matrix.python != 'None'
       run: pip install setuptools
 
-    - name: Install Emscripten
-      if: matrix.build_javascript == 'ON'
-      run: |
-        git clone https://github.com/emscripten-core/emsdk --recursive
-        cd emsdk
-        ./emsdk install 2.0.20
-        ./emsdk activate 2.0.20
-        source ./emsdk_env.sh
-        echo "EMSDK=$EMSDK" >> $GITHUB_ENV
-
-    - name: Install Node
-      if: matrix.build_javascript == 'ON'
-      uses: actions/setup-node@v4
+    - name: Install CMake
+      uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0
       with:
-         node-version: '16'
+        cmakeVersion: 3.26
 
     - name: Run Clang Format
       if: matrix.clang_format == 'ON'
@@ -219,6 +210,7 @@ jobs:
         python Scripts/mxdoc.py --docType md ../libraries/pbrlib/pbrlib_defs.mtlx
         python Scripts/mxdoc.py --docType html ../libraries/bxdf/standard_surface.mtlx
         python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target glsl
+        python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target vulkan
         python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target osl
         python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target mdl
         python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target msl
@@ -227,10 +219,11 @@ jobs:
     - name: Shader Validation Tests (Windows)
       if: matrix.test_shaders == 'ON' && runner.os == 'Windows'
       run: |
-        vcpkg/vcpkg install glslang --triplet=x64-windows
-        glslangValidator.exe -v
-        python python/Scripts/generateshader.py resources/Materials/Examples --target glsl --validator glslangValidator.exe
-        python python/Scripts/generateshader.py resources/Materials/Examples --target essl --validator glslangValidator.exe
+        C:/vcpkg/vcpkg install glslang[tools] --triplet=x64-windows-release
+        C:/vcpkg/installed/x64-windows-release/tools/glslang/glslangValidator.exe -v
+        python python/Scripts/generateshader.py resources/Materials/Examples --target glsl --validator C:/vcpkg/installed/x64-windows-release/tools/glslang/glslangValidator.exe
+        python python/Scripts/generateshader.py resources/Materials/Examples/StandardSurface --target essl --validator C:/vcpkg/installed/x64-windows-release/tools/glslang/glslangValidator.exe
+        python python/Scripts/generateshader.py resources/Materials/Examples/StandardSurface --target vulkan --validator C:/vcpkg/installed/x64-windows-release/tools/glslang/glslangValidator.exe
 
     - name: Shader Validation Tests (MacOS)
       if: matrix.test_shaders == 'ON' && runner.os == 'macOS'
@@ -296,7 +289,7 @@ jobs:
       uses: actions/upload-artifact@v4
       if: matrix.upload_shaders == 'ON'
       with:
-        name: Reference_Shaders_${{ matrix.name }}
+        name: MaterialX_ReferenceShaders
         path: build/bin/reference/
 
     - name: Upload Renders
@@ -313,47 +306,64 @@ jobs:
         name: MaterialX_Coverage
         path: build/coverage
 
+  javascript:
+    name: JavaScript
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Sync Repository
+      uses: actions/checkout@v4
+
+    - name: Install Emscripten
+      run: |
+        git clone https://github.com/emscripten-core/emsdk --recursive
+        cd emsdk
+        ./emsdk install 2.0.20
+        ./emsdk activate 2.0.20
+        source ./emsdk_env.sh
+        echo "EMSDK=$EMSDK" >> $GITHUB_ENV
+
+    - name: Install Node
+      uses: actions/setup-node@v4
+      with:
+         node-version: '16'
+
     - name: JavaScript CMake Generate
-      if: matrix.build_javascript == 'ON'
       run: cmake -S . -B javascript/build -DMATERIALX_BUILD_JS=ON -DMATERIALX_EMSDK_PATH=${{ env.EMSDK }}
 
     - name: JavaScript CMake Build
-      if: matrix.build_javascript == 'ON'
       run: cmake --build javascript/build --target install --config Release --parallel 2
 
     - name: JavaScript Unit Tests
-      if: matrix.build_javascript == 'ON'
       run: |
         npm install
         npm run test
         npm run test:browser
       working-directory: javascript/MaterialXTest
 
     - name: Build Web Viewer
-      if: matrix.build_javascript == 'ON'
       run: |
         npm install
         npm run build
       working-directory: javascript/MaterialXView
 
     - name: Deploy Web Viewer
-      if: matrix.build_javascript == 'ON' && github.event_name != 'pull_request'
-      uses: JamesIves/github-pages-deploy-action@v4.6.4
+      if: github.event_name != 'pull_request'
+      uses: JamesIves/github-pages-deploy-action@6c2d9db40f9296374acc17b90404b6e8864128c8 # v4.7.3
       with:
         branch: gh-pages
         folder: javascript/MaterialXView/dist
         single-commit: true
 
     - name: Upload JavaScript Package
-      if: matrix.build_javascript == 'ON'
       uses: actions/upload-artifact@v4
       with:
         name: MaterialX_JavaScript
-        path: javascript/build/installed/JavaScript/MaterialX        
+        path: javascript/build/installed/JavaScript/MaterialX
 
   sdist:
     name: Python SDist
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'AcademySoftwareFoundation/MaterialX'
     outputs:
       sdist_filename: ${{ steps.generate.outputs.filename }}
@@ -388,8 +398,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-minor: ['7', '8', '9', '10', '11', '12']
-        os: ['ubuntu-22.04', 'windows-2022', 'macos-14-large']
+        python-minor: ['9', '10', '11', '12', '13']
+        os: ['ubuntu-24.04', 'windows-2022', 'macos-15']
 
     steps:
     - name: Sync Repository
@@ -407,21 +417,18 @@ jobs:
         path: sdist
 
     - name: Build Wheel
-      uses: pypa/cibuildwheel@v2.19.2
+      uses: pypa/cibuildwheel@v2.23.2
       with:
         package-dir: ${{ github.workspace }}/sdist/${{ needs.sdist.outputs.sdist_filename }}
       env:
         CIBW_BUILD: 'cp3${{ matrix.python-minor }}-*'
         CIBW_SKIP: '*musllinux*'
         CIBW_ARCHS: 'auto64'
-        # https://github.com/pypa/manylinux
-        # manylinux2014 is CentOS 7 based. Which means GCC 10 and glibc 2.17.
-        CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
         CIBW_BEFORE_ALL_LINUX: yum install -y libXt-devel
         CIBW_BUILD_VERBOSITY: 1
         CIBW_ENVIRONMENT: CMAKE_BUILD_PARALLEL_LEVEL=2
-        # CIBW_BUILD_FRONTEND: build  # https://github.com/pypa/build
-        MACOSX_DEPLOYMENT_TARGET: '10.15'
+        MACOSX_DEPLOYMENT_TARGET: '11.0'
 
     - name: Install Wheel
       run: python -m pip install MaterialX --find-links wheelhouse --no-index

CHANGELOG.md

@@ -1,6 +1,32 @@
 # Change Log
 
-## [1.39.3] - Development
+## [1.39.4] - Development
+
+## [1.39.3] - 2025-03-07
+
+### Added
+- Added support for the [fract node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2169), with implementations in GLSL, OSL, and MDL.
+- Added a bitangent input to the [bump node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2196), aligning its feature set with the normalmap node.
+- Added support for [OSL 1.14](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2204) in shader generation, leveraging the latest closures when available.
+- Added support for [MDL 1.10](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2214) in shader generation, leveraging the latest closures when available.
+- Added initial support for [data library builds](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2226), allowing future releases to generate derived artifacts from the MaterialX data libraries.
+- Added an [ElementVec type alias](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2231) in MaterialX C++, allowing certain patterns to be expressed more clearly and concisely. 
+
+### Changed
+- Improved the compatibility of MaterialX shader generation with [Hydra Storm](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2211).
+- Refactored the [type system](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2176) in shader generation, improving the thread-safety and robustness of the generation process.
+- Improved the implementations of the [BSDF operator nodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2191), preferring data definitions over explicit C++ code.
+- Improved the implementations of the [time node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2192), using a graph definition in hardware shading languages.
+- Optimized [GitHub CI](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2253) to reduce build times for contributors.
+- Raised the minimum CMake version to [CMake 3.26](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2235).
+
+### Fixed
+- Fixed two edge cases in the [version](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2248) [upgrade](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2251) logic for normalmap nodes, addressing the usage of MaterialX versioning in OpenUSD.
+- Fixed [tangent frame orthogonalization](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2245) for the normalmap node in OSL shader generation.
+- Added validation of [tree depth](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2232) and [XInclude depth](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2233) in XML parsing, addressing cases where unusually complex documents could trigger a stack overflow.
+- Adding two missing [null](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2228) [checks](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2229) in the getShaderNodes helper function.
+- Integrated fixes to [OSL type classes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2200) from recent work in the OSL project.
+- Improved the handling of [invalid materials](https://github.com/AcademySoftwareFoundation/MaterialX/pull/2230) in the MaterialX Viewer, addressing cases where missing lights could trigger a crash.
 
 ## [1.39.2] - 2025-01-20