Skip to content

Commit 2041402

Browse files
Kotomi-DuKotomi-Du
authored
Merge branch 'ovep-develop' into make_stateful_phisilica
2 parents 7c1720d + 323cfeb commit 2041402

File tree

626 files changed

+20726
-6164
lines changed

Some content is hidden

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

626 files changed

+20726
-6164
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
distribution: 'microsoft'
6262

6363
- if: ${{ matrix.language == 'javascript' }}
64-
uses: actions/setup-node@v5
64+
uses: actions/setup-node@v6
6565
with:
6666
node-version: 20
6767

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1717
steps:
1818
- uses: actions/checkout@v5
19-
- uses: gradle/actions/wrapper-validation@v4
19+
- uses: gradle/actions/wrapper-validation@v5
2020
concurrency:
2121
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
2222
cancel-in-progress: true

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
118118
steps:
119119
- uses: actions/checkout@v5
120-
- uses: actions/setup-node@v5
120+
- uses: actions/setup-node@v6
121121
with:
122122
node-version: 20
123123
- uses: reviewdog/action-eslint@v1

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

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,15 @@ jobs:
3737
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
3838
env:
3939
buildArch: x64
40-
common_build_args: --parallel ${{ inputs.use_vcpkg == true && '--use_vcpkg --use_vcpkg_ms_internal_asset_cache' || '' }} --config ${{ inputs.build_config }} --skip_submodule_sync --build_wasm --enable_wasm_simd ${{ inputs.enable_wasm_threads == true && '--enable_wasm_threads' || '' }} ${{ inputs.extra_build_args }}
40+
common_build_args: >-
41+
--parallel
42+
${{ inputs.use_vcpkg == true && '--use_vcpkg --use_vcpkg_ms_internal_asset_cache' || '' }}
43+
--config ${{ inputs.build_config }}
44+
--skip_submodule_sync
45+
--build_wasm
46+
--enable_wasm_simd
47+
${{ inputs.enable_wasm_threads == true && '--enable_wasm_threads' || '' }}
48+
${{ inputs.extra_build_args }}
4149
4250
steps:
4351
- name: Checkout code
@@ -46,7 +54,7 @@ jobs:
4654
submodules: recursive
4755

4856
- name: Set up Node.js
49-
uses: actions/setup-node@v5
57+
uses: actions/setup-node@v6
5058
with:
5159
node-version: "22"
5260

@@ -70,6 +78,7 @@ jobs:
7078
python ./tools/ci_build/build.py \
7179
${{ env.common_build_args }} \
7280
--build_dir ${{ github.workspace }}/build/wasm_inferencing \
81+
${{ inputs.build_config == 'Release' && '--enable_wasm_api_exception_catching' || '' }} \
7382
--skip_tests
7483
working-directory: ${{ github.workspace }}
7584

@@ -82,6 +91,7 @@ jobs:
8291
--use_jsep \
8392
--use_webnn \
8493
--target onnxruntime_webassembly \
94+
${{ inputs.build_config == 'Release' && '--enable_wasm_api_exception_catching' || '' }} \
8595
--skip_tests
8696
working-directory: ${{ github.workspace }}
8797

@@ -94,6 +104,20 @@ jobs:
94104
--use_webgpu \
95105
--use_webnn \
96106
--target onnxruntime_webassembly \
107+
${{ inputs.build_config == 'Release' && '--enable_wasm_api_exception_catching' || '' }} \
108+
--skip_tests
109+
working-directory: ${{ github.workspace }}
110+
111+
- name: Build (simd + threads + WebGPU experimental, JSPI)
112+
if: ${{ inputs.build_webgpu == true }}
113+
run: |
114+
python ./tools/ci_build/build.py \
115+
${{ env.common_build_args }} \
116+
--build_dir ${{ github.workspace }}/build/wasm_inferencing_webgpu_jspi \
117+
--use_webgpu \
118+
--use_webnn \
119+
--enable_wasm_jspi \
120+
--target onnxruntime_webassembly \
97121
--skip_tests
98122
working-directory: ${{ github.workspace }}
99123

