Sync with Microsoft ONNX Runtime - 18032026

.github/workflows/windows_x86.yml

@@ -65,12 +65,51 @@ jobs:
         working-directory: ${{ github.workspace }}
 
       - name: Use .NET 8.x
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '8.x'
         env:
           PROCESSOR_ARCHITECTURE: x86 # x86 .NET
 
+      - name: Prefer x86 dotnet on PATH
+        shell: pwsh
+        run: |
+          $x86DotnetDir = 'C:\Program Files (x86)\dotnet'
+          $x64DotnetDir = 'C:\Program Files\dotnet'
+          $machinePath = [Environment]::GetEnvironmentVariable('Path', 'Machine')
+          Write-Host "Machine PATH: $machinePath"
+
+          $pathEntries = @($env:PATH -split ';' | Where-Object { $_ })
+          $reorderedPathEntries = @(
+            $x86DotnetDir
+            $pathEntries | Where-Object { $_ -ne $x86DotnetDir }
+          )
+
+          $env:PATH = ($reorderedPathEntries -join ';')
+
+          # Only add the x86 dotnet directory to GITHUB_PATH if it is not already on PATH (after normalization)
+          $normalizedX86DotnetDir = $x86DotnetDir.TrimEnd('\')
+          $normalizedPathEntries = $pathEntries | ForEach-Object { $_.TrimEnd('\') }
+          if (-not ($normalizedPathEntries -contains $normalizedX86DotnetDir)) {
+            Add-Content -Path $env:GITHUB_PATH -Value $x86DotnetDir
+          }
+          $dotnetPaths = @(Get-Command dotnet -All | Select-Object -ExpandProperty Source -Unique)
+          Write-Host 'Resolved dotnet executables:'
+          $dotnetPaths | ForEach-Object { Write-Host $_ }
+
+          $x86DotnetExe = "$x86DotnetDir\dotnet.exe"
+          $x64DotnetExe = "$x64DotnetDir\dotnet.exe"
+          $x86Index = $dotnetPaths.IndexOf($x86DotnetExe)
+          $x64Index = $dotnetPaths.IndexOf($x64DotnetExe)
+
+          if ($x86Index -lt 0) {
+            throw "Expected x86 dotnet executable was not found: $x86DotnetExe"
+          }
+
+          if ($x64Index -ge 0 -and $x86Index -gt $x64Index) {
+            throw "x86 dotnet must appear before x64 dotnet on PATH. Found $x86DotnetExe after $x64DotnetExe."
+          }
+
       - name: Use Nuget 6.x
         uses: nuget/setup-nuget@v2
         with:

.ignore

@@ -0,0 +1,4 @@
+!/.config
+!/.devcontainer
+!/.github
+!/.pipelines

cmake/CMakeLists.txt

@@ -10,6 +10,24 @@ cmake_policy(SET CMP0104 OLD)
 # Project
 project(onnxruntime C CXX ASM)
 
+# Set C/C++ standard versions
+if (NOT CMAKE_C_STANDARD)
+  # Needed for Java
+  set(CMAKE_C_STANDARD 99)
+endif()
+
+if (NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 20)
+endif()
+
+# We don't use C++20 modules yet.
+# There are some known issues to address first:
+# - Android builds from Linux Docker containers have trouble finding clang-scan-deps.
+# - The MSVC /permissive option is needed for compiling some of the CUDA EP code which uses CUTLASS.
+#   This option is not compatible with C++20 modules.
+# So we will skip module scanning for now.
+set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
+
 # Disable fast-math for Intel oneAPI compiler
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "IntelLLVM")
   if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC-like")
@@ -21,11 +39,6 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "IntelLLVM")
   endif()
 endif()
 
-# Needed for Java
-if (NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_C_STANDARD 99)
-endif()
-
 include(CheckCXXCompilerFlag)
 include(CheckLanguage)
 include(CMakeDependentOption)
@@ -34,15 +47,6 @@ include(CheckFunctionExists)
 include(CheckSymbolExists)
 include(GNUInstallDirs) # onnxruntime_providers_* require CMAKE_INSTALL_* variables
 
-if (NOT CMAKE_CXX_STANDARD)
-  # TODO: update this once all system adapt c++20
-  if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(CMAKE_CXX_STANDARD 20)
-  else()
-    set(CMAKE_CXX_STANDARD 17)
-  endif()
-endif()
-
 if (MSVC)
   #  Make sure Visual Studio sets __cplusplus macro correctly: https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
@@ -1437,7 +1441,7 @@ configure_file(onnxruntime_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/onnxruntime_c
 get_property(onnxruntime_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
 if (onnxruntime_USE_CUDA)
-  set(CMAKE_CUDA_STANDARD 17)
+  set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
   if(onnxruntime_CUDA_HOME)
     file(TO_CMAKE_PATH ${onnxruntime_CUDA_HOME} CUDAToolkit_ROOT)
   endif()

cmake/external/cutlass.cmake

@@ -4,7 +4,7 @@ onnxruntime_fetchcontent_declare(
   URL ${DEP_URL_cutlass}
   URL_HASH SHA1=${DEP_SHA1_cutlass}
   EXCLUDE_FROM_ALL
-PATCH_COMMAND ${Patch_EXECUTABLE} --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/cutlass/cutlass_4.2.1.patch
+  PATCH_COMMAND ${Patch_EXECUTABLE} --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/cutlass/cutlass_4.2.1.patch
 )
 
 FetchContent_GetProperties(cutlass)

cmake/external/onnxruntime_external_deps.cmake

@@ -752,6 +752,16 @@ if (onnxruntime_USE_WEBGPU)
           #
           ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/dawn/safari_polyfill.patch &&
 
+          # The dawn_device_lost_keepalive.patch contains the following changes:
+          #
+          # - (private) Fix premature ABORT when device.lost fires in callUserCallback
+          #   The device.lost handler was wrapped in callUserCallback without runtimeKeepalivePush/Pop,
+          #   causing maybeExit() to trigger _exit(0) and set ABORT=true when runtimeKeepaliveCounter
+          #   was 0. This silently dropped all subsequent WebGPU callbacks (e.g. requestAdapter),
+          #   breaking session re-creation after device destruction.
+          #
+          ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/dawn/dawn_device_lost_keepalive.patch &&
+
           # The dawn_dxc_output_dir.patch contains the following changes:
           #
           # - (private) Fix DXC output directory for RelWithDebInfo and MinSizeRel configs
@@ -762,6 +772,18 @@ if (onnxruntime_USE_WEBGPU)
           #
           ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/dawn/dawn_dxc_output_dir.patch &&
 
+          # The dawn_buffer_fix_injection.patch contains the following changes:
+          #
+          # - (private) Fix importJsBuffer calling wrong WGPUBufferImpl constructor
+          #   Without this patch, importJsBuffer calls emwgpuCreateBuffer which invokes the
+          #   (source, mappedAtCreation=false) constructor instead of the injection constructor
+          #   tagged with kImportedFromJS. This patch adjusts the injection constructor signature
+          #   to disambiguate it from the (source, mappedAtCreation) overload so emwgpuCreateBuffer
+          #   reliably selects the injection constructor and imported buffers are properly tagged
+          #   as kImportedFromJS.
+          #
+          ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/dawn/dawn_buffer_fix_injection.patch &&
+
           # Remove the test folder to speed up potential file scan operations (70k+ files not needed for build).
           # Using <SOURCE_DIR> token ensures the correct absolute path regardless of working directory.
           ${CMAKE_COMMAND} -E rm -rf <SOURCE_DIR>/test)

cmake/onnxruntime_common.cmake

@@ -84,7 +84,8 @@ if (WIN32)
          "${ONNXRUNTIME_ROOT}/core/platform/windows/device_discovery.cc")
 elseif (LINUX)
     list(APPEND onnxruntime_common_src_patterns
-         "${ONNXRUNTIME_ROOT}/core/platform/linux/device_discovery.cc")
+         "${ONNXRUNTIME_ROOT}/core/platform/linux/device_discovery.cc"
+         "${ONNXRUNTIME_ROOT}/core/platform/linux/pci_device_discovery.h")
 elseif (APPLE)
     list(APPEND onnxruntime_common_src_patterns
          "${ONNXRUNTIME_ROOT}/core/platform/apple/device_discovery.cc")

cmake/onnxruntime_config.h.in

@@ -20,6 +20,7 @@
 #cmakedefine HAS_PARENTHESES
 #cmakedefine HAS_REALLOCARRAY
 #cmakedefine HAS_SHORTEN_64_TO_32
+#cmakedefine HAS_STRINGOP_OVERFLOW
 #cmakedefine HAS_TAUTOLOGICAL_POINTER_COMPARE
 #cmakedefine HAS_UNUSED_BUT_SET_PARAMETER
 #cmakedefine HAS_UNUSED_BUT_SET_VARIABLE

cmake/onnxruntime_fuzz_test.cmake

@@ -60,7 +60,7 @@ if (onnxruntime_FUZZ_ENABLED)
     # compile the executables
     onnxruntime_add_executable(onnxruntime_security_fuzz ${SEC_FUZ_SRC})
 
-    # compile with c++17
+    # compile with at least c++17
     target_compile_features(onnxruntime_security_fuzz PUBLIC cxx_std_17)
 
     # Security fuzzing engine header file reference