Skip to content

Commit 7ec820b

Browse files
committed
Merge main into new_provider
Signed-off-by: Andreas Fehlner <fehlner@arcor.de>
2 parents c0c0250 + 28aa777 commit 7ec820b

38 files changed

Lines changed: 1902 additions & 72 deletions

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.sh text eol=lf

.github/copilot-instructions.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# GitHub Copilot instructions
2+
3+
Follow the repository rules in `/AGENTS.md`.

.github/workflows/benchmark-backends.yml

Lines changed: 84 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
tvm: ${{ steps.filter.outputs.tvm }}
3838
onnx2c: ${{ steps.filter.outputs.onnx2c }}
3939
steps:
40-
- uses: actions/checkout@v6
40+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4141
- uses: dorny/paths-filter@6852f92c20ea7fd3b0c25de3b5112db3a98da050 # v3
4242
id: filter
4343
with:
@@ -111,7 +111,7 @@ jobs:
111111
contents: read
112112
steps:
113113
- name: Checkout code
114-
uses: actions/checkout@v6
114+
uses: actions/checkout@v7
115115

116116
- name: Build docker image
117117
run: docker build -t scoreboard/ort -f runtimes/ort/stable/Dockerfile .
@@ -135,7 +135,7 @@ jobs:
135135
contents: read
136136
steps:
137137
- name: Checkout code
138-
uses: actions/checkout@v6
138+
uses: actions/checkout@v7
139139

140140
- name: Build docker image
141141
run: docker build -t scoreboard/onnxtf -f runtimes/onnx-tf/stable/Dockerfile .
@@ -160,7 +160,7 @@ jobs:
160160
contents: read
161161
steps:
162162
- name: Checkout code
163-
uses: actions/checkout@v6
163+
uses: actions/checkout@v7
164164

165165
- name: Build docker image
166166
run: docker build -t scoreboard/onnxtf-dev -f runtimes/onnx-tf/development/Dockerfile .
@@ -185,7 +185,7 @@ jobs:
185185
contents: read
186186
steps:
187187
- name: Checkout code
188-
uses: actions/checkout@v6
188+
uses: actions/checkout@v7
189189

190190
- name: Build docker image
191191
run: docker build -t scoreboard/jaxonnxruntime -f runtimes/jaxonnxruntime/stable/Dockerfile .
@@ -209,7 +209,7 @@ jobs:
209209
contents: read
210210
steps:
211211
- name: Checkout code
212-
uses: actions/checkout@v6
212+
uses: actions/checkout@v7
213213
with:
214214
persist-credentials: true
215215
fetch-depth: 0
@@ -237,7 +237,7 @@ jobs:
237237
contents: read
238238
steps:
239239
- name: Checkout code
240-
uses: actions/checkout@v6
240+
uses: actions/checkout@v7
241241

242242
- name: Build docker image
243243
run: docker build -t scoreboard/ort-dev -f runtimes/ort/development/Dockerfile .
@@ -264,7 +264,7 @@ jobs:
264264
contents: read
265265
steps:
266266
- name: Checkout code
267-
uses: actions/checkout@v6
267+
uses: actions/checkout@v7
268268

269269
- name: Build docker image
270270
run: docker build -t scoreboard/emx-onnx-cgen -f runtimes/emx-onnx-cgen/stable/Dockerfile .
@@ -291,7 +291,7 @@ jobs:
291291
contents: read
292292
steps:
293293
- name: Checkout code
294-
uses: actions/checkout@v6
294+
uses: actions/checkout@v7
295295

296296
- name: Build docker image
297297
run: docker build -t scoreboard/tract -f runtimes/tract/stable/Dockerfile .
@@ -318,7 +318,7 @@ jobs:
318318
contents: read
319319
steps:
320320
- name: Checkout code
321-
uses: actions/checkout@v6
321+
uses: actions/checkout@v7
322322