@@ -111,10 +135,14 @@ jobs:
111135
cp ${{ github.workspace }}/build/wasm_inferencing_webgpu/${{ inputs.build_config }}/ort-wasm-simd-threaded.asyncify.wasm ${{ github.workspace }}/artifacts/wasm/
112136
cp ${{ github.workspace }}/build/wasm_inferencing_webgpu/${{ inputs.build_config }}/ort-wasm-simd-threaded.asyncify.mjs ${{ github.workspace }}/artifacts/wasm/
113137
fi
138+
if [ -d ${{ github.workspace }}/build/wasm_inferencing_webgpu_jspi ]; then
139+
cp ${{ github.workspace }}/build/wasm_inferencing_webgpu_jspi/${{ inputs.build_config }}/ort-wasm-simd-threaded.jspi.wasm ${{ github.workspace }}/artifacts/wasm/
140+
cp ${{ github.workspace }}/build/wasm_inferencing_webgpu_jspi/${{ inputs.build_config }}/ort-wasm-simd-threaded.jspi.mjs ${{ github.workspace }}/artifacts/wasm/
141+
fi
114142
115143
- name: Upload WASM artifacts
116144
if: ${{ inputs.skip_publish != true }}
117-
uses: actions/upload-artifact@v4
145+
uses: actions/upload-artifact@v5
118146
with:
119147
name: ${{ inputs.build_config }}_wasm
120148
path: ${{ github.workspace }}/artifacts/wasm
@@ -143,7 +171,7 @@ jobs:
143171

144172
- name: Publish test results
145173
if: ${{ always() && inputs.build_config == 'Debug' }}
146-
uses: actions/upload-artifact@v4
174+
uses: actions/upload-artifact@v5
147175
with:
148176
name: test-results
149177
path: ${{ github.workspace }}/build/**/*.results.xml

‎.github/workflows/linux_cuda_ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ 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_ubi8_gcc12:20250124.1'
30+
docker_build_args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_almalinux8_gcc14:20251017.1'
3131
docker_image_repo: onnxruntimecuda12manylinuxbuild
32-
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --cuda_version=12.2 --cuda_home=/usr/local/cuda-12.2 --cudnn_home=/usr/local/cuda-12.2 --enable_cuda_profiling --build_java --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=90 onnxruntime_BUILD_UNIT_TESTS=ON onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS=ON'
32+
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 --enable_cuda_profiling --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'
3434
run_tests: false # <<< Do not run tests in this job
3535
upload_build_output: true # <<< Upload the build/Release directory
@@ -55,15 +55,15 @@ jobs:
5555
with:
5656
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
5757
image-name: ghcr.io/microsoft/onnxruntime/onnxruntimecuda12manylinuxbuild
58-
build-args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250124.1'
58+
build-args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_almalinux8_gcc14:20251017.1'
5959
push: true
6060
azure-container-registry-name: onnxruntimebuildcache
6161
env:
6262
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Pass token to action
6363

6464
# --- Download Build Artifact to Runner Temp Directory ---
6565
- name: Download Build Artifact
66-
uses: actions/download-artifact@v5
66+
uses: actions/download-artifact@v6
6767
with:
6868
name: build-output-x64-Release # Must match the upload name
6969
path: ${{ runner.temp }}/Release # Download contents into temp dir structure
@@ -99,5 +99,5 @@ jobs:
9999
build_config: Release
100100
mode: 'test' # Set mode to test
101101
execution_providers: 'cuda'
102-
extra_build_flags: '--use_binskim_compliant_compile_flags --cuda_version=12.2 --cuda_home=/usr/local/cuda-12.2 --cudnn_home=/usr/local/cuda-12.2 --enable_cuda_profiling --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=90 onnxruntime_BUILD_UNIT_TESTS=ON onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS=ON'
102+
extra_build_flags: '--use_binskim_compliant_compile_flags --cuda_version=12.8 --cuda_home=/usr/local/cuda-12.8 --cudnn_home=/usr/local/cuda-12.8 --enable_cuda_profiling --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=90 onnxruntime_BUILD_UNIT_TESTS=ON onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS=ON'
103103
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH'

‎.github/workflows/linux_minimal_build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
submodules: false
3434

35-
- uses: actions/setup-node@v5
35+
- uses: actions/setup-node@v6
3636
with:
3737
node-version: 20
3838

@@ -49,7 +49,7 @@ jobs:
4949
uses: microsoft/onnxruntime-github-actions/build-and-prep-ort-files@v0.0.9
5050

5151
- name: Upload Test Data Artifact
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v5
5353
with:
5454
name: test_data
5555
path: ${{ runner.temp }}/minimal_build_test_data/
@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/checkout@v5
6969
with:
7070
submodules: false
71-
- uses: actions/setup-node@v5
71+
- uses: actions/setup-node@v6
7272
with:
7373
node-version: 20
7474

