Skip to content

Commit e3812c7

Browse files
sfatimarsfatimar
authored
Merge branch 'ovep-develop' into jatin_fix_appr_device
2 parents 4b646db + f86768b commit e3812c7

File tree

545 files changed

+31889
-20220
lines changed

Some content is hidden

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

545 files changed

+31889
-20220
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
steps:
1515

1616
- name: Setup VCPKG
17-
uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.6
17+
uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
1818
with:
1919
vcpkg-version: '2025.04.09'
2020
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
ndk-version: 28.0.13004108
3838

3939
- name: Get Docker Image using Action
40-
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
40+
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
4141
id: build_docker_image_step
4242
with:
4343
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -131,7 +131,7 @@ jobs:
131131
architecture: x64
132132

133133

134-
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.6
134+
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
135135
with:
136136
vcpkg-version: '2025.04.09'
137137
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'

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

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ on:
1515
required: false
1616
type: boolean
1717
default: false
18+
use_vcpkg:
19+
required: false
20+
type: boolean
21+
default: true
22+
enable_wasm_threads:
23+
required: false
24+
type: boolean
25+
default: true
1826
build_jsep:
1927
required: false
2028
type: boolean
@@ -29,7 +37,7 @@ jobs:
2937
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
3038
env:
3139
buildArch: x64
32-
common_build_args: --parallel --use_vcpkg --use_vcpkg_ms_internal_asset_cache --config ${{ inputs.build_config }} --skip_submodule_sync --build_wasm --enable_wasm_simd --enable_wasm_threads ${{ inputs.extra_build_args }}
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 }}
3341

3442
steps:
3543
- name: Checkout code
@@ -42,7 +50,7 @@ jobs:
4250
with:
4351
python-version: "3.12"
4452
architecture: ${{ env.buildArch }}
45-
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.6
53+
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
4654
with:
4755
vcpkg-version: '2025.03.19'
4856
vcpkg-hash: '17e96169cd3f266c4716fcdc1bb728e6a64f103941ece463a2834d50694eba4fb48f30135503fd466402afa139abc847ef630733c442595d1c34979f261b0114'
@@ -57,43 +65,29 @@ jobs:
5765
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
5866
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
5967
60-
- name: Install EMSDK
68+
- name: Build (simd + threads)
6169
run: |
62-
set -ex
63-
cd ${{ github.workspace }}/cmake/external/emsdk
64-
./emsdk install 4.0.4
65-
./emsdk activate 4.0.4
66-
67-
- name: Build and test (browser) (simd + threads)
68-
run: |
69-
set -e -x
70-
source ${{ github.workspace }}/cmake/external/emsdk/emsdk_env.sh
71-
cd '${{ github.workspace }}'
7270
python ./tools/ci_build/build.py \
7371
${{ env.common_build_args }} \
7472
--build_dir ${{ github.workspace }}/build/wasm_inferencing \
75-
--wasm_run_tests_in_browser
73+
--skip_tests
74+
working-directory: ${{ github.workspace }}
7675

7776
- name: Build (simd + threads + JSEP)
7877
if: ${{ inputs.build_jsep == true }}
7978
run: |
80-
set -e -x
81-
source ${{ github.workspace }}/cmake/external/emsdk/emsdk_env.sh
82-
cd '${{ github.workspace }}'
8379
python ./tools/ci_build/build.py \
8480
${{ env.common_build_args }} \
8581
--build_dir ${{ github.workspace }}/build/wasm_inferencing_jsep \
8682
--use_jsep \
8783
--use_webnn \
8884
--target onnxruntime_webassembly \
8985
--skip_tests
86+
working-directory: ${{ github.workspace }}
9087

9188
- name: Build (simd + threads + WebGPU experimental)
9289
if: ${{ inputs.build_webgpu == true }}
9390
run: |
94-
set -e -x
95-
source ${{ github.workspace }}/cmake/external/emsdk/emsdk_env.sh
96-
cd '${{ github.workspace }}'
9791
python ./tools/ci_build/build.py \
9892
${{ env.common_build_args }} \
9993
--build_dir ${{ github.workspace }}/build/wasm_inferencing_webgpu \
@@ -102,6 +96,7 @@ jobs:
10296
--use_webnn \
10397
--target onnxruntime_webassembly \
10498
--skip_tests
99+
working-directory: ${{ github.workspace }}
105100