323323
- name: Build docker image
324324
run: docker build -t scoreboard/onnx-reference -f runtimes/onnx-reference/stable/Dockerfile .
@@ -345,7 +345,7 @@ jobs:
345345
contents: read
346346
steps:
347347
- name: Checkout code
348-
uses: actions/checkout@v6
348+
uses: actions/checkout@v7
349349

350350
- name: Build docker image
351351
run: docker build -t scoreboard/opencv -f runtimes/opencv/stable/Dockerfile .
@@ -372,7 +372,7 @@ jobs:
372372
contents: read
373373
steps:
374374
- name: Checkout code
375-
uses: actions/checkout@v6
375+
uses: actions/checkout@v7
376376

377377
- name: Build docker image
378378
run: docker build -t scoreboard/tvm -f runtimes/tvm/stable/Dockerfile .
@@ -395,11 +395,15 @@ jobs:
395395
timeout-minutes: 90
396396
needs: changes
397397
if: always() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || needs.changes.outputs.onnx2c == 'true')
398+
399+
onnxruntime_openvino_stable:
400+
runs-on: ubuntu-latest
401+
timeout-minutes: 90
398402
permissions:
399403
contents: read
400404
steps:
401405
- name: Checkout code
402-
uses: actions/checkout@v6
406+
uses: actions/checkout@v7
403407

404408
- name: Build docker image
405409
run: docker build -t scoreboard/onnx2c -f runtimes/onnx2c/stable/Dockerfile .
@@ -417,15 +421,57 @@ jobs:
417421
name: results-onnx2c-stable
418422
path: results/onnx2c/stable/
419423

424+
onnxruntime_openvino_stable:
425+
runs-on: ubuntu-latest
426+
timeout-minutes: 90
427+
permissions:
428+
contents: read
429+
steps:
430+
- name: Checkout code
431+
uses: actions/checkout@v7
432+
433+
- name: Build docker image
434+
run: docker build -t scoreboard/onnxruntime-openvino -f runtimes/onnxruntime-openvino/stable/Dockerfile .
435+
436+
- name: Prepare results directory
437+
run: mkdir -p ${{ github.workspace }}/results/onnxruntime-openvino/stable && chmod 777 ${{ github.workspace }}/results/onnxruntime-openvino/stable
438+
439+
- name: Run docker container
440+
run: |
441+
docker run --name onnxruntime-openvino --env-file setup/env.list \
442+
-e RESULTS_DIR=/home/onnx/results \
443+
-e CSVDIR=/home/onnx/results \
444+
-v ${{ github.workspace }}/results/onnxruntime-openvino/stable:/home/onnx/results \
445+
scoreboard/onnxruntime-openvino || true
446+
447+
- name: Upload results
448+
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
449+
uses: actions/upload-artifact@v7
450+
with:
451+
name: results-onnxruntime-openvino-stable
452+
path: results/onnxruntime-openvino/stable/
453+
420454
collect_and_deploy:
421455
runs-on: ubuntu-latest
422456
permissions:
423457
contents: write
424-
needs: [onnxruntime_stable, onnxruntime_dev, onnx_tf_stable, onnx_tf_dev, jaxonnxruntime_stable, jaxonnxruntime_dev, emx_onnx_cgen_stable, tract_stable, onnx_reference_stable, opencv_stable, tvm_stable, onnx2c_stable]
425-
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
458+
needs: [onnxruntime_stable, onnxruntime_dev, onnx_tf_stable, onnx_tf_dev, jaxonnxruntime_stable, jaxonnxruntime_dev, emx_onnx_cgen_stable, tract_stable, onnx_reference_stable, opencv_stable, tvm_stable, onnx2c_stable, onnxruntime_openvino_stable]
459+
# Run even if some backend jobs failed, so the scoreboard is still deployed
460+
if: ${{ always() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }}
426461
steps:
427462
- name: Checkout code
428-
uses: actions/checkout@v6
463+
uses: actions/checkout@v7
464+
465+
- name: Set up Python 3.12
466+
uses: actions/setup-python@v6
467+
with:
468+
python-version: '3.12'
469+
470+
- name: Preserve merge inputs
471+
run: |
472+
mkdir -p /tmp/scoreboard-merge
473+
cp scripts/merge_trends.py /tmp/scoreboard-merge/merge_trends.py
474+
cp setup/config.json /tmp/scoreboard-merge/config.json
429475
430476
- name: Switch to benchmark-results branch
431477
run: |
@@ -441,76 +487,98 @@ jobs:
441487
442488
- name: Download ort stable results
443489
uses: actions/download-artifact@v8
490+
continue-on-error: true
444491
with:
445492
name: results-ort-stable
446493
path: results/ort/stable/
447494

