Skip to content

Commit c3284bc

Browse files
authored
Merge pull request #724 from intel/sync_msft_2_7_27
Backmerging with Msft Commits
2 parents 0c1fcfd + f3672df commit c3284bc

File tree

382 files changed

+7940
-28159
lines changed

Some content is hidden

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

382 files changed

+7940
-28159
lines changed

.github/actions/locate-vcvarsall-and-setup-env/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ runs:
1616
- name: Setup VCPKG
1717
uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
1818
with:
19-
vcpkg-version: '2025.04.09'
20-
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
19+
vcpkg-version: '2025.06.13'
20+
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
2121
cmake-version: '3.31.6'
2222
cmake-hash: '0f1584e8666cf4a65ec514bd02afe281caabf1d45d2c963f3151c41484f457386aa03273ab25776a670be02725354ce0b46f3a5121857416da37366342a833a0'
2323
add-cmake-to-path: 'true'

.github/workflows/android.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ jobs:
133133

134134
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
135135
with:
136-
vcpkg-version: '2025.04.09'
137-
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
136+
vcpkg-version: '2025.06.13'
137+
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
138138
cmake-version: '3.31.6'
139139
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
140140
add-cmake-to-path: 'true'
@@ -168,6 +168,7 @@ jobs:
168168
--build_shared_lib
169169
--cmake_generator=Ninja
170170
--build_java
171+
--update --build --test
171172
shell: bash
172173

173174

@@ -237,6 +238,7 @@ jobs:
237238
--parallel --use_vcpkg --use_vcpkg_ms_internal_asset_cache
238239
--cmake_generator=Ninja
239240
--build_java
241+
--update --build --test
240242
shell: bash
241243

242244
- name: Install psutil for emulator shutdown by run_android_emulator.py

.github/workflows/linux-dnnl.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ jobs:
3333
architecture: x64
3434
dockerfile_path: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu
3535
docker_image_repo: onnxruntimecpubuildpythonx64
36-
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --build_nuget --use_dnnl'
36+
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --build_nuget'
3737
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH'
38+
execution_providers: 'dnnl'
3839
secrets:
3940
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
architecture: ${{ env.buildArch }}
5353
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
5454
with:
55-
vcpkg-version: '2025.03.19'
56-
vcpkg-hash: '17e96169cd3f266c4716fcdc1bb728e6a64f103941ece463a2834d50694eba4fb48f30135503fd466402afa139abc847ef630733c442595d1c34979f261b0114'
55+
vcpkg-version: '2025.06.13'
56+
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
5757
cmake-version: '3.31.6'
5858
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
5959
add-cmake-to-path: 'true'
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# This workflow builds and tests the ONNX Runtime for Linux for migraphx EP
2+
# It leverages a reusable workflow (`reusable_linux_build.yml`) to handle the core build and test logic
3+
# within Docker containers, ensuring a consistent environment.
4+
# This file is very similar to linux_ci.yml, but much simpler
5+
6+
7+
name: Linux MigraphX CI
8+
9+
on:
10+
push:
11+
branches: [main, 'rel-*']
12+
pull_request:
13+
branches: [main, 'rel-*']
14+
workflow_dispatch:
15+
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
18+
cancel-in-progress: true
19+
20+
permissions:
21+
contents: read
22+
packages: write
23+
attestations: write
24+
id-token: write
25+
26+
jobs:
27+
build-linux-x64-release-migraphx:
28+
name: Build Linux x64 Release (migraphx EP)
29+
uses: ./.github/workflows/reusable_linux_build.yml
30+
with:
31+
pool_name: "onnxruntime-github-Ubuntu2204-AMD-CPU"
32+
build_config: Release
33+
architecture: x64
34+
dockerfile_path: tools/ci_build/github/linux/docker/migraphx-ci-pipeline-env.Dockerfile
35+
docker_image_repo: onnxruntimetrainingmigraphx-cibuild-rocm
36+
extra_build_flags: '--enable_training --cmake_extra_defines CMAKE_HIP_COMPILER=/opt/rocm/llvm/bin/clang++ --rocm_version=6.4 --rocm_home /opt/rocm --nccl_home /opt/rocm --enable_nccl --skip_submodule_sync'
37+
run_tests: false
38+
execution_providers: 'migraphx'
39+
secrets:
40+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux_minimal_build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
4646
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
4747
with:
48-
vcpkg-version: '2025.04.09'
49-
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
48+
vcpkg-version: '2025.06.13'
49+
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
5050
cmake-version: '3.31.6'
5151
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
5252
add-cmake-to-path: 'true'
@@ -153,8 +153,8 @@ jobs:
153153
154154
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
155155
with:
156-
vcpkg-version: '2025.04.09'
157-
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
156+
vcpkg-version: '2025.06.13'
157+
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
158158
cmake-version: '3.31.6'
159159
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
160160
add-cmake-to-path: 'true'
@@ -193,8 +193,8 @@ jobs:
193193
194194
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
195195
with:
196-
vcpkg-version: '2025.04.09'
197-
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
196+
vcpkg-version: '2025.06.13'
197+
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
198198
cmake-version: '3.31.6'
199199
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
200200
add-cmake-to-path: 'true'
@@ -231,8 +231,8 @@ jobs:
231231
232232
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
233233
with:
234-
vcpkg-version: '2025.04.09'
235-
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
234+
vcpkg-version: '2025.06.13'
235+
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
236236
cmake-version: '3.31.6'
237237
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
238238
add-cmake-to-path: 'true'