106101
- name: Create Artifacts
107102
if: ${{ inputs.skip_publish != true }}
@@ -135,6 +130,28 @@ jobs:
135130
name: ${{ inputs.build_config }}_wasm_webgpu
136131
path: ${{ github.workspace }}/artifacts/wasm_webgpu
137132

133+
- name: Test (Node.js) (simd + threads)
134+
# onnxruntime_test_all is currently only supported in Debug build because it requires exception, which is disabled in Release build.
135+
if: ${{ inputs.build_config == 'Debug' }}
136+
run: |
137+
python ./tools/ci_build/build.py \
138+
${{ env.common_build_args }} \
139+
--build_dir ${{ github.workspace }}/build/wasm_inferencing \
140+
--test
141+
working-directory: ${{ github.workspace }}
142+
143+
- name: Test (browser) (simd + threads)
144+
# onnxruntime_test_all is currently only supported in Debug build because it requires exception, which is disabled in Release build.
145+
if: ${{ inputs.build_config == 'Debug' }}
146+
run: |
147+
python ./tools/ci_build/build.py \
148+
${{ env.common_build_args }} \
149+
--build_dir ${{ github.workspace }}/build/wasm_inferencing \
150+
--wasm_run_tests_in_browser \
151+
--target onnxruntime_test_all \
152+
--update --build --test
153+
working-directory: ${{ github.workspace }}
154+
138155
- name: Publish test results
139156
if: ${{ always() && inputs.build_config == 'Debug' }}
140157
uses: actions/upload-artifact@v4

‎.github/workflows/linux_cuda_ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Checkout code
5151
uses: actions/checkout@v4
5252

53-
- uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
53+
- uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
5454
id: build_docker_image_step
5555
with:
5656
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
@@ -93,7 +93,7 @@ jobs:
9393
# So build.py --build_dir build/Release inside the container correctly finds the artifacts.
9494
- name: Test ONNX Runtime
9595
id: test_step
96-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
96+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
9797
with:
9898
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name }}
9999
build_config: Release

‎.github/workflows/linux_minimal_build.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
4444
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
4545
46-
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.6
46+
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
4747
with:
4848
vcpkg-version: '2025.04.09'
4949
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
@@ -53,7 +53,7 @@ jobs:
5353
disable-terrapin: 'true'
5454

5555
- name: Build Full ORT and Prepare Test Files
56-
uses: microsoft/onnxruntime-github-actions/build-and-prep-ort-files@v0.0.6
56+
uses: microsoft/onnxruntime-github-actions/build-and-prep-ort-files@v0.0.7
5757

5858
- name: Upload Test Data Artifact
5959
uses: actions/upload-artifact@v4
@@ -80,7 +80,7 @@ jobs:
8080
node-version: 20
8181

8282
- name: Get Docker Image using Action
83-
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
83+
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
8484
id: build_docker_image_step
8585
with:
8686
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -98,7 +98,7 @@ jobs:
9898
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
9999
100100
- name: Run Build 2 (Update)
101-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
101+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
102102
with:
103103
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
104104
}}
@@ -113,7 +113,7 @@ jobs:
113113
--enable_training_ops
114114
115115
- name: Run Build 2 (Build)
116-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
116+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
117117
with:
118118
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
119119
}}
@@ -151,7 +151,7 @@ jobs:
151151
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
152152
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
153153
154-
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.6
154+
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
155155
with:
156156
vcpkg-version: '2025.04.09'
157157
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
@@ -161,7 +161,7 @@ jobs:
161161
disable-terrapin: 'true'
162162

163163
- name: Build Full ORT and Prepare Test Files
164-
uses: microsoft/onnxruntime-github-actions/build-minimal-ort-and-run-tests@v0.0.6
164+
uses: microsoft/onnxruntime-github-actions/build-minimal-ort-and-run-tests@v0.0.7
165165
with:
166166
reduced-ops-config-file: required_ops.ort_models.config
167167
enable-custom-ops: 'true'
@@ -191,7 +191,7 @@ jobs:
191191
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
192192
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
193193
194-
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.6
194+
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
195195
with:
196196
vcpkg-version: '2025.04.09'
197197
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
@@ -200,7 +200,7 @@ jobs:
200200
add-cmake-to-path: 'true'
201201
disable-terrapin: 'true'
202202
- name: Build Full ORT and Prepare Test Files
203-
uses: microsoft/onnxruntime-github-actions/build-minimal-ort-and-run-tests@v0.0.6
203+
uses: microsoft/onnxruntime-github-actions/build-minimal-ort-and-run-tests@v0.0.7
204204
with:
205205
reduced-ops-config-file: required_ops_and_types.ort_models.config
206206
enable-type-reduction: 'true'
@@ -229,7 +229,7 @@ jobs:
229229
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
230230
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
231231
232-
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.6
232+
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.7
233233
with:
234234
vcpkg-version: '2025.04.09'
235235
vcpkg-hash: '31a28b58854b7c7b503db99bb2eb41582d9f835b401adf3bd0f680ef329faa4ab4278b987b586a2a6141e2c98f007833266a4e3b60c3164226a3905466a082ce'
@@ -239,7 +239,7 @@ jobs:
239239
disable-terrapin: 'true'
240240

