Skip to content

Commit f05d669

Browse files
committed
Merge branch 'master' into sync_msft_18082025
2 parents a6359ee + edf6ff0 commit f05d669

File tree

69 files changed

+2006
-1427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2006
-1427
lines changed

.github/workflows/linux_cuda_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
# --- Download Build Artifact to Runner Temp Directory ---
6565
- name: Download Build Artifact
66-
uses: actions/download-artifact@v4
66+
uses: actions/download-artifact@v5
6767
with:
6868
name: build-output-x64-Release # Must match the upload name
6969
path: ${{ runner.temp }}/Release # Download contents into temp dir structure

.github/workflows/linux_minimal_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ jobs:
582582
with:
583583
node-version: 20
584584
- name: Download Test Data Artifact
585-
uses: actions/download-artifact@v4
585+
uses: actions/download-artifact@v5
586586
with:
587587
name: test_data
588588
path: ${{ runner.temp }}/.test_data/

.github/workflows/linux_tensorrt_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
# --- Download Build Artifact to Runner Temp Directory ---
6767
- name: Download Build Artifact
68-
uses: actions/download-artifact@v4
68+
uses: actions/download-artifact@v5
6969
with:
7070
name: build-output-x64-Release # Must match the upload name
7171
path: ${{ runner.temp }}/Release # Download contents into temp dir structure

.github/workflows/mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: macos-15
6464

6565
env:
66-
xcode_version: 16
66+
xcode_version: 16.4
6767

6868
strategy:
6969
matrix:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
node-version: "20.x"
6868

6969
- name: Download WebAssembly artifacts
70-
uses: actions/download-artifact@v4
70+
uses: actions/download-artifact@v5
7171
with:
7272
name: ${{ inputs.build_config }}_wasm
7373
path: ${{ github.workspace }}/artifacts_wasm

.github/workflows/windows_cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
submodules: 'none'
159159

160160
- name: Download build artifacts
161-
uses: actions/download-artifact@v4
161+
uses: actions/download-artifact@v5
162162
with:
163163
name: build-artifacts
164164
path: ${{ runner.temp }}\build

.github/workflows/windows_tensorrt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
submodules: 'none'
164164

165165
- name: Download build artifacts
166-
uses: actions/download-artifact@v4
166+
uses: actions/download-artifact@v5
167167
with:
168168
name: build-artifacts
169169
path: ${{ runner.temp }}\build

cmake/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,3 +1791,12 @@ else()
17911791
include("${CMAKE_CURRENT_SOURCE_DIR}/arm64x.cmake")
17921792
endif()
17931793
endif()
1794+
1795+
if(onnxruntime_BUILD_UNIT_TESTS)
1796+
include("${CMAKE_CURRENT_SOURCE_DIR}/onnxruntime_test_pch.cmake")
1797+
endif()
1798+
1799+
# Include precompiled header configuration for providers
1800+
if(TARGET onnxruntime_providers)
1801+
include("${CMAKE_CURRENT_SOURCE_DIR}/onnxruntime_providers_pch.cmake")
1802+
endif()
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Precompiled header configuration for onnxruntime_providers
2+
3+
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
4+
# Visual Studio PCH
5+
target_precompile_headers(onnxruntime_providers PRIVATE
6+
"${CMAKE_CURRENT_SOURCE_DIR}/providers_pch.h"
7+
)
8+
endif()

cmake/onnxruntime_test_pch.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Precompiled header configuration for onnxruntime_test_all
2+
3+
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
4+
# Visual Studio PCH
5+
target_precompile_headers(onnxruntime_test_all PRIVATE
6+
"${CMAKE_CURRENT_SOURCE_DIR}/test_pch.h"
7+
)
8+
endif()
9+
10+
# Exclude certain files that might conflict with PCH
11+
set(PCH_EXCLUDE_FILES
12+
# Add any problematic source files here
13+
"${TEST_SRC_DIR}/framework/tensor_shape_test.cc"
14+
)
15+
16+
foreach(file ${PCH_EXCLUDE_FILES})
17+
set_source_files_properties(${file} PROPERTIES
18+
SKIP_PRECOMPILE_HEADERS ON
19+
)
20+
endforeach()

0 commit comments

Comments
 (0)