Skip to content

Commit 080f66b

Browse files
ankitm3kankitm3k
authored
Merge pull request #692 from intel/sync_msft_16_5_25
Backmerging with Msft commits
2 parents 76d3122 + e6dd15b commit 080f66b

File tree

254 files changed

+10205
-1987
lines changed

Some content is hidden

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

254 files changed

+10205
-1987
lines changed

‎.github/actions/webgpu-validate-shader-key/parse-chromium-debug-log.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ async function processChromiumDebugLog() {
1616

1717
for await (const line of rl) {
1818
const result =
19-
/^\[.+INFO:CONSOLE\(\d+\)]\ "(?<raw_log_data>.+)",\ source:\ [^"]+?\(\d+\)$/.exec(
19+
/^\[.+INFO:CONSOLE.+?]\ "(?<raw_log_data>.+)",\ source:\ [^"]+?\(\d+\)$/.exec(
2020
line
2121
);
2222
if (!result) {

‎.github/workflows/codeql.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ name: "CodeQL"
88

99
on:
1010
push:
11-
branches: [ "main", nuget_pkg, rel-* ]
11+
branches: ["main", nuget_pkg, rel-*]
1212
pull_request:
1313
# The branches below must be a subset of the branches above
14-
branches: [ "main" ]
14+
branches: ["main"]
1515
schedule:
1616
- cron: '41 13 * * 0'
1717
workflow_dispatch:
1818

1919
concurrency:
20-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
20+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
2121
cancel-in-progress: true
2222

2323
jobs:
@@ -32,44 +32,44 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
language: [ 'java', 'javascript', 'python' ]
35+
language: ['java', 'javascript', 'python']
3636
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
3737
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3838

3939
steps:
40-
- name: Checkout repository
41-
uses: actions/checkout@v4
40+
- name: Checkout repository
41+
uses: actions/checkout@v4
4242

4343
# Initializes the CodeQL tools for scanning.
44-
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v3
46-
with:
47-
languages: ${{ matrix.language }}
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v3
46+
with:
47+
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
4949
# By default, queries listed here will override any specified in a config file.
5050
# Prefix the list here with "+" to use these queries and those in the config file.
5151

5252
# Details on CodeQL's query packs refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53-
queries: security-extended,security-and-quality
53+
queries: security-extended,security-and-quality
5454

5555
# Setup Java to use a version that is not too old for the project
56-
- if: ${{ matrix.language == 'java' }}
57-
name: Setup Java 11
58-
uses: actions/setup-java@v4
59-
with:
60-
java-version: '11'
61-
distribution: 'microsoft'
56+
- if: ${{ matrix.language == 'java' }}
57+
name: Setup Java 11
58+
uses: actions/setup-java@v4
59+
with:
60+
java-version: '11'
61+
distribution: 'microsoft'
6262

63-
- if: ${{ matrix.language == 'javascript' }}
64-
uses: actions/setup-node@v4
65-
with:
66-
node-version: 20
63+
- if: ${{ matrix.language == 'javascript' }}
64+
uses: actions/setup-node@v4
65+
with:
66+
node-version: 20
6767

6868
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6969
# If this step fails, then you should remove it and run the build manually (see below)
70-
- if: ${{ matrix.language != 'cpp' }}
71-
name: Autobuild
72-
uses: github/codeql-action/autobuild@v3
70+
- if: ${{ matrix.language != 'cpp' }}
71+
name: Autobuild
72+
uses: github/codeql-action/autobuild@v3
7373

74-
- name: Perform CodeQL Analysis
75-
uses: github/codeql-action/analyze@v3
74+
- name: Perform CodeQL Analysis
75+
uses: github/codeql-action/analyze@v3

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
name: "Validate Gradle Wrapper"
66
on:
77
push:
8-
branches: [ main, 'rel-*']
8+
branches: [main, 'rel-*']
99
pull_request:
10-
branches: [ main, 'rel-*']
10+
branches: [main, 'rel-*']
1111
workflow_dispatch:
1212

1313
jobs:
@@ -17,3 +17,6 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919
- uses: gradle/actions/wrapper-validation@v4
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
22+
cancel-in-progress: true

‎.github/workflows/ios.yml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,53 @@ on:
1212
workflow_dispatch:
1313

1414
concurrency:
15-
group: ${{ github.workflow }}-${{ github.ref }}
15+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1616
cancel-in-progress: true
1717

1818
jobs:
1919
iOS_CI_on_Mac:
2020
runs-on: macos-14
2121
steps:
22-
- name: Checkout repository
23-
uses: actions/checkout@v4
24-
with:
25-
submodules: false
26-
- name: Use Xcode ${{ env.XCODE_VERSION }}
27-
shell: bash
28-
run: |
29-
set -e -x
30-
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ env.XCODE_VERSION }}.app/Contents/Developer"
31-
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
with:
25+
submodules: false
26+
- name: Use Xcode ${{ env.XCODE_VERSION }}
27+
shell: bash
28+
run: |
29+
set -e -x
30+
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ env.XCODE_VERSION }}.app/Contents/Developer"
31+
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"
3232
33-
- name: Export GitHub Actions cache environment variables
34-
uses: actions/github-script@v7
35-
with:
36-
script: |
37-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
38-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
33+
- name: Export GitHub Actions cache environment variables
34+
uses: actions/github-script@v7
35+
with:
36+
script: |
37+
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
38+
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
3939
40-
- name: (CPU, CoreML, XNNPACK EPs) Build onnxruntime for iOS x86_64 and run tests using simulator
41-
shell: bash
42-
run: |
43-
python3 ${{ github.workspace }}/tools/ci_build/build.py \
44-
--skip_submodule_sync \
45-
--build_dir ${{ github.workspace }}/iOS \
46-
--build_shared_lib \
47-
--use_coreml \
48-
--use_xnnpack \
49-
--ios \
50-
--apple_sysroot iphonesimulator \
51-
--osx_arch x86_64 \
52-
--apple_deploy_target=15.1 \
53-
--use_xcode \
54-
--config RelWithDebInfo \
55-
--build_apple_framework \
56-
--parallel \
57-
--use_binskim_compliant_compile_flags
58-
env:
59-
ORT_GET_SIMULATOR_DEVICE_INFO_REQUESTED_RUNTIME_VERSION: ${{ env.IOS_SIMULATOR_RUNTIME_VERSION }}
40+
- name: (CPU, CoreML, XNNPACK EPs) Build onnxruntime for iOS x86_64 and run tests using simulator
41+
shell: bash
42+
run: |
43+
python3 ${{ github.workspace }}/tools/ci_build/build.py \
44+
--skip_submodule_sync \
45+
--build_dir ${{ github.workspace }}/iOS \
46+
--build_shared_lib \
47+
--use_coreml \
48+
--use_xnnpack \
49+
--ios \
50+
--apple_sysroot iphonesimulator \
51+
--osx_arch x86_64 \
52+
--apple_deploy_target=15.1 \
53+
--use_xcode \
54+
--config RelWithDebInfo \
55+
--build_apple_framework \
56+
--parallel \
57+
--use_binskim_compliant_compile_flags
58+
env:
59+
ORT_GET_SIMULATOR_DEVICE_INFO_REQUESTED_RUNTIME_VERSION: ${{ env.IOS_SIMULATOR_RUNTIME_VERSION }}
6060

