Skip to content

Commit fd14e95

Browse files
xhan65xhan65
authored
Merge branch 'main' into user/xiha/compat_api
2 parents 159f5d3 + 1e39375 commit fd14e95

File tree

369 files changed

+14699
-3803
lines changed

Some content is hidden

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

369 files changed

+14699
-3803
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.9
1818
with:
19-
vcpkg-version: '2025.06.13'
20-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
19+
vcpkg-version: '2025.08.27'
20+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
2121
cmake-version: '3.31.6'
2222
cmake-hash: '0f1584e8666cf4a65ec514bd02afe281caabf1d45d2c963f3151c41484f457386aa03273ab25776a670be02725354ce0b46f3a5121857416da37366342a833a0'
2323
add-cmake-to-path: 'true'

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ jobs:
132132

133133
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
134134
with:
135-
vcpkg-version: '2025.06.13'
136-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
135+
vcpkg-version: '2025.08.27'
136+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
137137
cmake-version: '3.31.6'
138138
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
139139
add-cmake-to-path: 'true'

‎.github/workflows/ios.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
submodules: false
2626
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
2727
with:
28-
vcpkg-version: '2025.06.13'
29-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
28+
vcpkg-version: '2025.08.27'
29+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
3030
cmake-version: '3.31.8'
3131
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
3232
add-cmake-to-path: 'true'

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ jobs:
7070

7171
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
7272
with:
73-
vcpkg-version: '2025.06.13'
74-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
73+
vcpkg-version: '2025.08.27'
74+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
7575
cmake-version: '3.31.6'
7676
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
7777
add-cmake-to-path: 'true'
@@ -146,7 +146,7 @@ jobs:
146146
147147
- name: Upload WASM artifacts
148148
if: ${{ inputs.skip_publish != true }}
149-
uses: actions/upload-artifact@v5
149+
uses: actions/upload-artifact@v6
150150
with:
151151
name: ${{ inputs.build_config }}_wasm
152152
path: ${{ github.workspace }}/artifacts/wasm
@@ -175,7 +175,7 @@ jobs:
175175

176176
- name: Publish test results
177177
if: ${{ always() && inputs.build_config == 'Debug' }}
178-
uses: actions/upload-artifact@v5
178+
uses: actions/upload-artifact@v6
179179
with:
180180
name: test-results
181181
path: ${{ github.workspace }}/build/**/*.results.xml

‎.github/workflows/linux_cuda_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@v6
68+
uses: actions/download-artifact@v7
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/linux_minimal_build.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242

4343
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
4444
with:
45-
vcpkg-version: '2025.06.13'
46-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
45+
vcpkg-version: '2025.08.27'
46+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
4747
cmake-version: '3.31.6'
4848
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
4949
add-cmake-to-path: 'true'
@@ -53,7 +53,7 @@ jobs:
5353
uses: microsoft/onnxruntime-github-actions/build-and-prep-ort-files@v0.0.9
5454

5555
- name: Upload Test Data Artifact
56-
uses: actions/upload-artifact@v5
56+
uses: actions/upload-artifact@v6
5757
with:
5858
name: test_data
5959
path: ${{ runner.temp }}/minimal_build_test_data/
@@ -143,8 +143,8 @@ jobs:
143143

144144
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
145145
with:
146-
vcpkg-version: '2025.06.13'
147-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
146+
vcpkg-version: '2025.08.27'
147+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
148148
cmake-version: '3.31.6'
149149
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
150150
add-cmake-to-path: 'true'
@@ -181,8 +181,8 @@ jobs:
181181

182182
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
183183
with:
184-
vcpkg-version: '2025.06.13'
185-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
184+
vcpkg-version: '2025.08.27'
185+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
186186
cmake-version: '3.31.6'
187187
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
188188
add-cmake-to-path: 'true'
@@ -217,8 +217,8 @@ jobs:
217217