@@ -125,7 +125,7 @@ jobs:
125125
uses: actions/checkout@v5
126126
with:
127127
submodules: false
128-
- uses: actions/setup-node@v5
128+
- uses: actions/setup-node@v6
129129
with:
130130
node-version: 20
131131

@@ -159,7 +159,7 @@ jobs:
159159
uses: actions/checkout@v5
160160
with:
161161
submodules: false
162-
- uses: actions/setup-node@v5
162+
- uses: actions/setup-node@v6
163163
with:
164164
node-version: 20
165165

@@ -191,7 +191,7 @@ jobs:
191191
uses: actions/checkout@v5
192192
with:
193193
submodules: false
194-
- uses: actions/setup-node@v5
194+
- uses: actions/setup-node@v6
195195
with:
196196
node-version: 20
197197

@@ -225,7 +225,7 @@ jobs:
225225
uses: actions/checkout@v5
226226
with:
227227
submodules: false
228-
- uses: actions/setup-node@v5
228+
- uses: actions/setup-node@v6
229229
with:
230230
node-version: 20
231231

@@ -508,11 +508,11 @@ jobs:
508508
uses: actions/checkout@v5
509509
with:
510510
submodules: false
511-
- uses: actions/setup-node@v5
511+
- uses: actions/setup-node@v6
512512
with:
513513
node-version: 20
514514
- name: Download Test Data Artifact
515-
uses: actions/download-artifact@v5
515+
uses: actions/download-artifact@v6
516516
with:
517517
name: test_data
518518
path: ${{ runner.temp }}/.test_data/

‎.github/workflows/linux_tensorrt_ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ 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_ubi8_gcc12:20250124.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.9.0.34-1.cuda12.8 --network=host'
3131
docker_image_repo: onnxruntimetensorrt86gpubuild
32-
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --cuda_version=12.2 --cuda_home=/usr/local/cuda-12.2 --cudnn_home=/usr/local/cuda-12.2 --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'
32+
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'
3434
run_tests: false # <<< Do not run tests in this job
3535
upload_build_output: true # <<< Upload the build/Release directory
@@ -57,15 +57,15 @@ jobs:
5757
with:
5858
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
5959
image-name: ghcr.io/microsoft/onnxruntime/onnxruntimetensorrt86gpubuild
60-
build-args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250124.1 --build-arg TRT_VERSION=10.9.0.34-1.cuda12.8 --network=host'
60+
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'
6161
push: true
6262
azure-container-registry-name: onnxruntimebuildcache
6363
env:
6464
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Pass token to action
6565

6666
# --- Download Build Artifact to Runner Temp Directory ---
6767
- name: Download Build Artifact
68-
uses: actions/download-artifact@v5
68+
uses: actions/download-artifact@v6
6969
with:
7070
name: build-output-x64-Release # Must match the upload name
7171
path: ${{ runner.temp }}/Release # Download contents into temp dir structure
@@ -101,5 +101,5 @@ jobs:
101101
build_config: Release
102102
mode: 'test' # Set mode to test
103103
execution_providers: 'cuda tensorrt'
104-
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --cuda_version=12.2 --cuda_home=/usr/local/cuda-12.2 --cudnn_home=/usr/local/cuda-12.2 --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'
104+
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'
105105
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH'

‎.github/workflows/pr_checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747
set +e
4848
lintrunner f --all-files -v
4949
exit 0
50-
- uses: parkerbxyz/suggest-changes@v2
50+
- uses: parkerbxyz/suggest-changes@v3
5151
with:
5252
comment: 'You can commit the suggested changes from lintrunner.'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
rm -rf site/docs/api/c
4646
mv build/doxygen/html _site/docs/api/c
4747
- name: Upload new site
48-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v5
4949
with:
5050
name: onnxruntime-c-apidocs
5151
path: _site

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020

2121
jobs:
2222
build:
23-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-vs2022-mms"]
23+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-vs2022-latest"]
2424
env:
2525
DOCFXVERSION: 2.62.2
2626
steps:
@@ -56,7 +56,7 @@ jobs:
5656
if (Test-Path $OutputDirectory) { Remove-Item -Recurse -Force $OutputDirectory }
5757
Move-Item -Path csharp\ApiDocs\csharp -Destination $OutputDirectory
5858
- name: Upload docs artifact
59-
uses: actions/upload-artifact@v4
59+
uses: actions/upload-artifact@v5
6060
with:
6161
name: onnxruntime-csharp-apidocs
6262
path: _site

0 commit comments

Comments
 (0)