.github/workflows/linux_webgpu.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: Linux WebGPU CI
2+
3+
on:
4+
push:
5+
branches: [main, 'rel-*']
6+
pull_request:
7+
branches: [main, 'rel-*']
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
packages: write
17+
attestations: write
18+
id-token: write
19+
20+
jobs:
21+
build-linux-webgpu-x64-release:
22+
name: Build Linux WebGPU x64 Release
23+
# This job runs on a CPU node using the reusable build workflow
24+
uses: ./.github/workflows/reusable_linux_build.yml
25+
with:
26+
pool_name: "onnxruntime-github-Ubuntu2204-AMD-CPU" # Build pool
27+
build_config: Release
28+
architecture: x64
29+
dockerfile_path: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_webgpu
30+
docker_image_repo: onnxruntimecpubuildpythonx64
31+
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --use_webgpu --build_java --cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=ON'
32+
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH'
33+
run_tests: false
34+
upload_build_output: true
35+
execution_providers: 'webgpu'
36+
secrets:
37+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Pass token for reusable workflow needs (e.g., docker build action)
38+
39+
# TODO: the following test step is currently failing. Need to fix and re-enable it
40+
41+
# test-linux-webgpu-x64-release:
42+
# name: Test Linux WebGPU x64 Release
43+
# needs: build-linux-webgpu-x64-release
44+
# runs-on:
45+
# - self-hosted
46+
# - "1ES.Pool=Onnxruntime-github-Linux-GPU-A100-WUS3"
47+
# permissions:
48+
# contents: read
49+
# packages: read
50+
# steps:
51+
# - name: Checkout code
52+
# uses: actions/checkout@v4
53+
54+
# - uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
55+
# id: build_docker_image_step
56+
# with:
57+
# dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_webgpu
58+
# image-name: ghcr.io/microsoft/onnxruntime/onnxruntimecpubuildcix64
59+
# push: true
60+
# azure-container-registry-name: onnxruntimebuildcache
61+
# env:
62+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Pass token to action
63+
64+
# # --- Download Build Artifact to Runner Temp Directory ---
65+
# - name: Download Build Artifact
66+
# uses: actions/download-artifact@v4
67+
# with:
68+
# name: build-output-x64-Release # Must match the upload name
69+
# path: ${{ runner.temp }}/Release # Download contents into temp dir structure
70+
71+
# # --- Restore Permissions in the Temp Directory ---
72+
# - name: Restore Executable Permissions
73+
# if: success() # Only run if download succeeded
74+
# working-directory: ${{ runner.temp }}/Release
75+
# shell: bash
76+
# run: |
77+
# if [ -f perms.txt ]; then
78+
# echo "Restoring executable permissions in ${{ runner.temp }}/Release ..."
79+
# while IFS= read -r file; do
80+
# # Check relative path existence within the current directory
81+
# if [ -f "$file" ]; then
82+
# chmod +x "$file"
83+
# else
84+
# echo "Warning: File '$file' listed in perms.txt not found."
85+
# fi
86+
# done < perms.txt
87+
# echo "Permissions restored."
88+
# else
89+
# echo "Warning: perms.txt not found in artifact."
90+
# fi
91+
92+
# - name: Test ONNX Runtime
93+
# id: test_step
94+
# uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
95+
# with:
96+
# docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name }}
97+
# build_config: Release
98+
# mode: 'test' # Set mode to test
99+
# execution_providers: 'webgpu'
100+
# extra_build_flags: '--use_binskim_compliant_compile_flags --cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=ON'
101+
# python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH'

.lintrunner.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,15 @@ include_patterns = [
9898
'**/*.cc',
9999
'**/*.hpp',
100100
'**/*.cpp',
101+
'**/*.cuh',
102+
'**/*.cu',
101103
'**/*.m',
102104
'**/*.mm',
103105
]
104106
exclude_patterns = [
105107
'java/**', # FIXME: Enable clang-format for java
106108
'onnxruntime/contrib_ops/cuda/bert/tensorrt_fused_multihead_attention/**', # Contains data chunks
109+
'onnxruntime/contrib_ops/cuda/llm/fpA_intB_gemm/launchers/*.generated.cu', # Generated code
107110
'onnxruntime/core/flatbuffers/schema/*.fbs.h', # Generated code
108111
'onnxruntime/test/flatbuffers/*.fbs.h', # Generated code
109112
'onnxruntime/core/graph/contrib_ops/quantization_defs.cc',

0 commit comments

Comments
 (0)