6161
timeout-minutes: 150
6262
env:
6363
XCODE_VERSION: 15.3.0
64-
IOS_SIMULATOR_RUNTIME_VERSION: 17.4
64+
IOS_SIMULATOR_RUNTIME_VERSION: 17.4

‎.github/workflows/lint.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
workflow_dispatch:
1010

1111
concurrency:
12-
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name == 'workflow_dispatch' }}
12+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1313
cancel-in-progress: true
1414

1515
jobs:
@@ -109,18 +109,7 @@ jobs:
109109
github_token: ${{ secrets.github_token }}
110110
reporter: github-pr-check
111111
level: info
112-
flags: --linelength=120
113-
--exclude=java/src/main/native/*.c
114-
--exclude=onnxruntime/core/mlas/inc/*
115-
--exclude=onnxruntime/core/mlas/lib/*
116-
--exclude=onnxruntime/contrib_ops/cuda/bert/flash_attention/*
117-
--exclude=build/Debug/*
118-
--exclude=cmake/*
119-
--exclude=csharp/test/*
120-
--exclude=onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/GeneratedShaders/*
121-
--exclude=orttraining/orttraining/test/*
122-
--exclude=onnxruntime/test/*
123-
--exclude=winml/*
112+
flags: --linelength=120 --exclude=java/src/main/native/*.c --exclude=onnxruntime/core/mlas/inc/* --exclude=onnxruntime/core/mlas/lib/* --exclude=onnxruntime/contrib_ops/cuda/bert/flash_attention/* --exclude=build/Debug/* --exclude=cmake/* --exclude=csharp/test/* --exclude=onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/GeneratedShaders/* --exclude=orttraining/orttraining/test/* --exclude=onnxruntime/test/* --exclude=winml/*
124113
filter: "-runtime/references"
125114

126115
lint-js:

‎.github/workflows/linux-dnnl.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ name: Linux DNNL CI
88

99
on:
1010
push:
11-
branches: [ main, 'rel-*']
11+
branches: [main, 'rel-*']
1212
pull_request:
13-
branches: [ main, 'rel-*']
13+
branches: [main, 'rel-*']
1414
workflow_dispatch:
1515

1616
concurrency:
17-
group: ${{ github.workflow }}-${{ github.ref }}
17+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1818
cancel-in-progress: true
1919

2020
permissions:

‎.github/workflows/linux_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ name: Linux CI
2121

2222
on:
2323
push:
24-
branches: [ main, 'rel-*']
24+
branches: [main, 'rel-*']
2525
pull_request:
26-
branches: [ main, 'rel-*']
26+
branches: [main, 'rel-*']
2727
workflow_dispatch:
2828

2929
concurrency:
30-
group: ${{ github.workflow }}-${{ github.ref }}
30+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
3131
cancel-in-progress: true
3232

3333
permissions:

‎.github/workflows/linux_cuda_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Linux CUDA CI
22

33
on:
44
push:
5-
branches: [ main, 'rel-*']
5+
branches: [main, 'rel-*']
66
pull_request:
7-
branches: [ main, 'rel-*']
7+
branches: [main, 'rel-*']
88
workflow_dispatch:
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.ref }}
11+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1212
cancel-in-progress: true
1313

1414
permissions:

‎.github/workflows/linux_openvino_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Linux OpenVINO CI
22

33
on:
44
push:
5-
branches: [ main, 'rel-*' ]
5+
branches: [main, 'rel-*']
66
pull_request:
7-
branches: [ main, 'rel-*' ]
7+
branches: [main, 'rel-*']
88
workflow_dispatch:
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.ref }}
11+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1212
cancel-in-progress: true
1313

1414
permissions:

‎.github/workflows/linux_tensorrt_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Linux TensorRT CI
22

33
on:
44
push:
5-
branches: [ main, 'rel-*']
5+
branches: [main, 'rel-*']
66
pull_request:
7-
branches: [ main, 'rel-*']
7+
branches: [main, 'rel-*']
88
workflow_dispatch:
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.ref }}
11+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1212
cancel-in-progress: true
1313

1414
permissions:

‎.github/workflows/mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
workflow_dispatch:
1313

1414
concurrency:
15-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
15+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1616
cancel-in-progress: true
1717

1818
env:

‎.github/workflows/pr_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: # set top-level default permissions as security best practice
1313
contents: read
1414

1515
concurrency:
16-
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name == 'workflow_dispatch' }}
16+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1717
cancel-in-progress: true
1818

1919
jobs:

‎.github/workflows/web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
workflow_dispatch:
1313

1414
concurrency:
15-
group: ${{ github.workflow }}-${{ github.ref }}
15+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1616
cancel-in-progress: true
1717

1818
jobs:

‎.github/workflows/windows-web-ci-workflow.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,14 @@ jobs:
205205
log_file_path: ${{ runner.temp }}\web\test\07\chrome_debug.log
206206
is_chromium_log: true
207207

208+
# this step is added to help investigate the shader validation failure which is hard to reproduce
209+
- name: Upload WebGPU shader validation log on failure
210+
if: ${{ failure() && inputs.run_webgpu_tests == true && inputs.build_config == 'Debug' }}
211+
uses: actions/upload-artifact@v4
212+
with:
213+
name: webgpu-shader-validation-logs
214+
path: ${{ runner.temp }}\web\test\07\chrome_debug.log
215+
208216
- name: E2E package consuming test
209217
if: ${{ inputs.build_config == 'Release' }}
210218
run: npm run test:e2e -- --browser=Chrome_default

‎CODEOWNERS

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
# Mobile
44
/onnxruntime/core/flatbuffers/schema/ort.fbs @microsoft/onnxruntime-mobile
55

6-
# MLAS and related contrib ops
7-
/onnxruntime/core/graph/contrib_ops/nhwc_schema_defs.cc @microsoft/onnxruntime-mlas
8-
/onnxruntime/core/graph/contrib_ops/nchwc_schema_defs.cc @microsoft/onnxruntime-mlas
9-
/onnxruntime/core/graph/contrib_ops/quantization_defs.* @microsoft/onnxruntime-mlas
10-
/onnxruntime/core/mlas/** @microsoft/onnxruntime-mlas
11-
126
# Dependencies
137
requirements-dev.txt @microsoft/onnxruntime-admin
148
requirements-doc.txt @microsoft/onnxruntime-admin

0 commit comments

Comments
 (0)