Sync with Microsoft ONNX Runtime - 03/11/2025

.github/workflows/linux-wasm-ci-build-and-test-workflow.yml

@@ -142,7 +142,7 @@ jobs:
 
       - name: Upload WASM artifacts
         if: ${{ inputs.skip_publish != true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ inputs.build_config }}_wasm
           path: ${{ github.workspace }}/artifacts/wasm
@@ -171,7 +171,7 @@ jobs:
 
       - name: Publish test results
         if: ${{ always() && inputs.build_config == 'Debug' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: test-results
           path: ${{ github.workspace }}/build/**/*.results.xml

.github/workflows/linux_cuda_ci.yml

@@ -63,7 +63,7 @@ jobs:
 
       # --- Download Build Artifact to Runner Temp Directory ---
       - name: Download Build Artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: build-output-x64-Release # Must match the upload name
           path: ${{ runner.temp }}/Release # Download contents into temp dir structure

.github/workflows/linux_minimal_build.yml

@@ -49,7 +49,7 @@ jobs:
         uses: microsoft/onnxruntime-github-actions/build-and-prep-ort-files@v0.0.9
 
       - name: Upload Test Data Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: test_data
           path: ${{ runner.temp }}/minimal_build_test_data/
@@ -512,7 +512,7 @@ jobs:
         with:
           node-version: 20
       - name: Download Test Data Artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: test_data
           path: ${{ runner.temp }}/.test_data/

.github/workflows/linux_tensorrt_ci.yml

@@ -65,7 +65,7 @@ jobs:
 
       # --- Download Build Artifact to Runner Temp Directory ---
       - name: Download Build Artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: build-output-x64-Release # Must match the upload name
           path: ${{ runner.temp }}/Release # Download contents into temp dir structure

.github/workflows/publish-c-apidocs.yml

@@ -45,7 +45,7 @@ jobs:
           rm -rf site/docs/api/c
           mv build/doxygen/html _site/docs/api/c
       - name: Upload new site
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: onnxruntime-c-apidocs
           path: _site

.github/workflows/publish-csharp-apidocs.yml

@@ -56,7 +56,7 @@ jobs:
         if (Test-Path $OutputDirectory) { Remove-Item -Recurse -Force $OutputDirectory }
         Move-Item -Path csharp\ApiDocs\csharp -Destination $OutputDirectory
     - name: Upload docs artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: onnxruntime-csharp-apidocs
         path: _site

.github/workflows/publish-java-apidocs.yml

@@ -43,7 +43,7 @@ jobs:
           mkdir -p _site/docs/api
           mv java/build/docs/javadoc _site/docs/api/java
       - name: Upload new site
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: onnxruntime-java-apidocs
           path: _site

.github/workflows/publish-js-apidocs.yml

@@ -43,7 +43,7 @@ jobs:
           mkdir -p _site/docs/api
           mv js/common/docs _site/docs/api/js
       - name: Upload docs artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: onnxruntime-node-apidocs
           path: _site

.github/workflows/publish-objectivec-apidocs.yml

@@ -52,7 +52,7 @@ jobs:
       shell: bash
 
     - name: Upload new site
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: onnxruntime-objectivec-apidocs
         path: ./_site

.github/workflows/publish-python-apidocs.yml

@@ -50,7 +50,7 @@ jobs:
           mkdir -p _site/docs/api/
           mv build/docs/html _site/docs/api/python
       - name: Upload docs artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: onnxruntime-python-apidocs
           path: _site

.github/workflows/react_native.yml

@@ -63,7 +63,7 @@ jobs:
           cp ${BASE_PATH}/*.pom          ${{ runner.temp }}/artifacts          
 
       - name: Upload Android AAR Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: onnxruntime-android-full-aar
           path: ${{ runner.temp }}/artifacts
@@ -102,7 +102,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y ninja-build
 
       - name: Download Android AAR artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: onnxruntime-android-full-aar
           path: ${{ runner.temp }}/android-full-aar
@@ -206,7 +206,7 @@ jobs:
             --build-settings-file ${{ github.workspace }}/tools/ci_build/github/js/react_native_e2e_full_ios_framework_build_settings_arm64.json
 
       - name: Upload iOS Pod Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ios_pod
           path: ${{ runner.temp }}/ios_pod
@@ -221,7 +221,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Download iOS pod artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: ios_pod
           path: ${{ runner.temp }}/ios_pod
@@ -277,7 +277,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Download iOS pod artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: ios_pod
           path: ${{ runner.temp }}/ios_pod

.github/workflows/reusable_linux_build.yml

@@ -163,7 +163,7 @@ jobs:
       # ------------- Upload Build Output Step -------------
       - name: Upload Build Output Artifact
         if: inputs.upload_build_output == true
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: build-output-${{ inputs.architecture }}-${{ inputs.build_config }}
           path: ${{ runner.temp }}/${{ inputs.build_config }}
@@ -172,7 +172,7 @@ jobs:
       # ------------- Upload Log on Build Failure Step -------------
       - name: Upload VCPKG Manifest Install Log on Update or Build Failure
         if: steps.update_step.outcome == 'failure' || steps.build_step.outcome == 'failure'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: vcpkg-manifest-install-log-${{ inputs.architecture }}-${{ inputs.build_config }}
           path: ${{ runner.temp }}/${{ inputs.build_config }}/${{ inputs.build_config }}/vcpkg-manifest-install.log

.github/workflows/windows-web-ci-workflow.yml

@@ -67,7 +67,7 @@ jobs:
           node-version: "20.x"
 
       - name: Download WebAssembly artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: ${{ inputs.build_config }}_wasm
           path: ${{ github.workspace }}/artifacts_wasm
@@ -173,7 +173,7 @@ jobs:
       # this step is added to help investigate the shader validation failure which is hard to reproduce
       - name: Upload WebGPU shader validation log on failure
         if: ${{ failure() && inputs.build_config == 'Debug' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: webgpu-shader-validation-logs
           path: ${{ runner.temp }}\web\test\07\chrome_debug.log
@@ -203,7 +203,7 @@ jobs:
 
       - name: Upload NPM packages
         if: ${{ inputs.build_config == 'Release' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ inputs.package_name }}
           path: ${{ github.workspace }}\artifacts_npm

.github/workflows/windows_cuda.yml

@@ -132,7 +132,7 @@ jobs:
         shell: pwsh
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: build-artifacts
           path: ${{ runner.temp }}\build
@@ -158,7 +158,7 @@ jobs:
           submodules: 'none'
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: build-artifacts
           path: ${{ runner.temp }}\build

.github/workflows/windows_tensorrt.yml

@@ -137,7 +137,7 @@ jobs:
         shell: pwsh
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: build-artifacts
           path: ${{ runner.temp }}\build
@@ -163,7 +163,7 @@ jobs:
           submodules: 'none'
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: build-artifacts
           path: ${{ runner.temp }}\build

.github/workflows/windows_x64_debug_build_x64_debug.yml

@@ -109,14 +109,14 @@ jobs:
 
     # Publish artifacts only on failure and if DocUpdateNeeded is true (example)
       - name: Publish OperatorKernels.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true' # Use env. for step-level vars
         with:
           name: OperatorKernels.md
           path: ${{ github.workspace }}/docs/OperatorKernels.md
 
       - name: Publish ContribOperators.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: ContribOperators.md

.github/workflows/windows_x64_release_build_x64_release.yml

@@ -107,14 +107,14 @@ jobs:
         working-directory: "${{ github.workspace }}\\build\\RelWithDebInfo\\RelWithDebInfo"
 
       - name: Publish OperatorKernels.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: OperatorKernels.md
           path: ${{ github.workspace }}/docs/OperatorKernels.md
 
       - name: Publish ContribOperators.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: ContribOperators.md

.github/workflows/windows_x64_release_ep_generic_interface_build_x64_release_ep_generic_interface.yml

@@ -92,14 +92,14 @@ jobs:
         run: python tools\ValidateNativeDelegateAttributes.py
         working-directory: ${{ github.workspace }}\\csharp
       - name: Publish OperatorKernels.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: OperatorKernels.md
           path: ${{ github.workspace }}/docs/OperatorKernels.md
 
       - name: Publish ContribOperators.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: ContribOperators.md

.github/workflows/windows_x64_release_xnnpack.yml

@@ -94,14 +94,14 @@ jobs:
         working-directory: ${{ github.workspace }}\\csharp
 
       - name: Publish OperatorKernels.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: OperatorKernels.md
           path: ${{ github.workspace }}/docs/OperatorKernels.md
 
       - name: Publish ContribOperators.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: ContribOperators.md

.github/workflows/windows_x86.yml

@@ -102,14 +102,14 @@ jobs:
         working-directory: "${{ github.workspace }}\\build\\RelWithDebInfo\\RelWithDebInfo"
 
       - name: Publish OperatorKernels.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: OperatorKernels.md
           path: ${{ github.workspace }}/docs/OperatorKernels.md
 
       - name: Publish ContribOperators.md (Conditional)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && env.DocUpdateNeeded == 'true'
         with:
           name: ContribOperators.md

cmake/deps.txt

@@ -47,7 +47,7 @@ protoc_mac_universal;https://github.com/protocolbuffers/protobuf/releases/downlo
 psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.zip;1f5454b01f06f9656b77e4a5e2e31d7422487013
 pthreadpool;https://github.com/google/pthreadpool/archive/dcc9f28589066af0dbd4555579281230abbf74dd.zip;533a77943203ef15ca608bcd9dbe2c94da7451d2
 pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.13.6.zip;f780292da9db273c8ef06ccf5fd4b623624143e9
-pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/de0ce7c7251372892e53ce9bc891750d2c9a4fd8.zip;c45b8d3619b9bccbd26dc5f657959aee38b18b7a
+pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/877328f188a3c7d1fa855871a278eb48d530c4c0.zip;9152d4bf6b8bde9f19b116de3bd8a745097ed9df
 re2;https://github.com/google/re2/archive/refs/tags/2024-07-02.zip;646e1728269cde7fcef990bf4a8e87b047882e88
 safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252040ff6cb9f1fd18575b32fa8fb5928daac
 tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381

cmake/external/onnxruntime_external_deps.cmake

@@ -440,7 +440,7 @@ if(onnxruntime_USE_VCPKG)
   find_package(flatbuffers REQUIRED)
 else()
 # We do not need to build flatc for iOS or Android Cross Compile
-if (CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+if (CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "tvOS" OR CMAKE_SYSTEM_NAME STREQUAL "visionOS" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
   set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "FLATBUFFERS_BUILD_FLATC" FORCE)
 endif()
 set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "FLATBUFFERS_BUILD_TESTS" FORCE)

cmake/onnxruntime_mlas.cmake

@@ -829,7 +829,7 @@ endif()
 
 foreach(mlas_target ${ONNXRUNTIME_MLAS_LIBS})
     target_include_directories(${mlas_target} PRIVATE ${MLAS_INC_DIR} ${MLAS_SRC_DIR})
-    onnxruntime_add_include_to_target(${mlas_target} ${GSL_TARGET})
+    onnxruntime_add_include_to_target(${mlas_target} ${GSL_TARGET} safeint_interface)
 
     target_compile_definitions(${mlas_target} PRIVATE ${mlas_private_compile_definitions})
 

cmake/onnxruntime_providers_cuda.cmake

@@ -222,6 +222,7 @@
 
     if(MSVC)
       target_compile_options(${target} PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:-Xcompiler /Zc:__cplusplus>")
+      target_compile_options(${target} PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:-Xcompiler /bigobj>")
     endif()
 
     onnxruntime_add_include_to_target(${target} onnxruntime_common onnxruntime_framework onnx onnx_proto ${PROTOBUF_LIB} flatbuffers::flatbuffers)

cmake/onnxruntime_python.cmake

@@ -962,13 +962,33 @@ if (onnxruntime_USE_TENSORRT)
 endif()
 
 if (onnxruntime_USE_NV)
+  if (WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+      file(GLOB NV_LIB_FILES LIST_DIRECTORIES false "${TENSORRT_RTX_ROOT}/lib/tensorrt_*.dll"
+                                             "${TENSORRT_RTX_ROOT}/bin/tensorrt_*.dll"
+                                             "${TENSORRT_RTX_ROOT}/lib/libtensorrt_*.so"
+                                             "${TENSORRT_RTX_ROOT}/bin/libtensorrt_*.so")
+    message(STATUS "NV lib files: " ${NV_LIB_FILES})
+  endif()
   add_custom_command(
     TARGET onnxruntime_pybind11_state POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy
+        ${NV_LIB_FILES}
         $<TARGET_FILE:onnxruntime_providers_nv_tensorrt_rtx>
         $<TARGET_FILE:onnxruntime_providers_shared>
         $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/capi/
   )
+  if (EXISTS "${TENSORRT_RTX_ROOT}/doc/LICENSE.txt")
+    add_custom_command(
+      TARGET onnxruntime_pybind11_state POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy "${TENSORRT_RTX_ROOT}/doc/LICENSE.txt" $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/TRT_RTX_LICENSE.txt
+    )
+  endif()
+  if (EXISTS "${TENSORRT_RTX_ROOT}/doc/Acknowledgements.txt")
+    add_custom_command(
+      TARGET onnxruntime_pybind11_state POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy "${TENSORRT_RTX_ROOT}/doc/Acknowledgements.txt" $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/TRT_RTX_Acknowledgements.txt
+    )
+  endif()
 endif()
 
 if (onnxruntime_USE_MIGRAPHX)