Skip to content

Commit 8608bf0

Browse files
adrianlizarragasnnntianleiwujchen351mszhanyi
authored
[ORT 1.20.2 Release] Cherry pick 1st round (#23574)
### Description - Update ORT version to 1.20.2 - Cherry-pick commits: - #23243 - #22738 - #22868 - #23281 - #22543 - #22566 - #23308 - #23017 - [Main feature] #23368 ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> --------- Co-authored-by: Changming Sun <[email protected]> Co-authored-by: Tianlei Wu <[email protected]> Co-authored-by: Jian Chen <[email protected]> Co-authored-by: Yi Zhang <[email protected]> Co-authored-by: Caroline Zhu <[email protected]>
1 parent 5c1b7cc commit 8608bf0

File tree

103 files changed

+503
-526
lines changed

Some content is hidden

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

103 files changed

+503
-526
lines changed

.github/codeql/codeql-config.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: "CodeQL config"
2+
queries:
3+
- uses: security-extended
4+
- uses: security-and-quality
5+
paths-ignore:
6+
- tests
7+
- build

.github/workflows/cffconvert.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
validate:
1010
name: "validate"
11-
runs-on: ubuntu-latest
11+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1212
steps:
1313
- name: Check out a copy of the repository
1414
uses: actions/checkout@v4

.github/workflows/codeql.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
jobs:
1919
analyze:
2020
name: Analyze
21-
runs-on: ubuntu-latest
21+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
2222
permissions:
2323
actions: read
2424
contents: read
@@ -55,6 +55,11 @@ jobs:
5555
java-version: '11'
5656
distribution: 'microsoft'
5757

58+
- if: ${{ matrix.language == 'javascript' }}
59+
uses: actions/setup-node@v4
60+
with:
61+
node-version: 20
62+
5863
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5964
# If this step fails, then you should remove it and run the build manually (see below)
6065
- if: ${{ matrix.language != 'cpp' }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on: [push, pull_request]
88
jobs:
99
validation:
1010
name: "Validation"
11-
runs-on: ubuntu-latest
11+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1212
steps:
1313
- uses: actions/checkout@v4
1414
- uses: gradle/actions/wrapper-validation@v4

.github/workflows/labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
jobs:
1010
triage:
11-
runs-on: ubuntu-latest
11+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1212
steps:
1313
- uses: github/[email protected]
1414
with:

.github/workflows/lint.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
lint-python-format:
3737
# Required workflow
3838
name: Python format
39-
runs-on: ubuntu-latest
39+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
4040
steps:
4141
- uses: actions/checkout@v4
4242
- name: Setup Python
@@ -114,9 +114,12 @@ jobs:
114114

115115
lint-js:
116116
name: Lint JavaScript
117-
runs-on: ubuntu-latest
117+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
118118
steps:
119119
- uses: actions/checkout@v4
120+
- uses: actions/setup-node@v4
121+
with:
122+
node-version: 20
120123
- uses: reviewdog/action-eslint@v1
121124
with:
122125
reporter: github-pr-check

.github/workflows/linux_training.yml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: orttraining-linux-ci-pipeline
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- rel-*
7+
pull_request:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
orttraining-linux-ci-pipeline:
15+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
16+
permissions:
17+
actions: read
18+
contents: read
19+
security-events: write
20+
steps:
21+
- uses: actions/checkout@v4
22+
- run: |
23+
python3 -m pip install --user -r tools/ci_build/github/linux/python/requirements.txt
24+
- name: Initialize CodeQL
25+
uses: github/codeql-action/init@v3
26+
with:
27+
config-file: ./.github/codeql/codeql-config.yml
28+
languages: 'cpp'
29+
- run: |
30+
set -e -x
31+
rm -rf build
32+
python3 tools/ci_build/build.py --build_dir build --config Release --enable_training --skip_submodule_sync --parallel --update --build
33+
34+
- name: Perform CodeQL Analysis
35+
uses: github/codeql-action/analyze@v3
36+
with:
37+
category: "/language:cpp"
38+
output: sarif-results
39+
upload: failure-only
40+
41+
- name: filter-sarif
42+
uses: advanced-security/filter-sarif@v1
43+
with:
44+
patterns: |
45+
+**/*.cc
46+
+**/*.h
47+
-tests/**/*.*
48+
-build/**/*.*
49+
input: sarif-results/cpp.sarif
50+
output: sarif-results/cpp.sarif
51+
52+
- name: Upload SARIF
53+
uses: github/codeql-action/upload-sarif@v3
54+
with:
55+
sarif_file: sarif-results/cpp.sarif

.github/workflows/mac.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
--use_xnnpack \
106106
--use_binskim_compliant_compile_flags \
107107
--ios \
108-
--apple_deploy_target=13.0 \
108+
--apple_deploy_target=15.1 \
109109
--apple_sysroot=iphonesimulator \
110110
--osx_arch=${{ matrix.target_arch }}
111111

.github/workflows/pr_checks.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
jobs:
2020
auto-apply-fixes:
2121
name: Suggest fixes
22-
runs-on: ubuntu-latest
22+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
2323
permissions:
2424
contents: read
2525
pull-requests: write
@@ -34,14 +34,13 @@ jobs:
3434
with:
3535
toolchain: stable
3636
components: rustfmt
37-
- name: Install dependencies
37+
- name: Install dependencies and run lintrunner on all files
3838
run: |
39-
python -m pip install -r requirements-dev.txt
40-
python -m pip install lintrunner lintrunner-adapters
39+
export PATH=$HOME/.local/bin:$PATH
40+
set -e
41+
python -m pip install --user -r requirements-dev.txt
42+
python -m pip install --user lintrunner lintrunner-adapters
4143
lintrunner init
42-
- name: Run lintrunner on all files
43-
run: |
44-
set +e
4544
lintrunner f --all-files -v
4645
exit 0
4746
- uses: parkerbxyz/suggest-changes@v1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
build:
2424
name: Generate C/C++ API docs
25-
runs-on: ubuntu-latest
25+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Install doxygen and dependencies

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020

2121
jobs:
2222
build:
23-
runs-on: ubuntu-latest
23+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
2424
env:
2525
DOCFXVERSION: 2.62.2
2626
steps:

.github/workflows/publish-gh-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
placeholder:
11-
runs-on: ubuntu-latest
11+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1212
steps:
1313
- name: Placeholder step to have workflow included in the GitHub web UI
1414
run: |

.github/workflows/publish-java-apidocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
build:
2323
name: Generate Java docs
24-
runs-on: ubuntu-latest
24+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
2525
steps:
2626
- uses: actions/checkout@v4
2727
- name: Set up JDK 11

.github/workflows/publish-js-apidocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
build:
2323
name: Generate JS API docs
24-
runs-on: ubuntu-latest
24+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
2525
steps:
2626
- uses: actions/checkout@v4
2727
- name: Setup Node.js

.github/workflows/publish-python-apidocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
build:
2424
name: Generate Python API docs
25-
runs-on: ubuntu-latest
25+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Install tools

.github/workflows/skip-doc-change.yml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
{%- for name in job_names %}
1515
job{{ loop.index }}:
1616
name: {{ name }}
17-
runs-on: ubuntu-latest
17+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1818
steps:
1919
- run: 'echo "No build required, only documentation changed"'
2020
{% endfor %}

.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
close-stale-issues:
11-
runs-on: ubuntu-latest
11+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1212
permissions:
1313
issues: write
1414
pull-requests: write

.github/workflows/title-only-labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
jobs:
1010
triage:
11-
runs-on: ubuntu-latest
11+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
1212
steps:
1313
- uses: github/[email protected]
1414
with:

VERSION_NUMBER

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.20.1
1+
1.20.2

csharp/test/Microsoft.ML.OnnxRuntime.Tests.MAUI/Microsoft.ML.OnnxRuntime.Tests.MAUI.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
<!-- General app properties -->
99
<PropertyGroup>
10-
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
10+
<!-- TODO: Add net8.0-android target back in once IndexOutOfRangeException for MAUI net8.0-android issue is
11+
resolved. -->
12+
<TargetFrameworks>net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
1113
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
1214

1315
<!-- Note for MacCatalyst:

docs/python/README.rst

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ For more information on ONNX Runtime, please see `aka.ms/onnxruntime <https://ak
88
Changes
99
-------
1010

11+
1.20.2
12+
^^^^^^
13+
14+
Release Notes : https://github.com/Microsoft/onnxruntime/releases/tag/v1.20.2
15+
1116
1.20.1
1217
^^^^^^
1318

include/onnxruntime/core/session/onnxruntime_c_api.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -3660,8 +3660,8 @@ struct OrtApi {
36603660
* - "1": Enabled.
36613661
* "offload_graph_io_quantization": Offload graph input quantization and graph output dequantization to another
36623662
* execution provider (typically CPU EP).
3663-
* - "0": Default. Disabled. QNN EP will handle quantization and dequantization of graph I/O.
3664-
* - "1": Enabled.
3663+
* - "0": Disabled. QNN EP will handle quantization and dequantization of graph I/O.
3664+
* - "1": Enabled. This is the default value.
36653665
*
36663666
* SNPE supported keys:
36673667
* "runtime": SNPE runtime engine, options: "CPU", "CPU_FLOAT32", "GPU", "GPU_FLOAT32_16_HYBRID", "GPU_FLOAT16",

js/common/lib/version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
// This file is generated by /js/scripts/update-version.ts
55
// Do not modify file content manually.
66

7-
export const version = '1.20.1';
7+
export const version = '1.20.2';

js/common/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/common/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"license": "MIT",
33
"type": "module",
44
"name": "onnxruntime-common",
5-
"version": "1.20.1",
5+
"version": "1.20.2",
66
"repository": {
77
"url": "https://github.com/Microsoft/onnxruntime.git",
88
"type": "git"

js/node/lib/version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
// This file is generated by /js/scripts/update-version.ts
55
// Do not modify file content manually.
66

7-
export const version = '1.20.1';
7+
export const version = '1.20.2';

js/node/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
3
1414
]
1515
},
16-
"version": "1.20.1",
16+
"version": "1.20.2",
1717
"dependencies": {
1818
"onnxruntime-common": "file:../common",
1919
"tar": "^7.0.1"

js/react_native/lib/version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
// This file is generated by /js/scripts/update-version.ts
55
// Do not modify file content manually.
66

7-
export const version = '1.20.1';
7+
export const version = '1.20.2';

js/react_native/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"registry": "https://registry.npmjs.org/"
3737
},
3838
"source": "lib/index",
39-
"version": "1.20.1",
39+
"version": "1.20.2",
4040
"main": "dist/commonjs/index",
4141
"homepage": "https://github.com/microsoft/onnxruntime/blob/main/js/react_native/README.md",
4242
"files": [

js/react_native/yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -5254,7 +5254,7 @@ onetime@^5.1.0, onetime@^5.1.2:
52545254
mimic-fn "^2.1.0"
52555255

52565256
"onnxruntime-common@file:../common":
5257-
version "1.20.1"
5257+
version "1.20.2"
52585258

52595259
open@^6.2.0:
52605260
version "6.4.0"

js/web/lib/version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
// This file is generated by /js/scripts/update-version.ts
55
// Do not modify file content manually.
66

7-
export const version = '1.20.1';
7+
export const version = '1.20.2';

0 commit comments

Comments
 (0)