Skip to content

Commit 8e0cf82

Browse files
pacowongpacowong
committed
Merge with main
2 parents 295d492 + 83e0c6b commit 8e0cf82

File tree

1,603 files changed

+87956
-48017
lines changed

Some content is hidden

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

1,603 files changed

+87956
-48017
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: gradle/wrapper-validation-action@v2
14+
- uses: gradle/wrapper-validation-action@v3

‎.github/workflows/lint.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ jobs:
9393
github_token: ${{ secrets.github_token }}
9494
reporter: github-pr-check
9595
level: warning
96-
flags: --linelength=120 --exclude=java/src/main/native/*.c
96+
flags: --linelength=120
97+
--exclude=java/src/main/native/*.c
98+
--exclude=onnxruntime/core/mlas/inc/*
99+
--exclude=onnxruntime/core/mlas/lib/*
100+
--exclude=onnxruntime/contrib_ops/cuda/bert/flash_attention/*
97101
filter: "-runtime/references"
98102

99103
lint-js:

‎.github/workflows/linux.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.github/workflows/mac.yml

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
name: Mac_CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- rel-*
8+
pull_request:
9+
branches:
10+
- main
11+
- rel-*
12+
workflow_dispatch:
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
16+
cancel-in-progress: true
17+
18+
env:
19+
python_version: 3.11
20+
xcode_version: 15.2
21+
22+
jobs:
23+
ARM64:
24+
runs-on: macos-14
25+
26+
timeout-minutes: 60
27+
28+
steps:
29+
- uses: actions/setup-python@v5
30+
with:
31+
python-version: ${{ env.python_version }}
32+
33+
- name: Verify ARM64 machine
34+
shell: python
35+
run: |
36+
import platform
37+
assert platform.machine() == "arm64", "This job expects to be run on an ARM64 machine."
38+
39+
- name: Use Xcode ${{ env.xcode_version }}
40+
shell: bash
41+
run: |
42+
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ env.xcode_version }}.app/Contents/Developer"
43+
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"
44+
45+
- uses: actions/checkout@v4
46+
47+
- name: Build and test
48+
shell: bash
49+
run: |
50+
python ./tools/ci_build/build.py \
51+
--build_dir ./build \
52+
--update \
53+
--build --parallel \
54+
--test \
55+
--build_shared_lib \
56+
--build_objc \
57+
--use_coreml \
58+
--use_xnnpack \
59+
--use_binskim_compliant_compile_flags
60+
61+
Objective-C-StaticAnalysis:
62+
runs-on: macos-14
63+
64+
timeout-minutes: 30
65+
66+
steps:
67+
- uses: actions/setup-python@v5
68+
with:
69+
python-version: ${{ env.python_version }}
70+
71+
- name: Use Xcode ${{ env.xcode_version }}
72+
shell: bash
73+
run: |
74+
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ env.xcode_version }}.app/Contents/Developer"
75+
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"
76+
77+
- uses: actions/checkout@v4
78+
79+
- name: Generate compile_commands.json and ONNX protobuf files
80+
shell: bash
81+
run: |
82+
python ./tools/ci_build/build.py \
83+
--build_dir ./build \
84+
--cmake_generator "Unix Makefiles" \
85+
--config Debug \
86+
--build_shared_lib \
87+
--use_coreml \
88+
--build_objc \
89+
--enable_training_apis \
90+
--cmake_extra_defines CMAKE_EXPORT_COMPILE_COMMANDS=ON \
91+
--use_binskim_compliant_compile_flags \
92+
--update \
93+
--build --parallel \
94+
--target onnx_proto
95+
96+
- name: Analyze Objective-C/C++ source code
97+
shell: bash
98+
run: |
99+
CLANG_TIDY_CHECKS="-*,clang-analyzer-*"
100+
101+
"$(brew --prefix llvm@15)/bin/clang-tidy" \
102+
-p=./build/Debug \
103+
--checks="${CLANG_TIDY_CHECKS}" \
104+
--warnings-as-errors="${CLANG_TIDY_CHECKS}" \
105+
--header-filter="objectivec/include|objectivec|onnxruntime/core" \
106+
./objectivec/*.mm \
107+
./onnxruntime/core/platform/apple/logging/apple_log_sink.mm \
108+
./onnxruntime/core/providers/coreml/model/*.mm

‎.github/workflows/sca.yml

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
name: Windows_SCA
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- rel-*
7+
pull_request:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
11+
cancel-in-progress: true
12+
13+
env:
14+
AZCOPY_AUTO_LOGIN_TYPE: MSI
15+
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
16+
17+
jobs:
18+
Onnxruntime-SCA-training-CUDA:
19+
permissions:
20+
security-events: write
21+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-vs2022-mms"]
22+
steps:
23+
- uses: actions/checkout@v4
24+
with:
25+
submodules: false
26+
- uses: actions/setup-python@v5
27+
with:
28+
python-version: '3.11.x'
29+
architecture: 'x64'
30+
31+
- uses: actions/setup-node@v4
32+
with:
33+
node-version: 18
34+
35+
- name: Download cuda
36+
run: azcopy.exe cp --recursive "https://lotusscus.blob.core.windows.net/models/cuda_sdk/v11.8" cuda_sdk
37+
38+
39+
- name: Install ONNX
40+
run: |
41+
&tools\ci_build\github\windows\install_third_party_deps.ps1 -cpu_arch x64 -install_prefix D:\b\Debug\installed -build_config Debug
42+
43+
# The build machine doesn't have a GPU. So the value of CMAKE_CUDA_ARCHITECTURES doesn't matter.
44+
- name: Build code
45+
env:
46+
CAExcludePath: 'C:\Program Files;D:\b;${{ github.workspace }}\cmake'
47+
run: python tools\ci_build\build.py --windows_sdk_version 10.0.22621.0 --enable_training --build_java --compile_no_warning_as_error --config Debug --build_dir D:\b --skip_submodule_sync --build_csharp --update --build --parallel --cmake_generator "Visual Studio 17 2022" --build_shared_lib --enable_pybind --cmake_extra_defines onnxruntime_USE_CUSTOM_STATIC_ANALYSIS_RULES=ON --cmake_extra_defines onnxruntime_ENABLE_STATIC_ANALYSIS=ON --cmake_extra_defines onnxruntime_REDIRECT_STATIC_ANALYSIS_OUTPUTS_TO_FILE=ON --use_cuda --cuda_home=${{ github.workspace }}\cuda_sdk\v11.8 --use_binskim_compliant_compile_flags --enable_cuda_profiling --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=75
48+
49+
- name: Generate sarif
50+
working-directory: D:\b
51+
run: npx @microsoft/sarif-multitool merge *.sarif --recurse --output-directory=${{ github.workspace }}\output --output-file=MergeResult.sarif --merge-runs && dir ${{ github.workspace }}\output
52+
53+
- name: Upload SARIF to GitHub
54+
uses: github/codeql-action/upload-sarif@v3
55+
continue-on-error: true
56+
with:
57+
sarif_file: ${{ github.workspace }}\output\MergeResult.sarif
58+
category: VS_SCA
59+
60+
# No python
61+
Onnxruntime-SCA-win32-WINML-x64:
62+
permissions:
63+
security-events: write
64+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-vs2022-mms"]
65+
steps:
66+
- uses: actions/checkout@v4
67+
with:
68+
submodules: false
69+
- uses: actions/setup-python@v5
70+
with:
71+
python-version: '3.11.x'
72+
architecture: 'x64'
73+
74+
- uses: actions/setup-node@v4
75+
with:
76+
node-version: 18
77+
78+
- name: Delete build folder
79+
run: |
80+
if (Test-Path D:\b) { Remove-Item -Recurse -Force D:\b }
81+
&tools\ci_build\github\windows\install_third_party_deps.ps1 -cpu_arch x64 -install_prefix D:\b\Debug\installed -build_config Debug
82+
83+
# The build machine doesn't have a GPU. So the value of CMAKE_CUDA_ARCHITECTURES doesn't matter.
84+
- name: Build code
85+
env:
86+
CAExcludePath: 'C:\Program Files;D:\b;${{ github.workspace }}\cmake'
87+
run: python tools\ci_build\build.py --build_java --compile_no_warning_as_error --config Debug --build_dir D:\b --skip_submodule_sync --build_csharp --update --build --parallel --cmake_generator "Visual Studio 17 2022" --build_shared_lib --cmake_extra_defines onnxruntime_USE_CUSTOM_STATIC_ANALYSIS_RULES=ON --cmake_extra_defines onnxruntime_ENABLE_STATIC_ANALYSIS=ON --cmake_extra_defines onnxruntime_REDIRECT_STATIC_ANALYSIS_OUTPUTS_TO_FILE=ON --ms_experimental --use_dml --use_winml --disable_rtti --enable_wcos --build_shared_lib
88+
89+
- name: Generate sarif
90+
working-directory: D:\b
91+
run: npx @microsoft/sarif-multitool merge *.sarif --recurse --output-directory=${{ github.workspace }}\output --output-file=MergeResult.sarif --merge-runs && dir ${{ github.workspace }}\output
92+
93+
- name: Upload SARIF to GitHub
94+
uses: github/codeql-action/upload-sarif@v3
95+
continue-on-error: true
96+
with:
97+
sarif_file: ${{ github.workspace }}\output\MergeResult.sarif
98+
category: VS_SCA_WIN32_WINML_X64
99+
100+
# No java, No python
101+
Onnxruntime-SCA-win32-WINML-x86:
102+
permissions:
103+
security-events: write
104+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-vs2022-mms"]
105+
steps:
106+
- uses: actions/checkout@v4
107+
with:
108+
submodules: false
109+
- uses: actions/setup-python@v5
110+
with:
111+
python-version: '3.11.x'
112+
architecture: 'x86'
113+
114+
- uses: actions/setup-node@v4
115+
with:
116+
node-version: 18
117+
118+
- name: Delete build folder
119+
run: |
120+
if (Test-Path D:\b) { Remove-Item -Recurse -Force D:\b }
121+
&tools\ci_build\github\windows\install_third_party_deps.ps1 -cpu_arch x86 -install_prefix D:\b\Debug\installed -build_config Debug
122+
123+
# The build machine doesn't have a GPU. So the value of CMAKE_CUDA_ARCHITECTURES doesn't matter.
124+
- name: Build code
125+
env:
126+
CAExcludePath: 'C:\Program Files;D:\b;${{ github.workspace }}\cmake'
127+
run: python tools\ci_build\build.py --compile_no_warning_as_error --config Debug --build_dir D:\b --skip_submodule_sync --build_csharp --update --build --parallel --cmake_generator "Visual Studio 17 2022" --build_shared_lib --cmake_extra_defines onnxruntime_USE_CUSTOM_STATIC_ANALYSIS_RULES=ON --cmake_extra_defines onnxruntime_ENABLE_STATIC_ANALYSIS=ON --cmake_extra_defines onnxruntime_REDIRECT_STATIC_ANALYSIS_OUTPUTS_TO_FILE=ON --ms_experimental --use_dml --use_winml --disable_rtti --enable_wcos --build_shared_lib
128+
129+
- name: Generate sarif
130+
working-directory: D:\b
131+
run: npx @microsoft/sarif-multitool merge *.sarif --recurse --output-directory=${{ github.workspace }}\output --output-file=MergeResult.sarif --merge-runs && dir ${{ github.workspace }}\output
132+
133+
- name: Upload SARIF to GitHub
134+
uses: github/codeql-action/upload-sarif@v3
135+
continue-on-error: true
136+
with:
137+
sarif_file: ${{ github.workspace }}\output\MergeResult.sarif
138+
category: VS_SCA_WIN32_WINML_X86

‎.github/workflows/windows.yml

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,38 +41,4 @@ jobs:
4141
4242
# The build machine doesn't have a GPU. So the value of CMAKE_CUDA_ARCHITECTURES doesn't matter.
4343
- name: Build code
44-
run: python tools\ci_build\build.py --windows_sdk_version 10.0.22621.0 --enable_training --build_java --config Debug --build_dir D:\b --skip_submodule_sync --build_csharp --update --build --parallel --cmake_generator "Visual Studio 17 2022" --build_shared_lib --enable_pybind --use_cuda --cuda_home=${{ github.workspace }}\cuda_sdk\v12.2 --enable_cuda_profiling --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=75
45-
46-
Onnxruntime-TVM:
47-
runs-on: windows-latest
48-
steps:
49-
- uses: actions/checkout@v4
50-
with:
51-
submodules: true
52-
- uses: conda-incubator/setup-miniconda@v3
53-
with:
54-
activate-environment: "ort_build"
55-
python-version: 3.8
56-
- name: 'Install LLVM-Dev'
57-
shell: pwsh
58-
run: |
59-
conda install llvmdev=12.0.0
60-
conda info
61-
conda list
62-
- name: 'Add LLVM-Dev binaries to the PATH'
63-
run: |
64-
echo "C:/Miniconda/Library/bin" >> $GITHUB_PATH
65-
- name: 'Setup TVM EP Python requirements'
66-
run: |
67-
python3 -m pip install -r ${{ github.workspace }}/tools/ci_build/github/linux/tvm/requirements.txt
68-
- name: 'rm gtest in conda'
69-
shell: pwsh
70-
run: |
71-
Remove-Item 'C:\Miniconda\Library\lib\cmake\gtest' -Recurse -Force
72-
Remove-Item 'C:\Miniconda\Library\lib\gmock.lib' -Force
73-
Remove-Item 'C:\Miniconda\Library\lib\gmock_main.lib' -Force
74-
Remove-Item 'C:\Miniconda\Library\lib\gtest.lib' -Force
75-
Remove-Item 'C:\Miniconda\Library\lib\gtest_main.lib' -Force
76-
- name: 'Build and Test'
77-
run: |
78-
python3 ${{ github.workspace }}/tools/ci_build/build.py --build_dir build --config Release --skip_submodule_sync --parallel --enable_pybind --disable_contrib_ops --disable_ml_ops --skip_onnx_tests --use_tvm
44+
run: python tools\ci_build\build.py --windows_sdk_version 10.0.22621.0 --enable_training --build_java --config Debug --build_dir D:\b --skip_submodule_sync --build_csharp --update --build --parallel --cmake_generator "Visual Studio 17 2022" --build_shared_lib --enable_pybind --use_cuda --cuda_home=${{ github.workspace }}\cuda_sdk\v12.2 --enable_cuda_profiling --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=75

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
[submodule "cmake/external/emsdk"]
88
path = cmake/external/emsdk
99
url = https://github.com/emscripten-core/emsdk.git
10-
branch = 3.1.51
10+
branch = 3.1.59

‎.lintrunner.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,13 @@ exclude_patterns = [
130130
'js/**',
131131
'onnxruntime/contrib_ops/cuda/bert/tensorrt_fused_multihead_attention/**', # Contains data chunks
132132
'onnxruntime/core/flatbuffers/schema/*.fbs.h', # Generated code
133+
'onnxruntime/test/flatbuffers/*.fbs.h', # Generated code
133134
'onnxruntime/core/graph/contrib_ops/quantization_defs.cc',
134135
'onnxruntime/core/mlas/**', # Contains assembly code
135-
'onnxruntime/core/mickey/cutlass_ext/**', # CUTLASS lib recommends NO automatic code formatting
136+
'onnxruntime/core/mickey/cutlass_ext/**', # CUTLASS based libs recommends NO automatic code formatting
137+
'onnxruntime/core/mickey/gemm/**', # CUTLASS based libs recommends NO automatic code formatting
136138
'winml/lib/Api.Image/shaders/**', # Contains data chunks
139+
'onnxruntime/contrib_ops/cuda/bert/flash_attention/flash_fwd_launch_template.h', # Bool Switches hang Clang
137140
]
138141
command = [
139142
'python',

0 commit comments

Comments
 (0)