448495
- name: Download onnx-tf stable results
449496
uses: actions/download-artifact@v8
497+
continue-on-error: true
450498
with:
451499
name: results-onnxtf-stable
452500
path: results/onnx-tf/stable/
453501

454502
- name: Download onnx-tf dev results
455503
uses: actions/download-artifact@v8
504+
continue-on-error: true
456505
with:
457506
name: results-onnxtf-dev
458507
path: results/onnx-tf/development/
459508

460509
- name: Download jaxonnxruntime stable results
461510
uses: actions/download-artifact@v8
511+
continue-on-error: true
462512
with:
463513
name: results-jaxonnxruntime-stable
464514
path: results/jaxonnxruntime/stable/
465515

466516
- name: Download jaxonnxruntime dev results
467517
uses: actions/download-artifact@v8
518+
continue-on-error: true
468519
with:
469520
name: results-jaxonnxruntime-dev
470521
path: results/jaxonnxruntime/development/
471522

472523
- name: Download ort dev results
473524
uses: actions/download-artifact@v8
525+
continue-on-error: true
474526
with:
475527
name: results-ort-dev
476528
path: results/ort/development/
477529

478530
- name: Download emx-onnx-cgen stable results
479531
uses: actions/download-artifact@v8
532+
continue-on-error: true
480533
with:
481534
name: results-emx-onnx-cgen-stable
482535
path: results/emx-onnx-cgen/stable/
483536

484537
- name: Download tract stable results
485538
uses: actions/download-artifact@v8
539+
continue-on-error: true
486540
with:
487541
name: results-tract-stable
488542
path: results/tract/stable/
489543

490544
- name: Download ONNX reference stable results
491545
uses: actions/download-artifact@v8
546+
continue-on-error: true
492547
with:
493548
name: results-onnx-reference-stable
494549
path: results/onnx-reference/stable/
495550

496551
- name: Download opencv stable results
497552
uses: actions/download-artifact@v8
553+
continue-on-error: true
498554
with:
499555
name: results-opencv-stable
500556
path: results/opencv/stable/
501557

502558
- name: Download tvm stable results
503559
uses: actions/download-artifact@v8
560+
continue-on-error: true
504561
with:
505562
name: results-tvm-stable
506563
path: results/tvm/stable/
507564

508565
- name: Download onnx2c stable results
509566
uses: actions/download-artifact@v8
567+
continue-on-error: true
510568
with:
511569
name: results-onnx2c-stable
512570
path: results/onnx2c/stable/
513571

572+
- name: Download onnxruntime-openvino stable results
573+
uses: actions/download-artifact@v8
574+
continue-on-error: true
575+
with:
576+
name: results-onnxruntime-openvino-stable
577+
path: results/onnxruntime-openvino/stable/
578+
579+
- name: Merge trend history
580+
run: python3 /tmp/scoreboard-merge/merge_trends.py --config /tmp/scoreboard-merge/config.json --base-ref HEAD
581+
514582
- name: Deploy results
515583
run: |
516584
git add results

.github/workflows/eslint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
eslint:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@v7
1616
- uses: actions/setup-node@v6
1717
with:
1818
node-version: "24"

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
ruff:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v6
13+
- uses: actions/checkout@v7
1414
- uses: actions/setup-python@v6
1515
with:
1616
python-version: "3.12"

0 commit comments

Comments
 (0)