218218
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
219219
with:
220-
vcpkg-version: '2025.06.13'
221-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
220+
vcpkg-version: '2025.08.27'
221+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
222222
cmake-version: '3.31.6'
223223
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
224224
add-cmake-to-path: 'true'
@@ -552,7 +552,7 @@ jobs:
552552
with:
553553
node-version: 20
554554
- name: Download Test Data Artifact
555-
uses: actions/download-artifact@v6
555+
uses: actions/download-artifact@v7
556556
with:
557557
name: test_data
558558
path: ${{ runner.temp }}/.test_data/

‎.github/workflows/linux_tensorrt_ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
build_config: Release
2828
architecture: x64
2929
dockerfile_path: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
30-
docker_build_args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_almalinux8_gcc14:20251017.1 --build-arg TRT_VERSION=10.9.0.34-1.cuda12.8 --network=host'
30+
docker_build_args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_almalinux8_gcc14:20251017.1 --build-arg TRT_VERSION=10.14.1.48-1.cuda12.9 --network=host'
3131
docker_image_repo: onnxruntimetensorrt86gpubuild
3232
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --cuda_version=12.8 --cuda_home=/usr/local/cuda-12.8 --cudnn_home=/usr/local/cuda-12.8 --use_tensorrt --tensorrt_home /usr --build_java --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=90 onnxruntime_BUILD_UNIT_TESTS=ON onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS=ON'
3333
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH'
@@ -59,15 +59,15 @@ jobs:
5959
with:
6060
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
6161
image-name: ghcr.io/microsoft/onnxruntime/onnxruntimetensorrt86gpubuild
62-
build-args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_almalinux8_gcc14:20251017.1 --build-arg TRT_VERSION=10.9.0.34-1.cuda12.8 --network=host'
62+
build-args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_almalinux8_gcc14:20251017.1 --build-arg TRT_VERSION=10.14.1.48-1.cuda12.9 --network=host'
6363
push: true
6464
azure-container-registry-name: onnxruntimebuildcache
6565
env:
6666
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Pass token to action
6767

6868
# --- Download Build Artifact to Runner Temp Directory ---
6969
- name: Download Build Artifact
70-
uses: actions/download-artifact@v6
70+
uses: actions/download-artifact@v7
7171
with:
7272
name: build-output-x64-Release # Must match the upload name
7373
path: ${{ runner.temp }}/Release # Download contents into temp dir structure

‎.github/workflows/mac.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ jobs:
7979
uses: actions/checkout@v6
8080
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
8181
with:
82-
vcpkg-version: '2025.06.13'
83-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
82+
vcpkg-version: '2025.08.27'
83+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
8484
cmake-version: '3.31.8'
8585
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
8686
add-cmake-to-path: 'true'
@@ -127,8 +127,8 @@ jobs:
127127
uses: actions/checkout@v6
128128
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
129129
with:
130-
vcpkg-version: '2025.06.13'
131-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
130+
vcpkg-version: '2025.08.27'
131+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
132132
cmake-version: '3.31.8'
133133
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
134134
add-cmake-to-path: 'true'

‎.github/workflows/macos-ci-build-and-test-workflow.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
uses: actions/checkout@v6
7979
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
8080
with:
81-
vcpkg-version: '2025.06.13'
82-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
81+
vcpkg-version: '2025.08.27'
82+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
8383
cmake-version: '3.31.8'
8484
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
8585
add-cmake-to-path: 'true'
@@ -93,7 +93,7 @@ jobs:
9393
xcode_version: ${{ env.xcode_version }}
9494
use_cache: true
9595

96-
- uses: actions/cache@v4
96+
- uses: actions/cache@v5
9797
id: onnx-node-tests-cache
9898
with:
9999
path: ${{ github.workspace }}/js/test/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
rm -rf site/docs/api/c
5050
mv build/doxygen/html _site/docs/api/c
5151
- name: Upload new site
52-
uses: actions/upload-artifact@v5
52+
uses: actions/upload-artifact@v6
5353
with:
5454
name: onnxruntime-c-apidocs
5555
path: _site

0 commit comments

Comments
 (0)