241241
- name: Build Full ORT and Prepare Test Files
242-
uses: microsoft/onnxruntime-github-actions/build-minimal-ort-and-run-tests@v0.0.6
242+
uses: microsoft/onnxruntime-github-actions/build-minimal-ort-and-run-tests@v0.0.7
243243
with:
244244
globally_allowed_types: 'bool,float,int8_t,uint8_t'
245245
enable-type-reduction: 'true'
@@ -264,7 +264,7 @@ jobs:
264264
node-version: 20
265265

266266
- name: Get Docker Image using Action
267-
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
267+
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
268268
id: build_docker_image_step
269269
with:
270270
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -282,7 +282,7 @@ jobs:
282282
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
283283
284284
- name: Run Build 5 (Update)
285-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
285+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
286286
with:
287287
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
288288
}}
@@ -295,7 +295,7 @@ jobs:
295295
--minimal_build extended
296296
297297
- name: Run Build 5 (Build)
298-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
298+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
299299
with:
300300
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
301301
}}
@@ -307,7 +307,7 @@ jobs:
307307
--use_binskim_compliant_compile_flags
308308
--minimal_build extended
309309
- name: Run Build 5 (Test)
310-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
310+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
311311
with:
312312
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
313313
}}
@@ -334,7 +334,7 @@ jobs:
334334
submodules: false
335335

336336
- name: Get Docker Image using Action
337-
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
337+
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
338338
id: build_docker_image_step
339339
with:
340340
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -358,7 +358,7 @@ jobs:
358358
touch ${{ runner.temp }}/.test_data/include_no_operators.config
359359
360360
- name: Run Build 6a (Update)
361-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
361+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
362362
with:
363363
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
364364
}}
@@ -374,7 +374,7 @@ jobs:
374374
--cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=OFF
375375
376376
- name: Run Build 6a (Build)
377-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
377+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
378378
with:
379379
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
380380
}}
@@ -391,7 +391,7 @@ jobs:
391391
392392
393393
- name: Run Build 6a (Test)
394-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
394+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
395395
with:
396396
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
397397
}}
@@ -427,7 +427,7 @@ jobs:
427427
touch ${{ runner.temp }}/.test_data/include_no_operators.config
428428
429429
- name: Get Docker Image using Action
430-
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
430+
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
431431
id: build_docker_image_step
432432
with:
433433
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -445,7 +445,7 @@ jobs:
445445
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
446446
447447
- name: Run Build 6b (Update)
448-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
448+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
449449
with:
450450
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
451451
}}
@@ -464,7 +464,7 @@ jobs:
464464
--cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=OFF
465465
466466
- name: Run Build 6b (Build)
467-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
467+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
468468
with:
469469
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
470470
}}
@@ -503,7 +503,7 @@ jobs:
503503
touch ${{ runner.temp }}/.test_data/include_no_operators.config
504504
505505
- name: Get Docker Image using Action
506-
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
506+
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
507507
id: build_docker_image_step
508508
with:
509509
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -526,7 +526,7 @@ jobs:
526526
touch ${{ runner.temp }}/.test_data/include_no_operators.config
527527
528528
- name: Run Build 6c (Update)
529-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
529+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
530530
with:
531531
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
532532
}}
@@ -545,7 +545,7 @@ jobs:
545545
--cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=OFF
546546
547547
- name: Run Build 6c (Build)
548-
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.6
548+
uses: microsoft/onnxruntime-github-actions/run-build-script-in-docker@v0.0.7
549549
with:
550550
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
551551
}}
@@ -588,7 +588,7 @@ jobs:
588588
path: ${{ runner.temp }}/.test_data/
589589

590590
- name: Get Docker Image using Action
591-
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.6
591+
uses: microsoft/onnxruntime-github-actions/build-docker-image@v0.0.7
592592
id: build_docker_image_step
593593
with:
594594
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile

0 commit comments

Comments
 (0)