Skip to content

Commit 913c6ed

Browse files
committed
Merge branch 'main' into tlwu/sd3_optimum
2 parents 4bf9f25 + 704523c commit 913c6ed

File tree

1,003 files changed

+16982
-20715
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,003 files changed

+16982
-20715
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Setup Python
4646
uses: actions/setup-python@v5
4747
with:
48-
# Version range or exact version of Python to use, using SemVer's version range syntax. Reads from .python-version if unset.
48+
# Use the version configured in target-version of [tool.black] section in pyproject.toml.
4949
python-version: "3.10"
5050
- name: Setup Rust
5151
uses: actions-rs/toolchain@v1
@@ -55,12 +55,10 @@ jobs:
5555
- name: Update PATH
5656
run: |
5757
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
58-
5958
- name: Install dependencies
6059
run: |
6160
set -e -x
6261
python -m pip install --user -r requirements-dev.txt
63-
python -m pip install --user lintrunner lintrunner-adapters
6462
lintrunner init
6563
- name: Run lintrunner on all files
6664
run: |

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,17 @@ permissions:
2020

2121
jobs:
2222
build:
23-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
23+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-vs2022-mms"]
2424
env:
2525
DOCFXVERSION: 2.62.2
2626
steps:
2727
- uses: actions/checkout@v4
28-
- name: Setup .NET
29-
uses: actions/setup-dotnet@v4
30-
with:
31-
dotnet-version: 8.0.x
3228
- name: Install DocFX
3329
run: |
3430
dotnet tool update -g docfx
31+
- name: Update PATH
32+
run: |
33+
Add-Content -Value "$env:USERPROFILE\.dotnet\tools" -Encoding utf8 -Path $env:GITHUB_PATH
3534
# NOTE: We need to restore Microsoft.ML.OnnxRuntime.csproj manually to set IncludeMobileTargets=false
3635
# docfx doesn't seem to be able to do that properly resulting in build errors
3736
- name: Restore dependencies
@@ -50,10 +49,12 @@ jobs:
5049
- name: Log source commit
5150
run: git rev-parse --short HEAD > csharp/ApiDocs/csharp/source-version.txt
5251
- name: Move C# docs into site
52+
shell: pwsh
5353
run: |
54-
mkdir -p _site/docs/api
55-
rm -rf _site/docs/api/csharp
56-
mv csharp/ApiDocs/csharp _site/docs/api/csharp
54+
New-Item -Path _site/docs/api -Force -ItemType "Directory" | Out-Null
55+
$OutputDirectory="_site/docs/api/csharp"
56+
if (Test-Path $OutputDirectory) { Remove-Item -Recurse -Force $OutputDirectory }
57+
Move-Item -Path csharp\ApiDocs\csharp -Destination $OutputDirectory
5758
- name: Upload docs artifact
5859
uses: actions/upload-artifact@v4
5960
with:

.lintrunner.toml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,23 @@
22
# You can install the dependencies and initialize with
33
#
44
# ```sh
5-
# pip install lintrunner lintrunner-adapters
5+
# pip install -r requirements-lintrunner.txt
66
# lintrunner init
77
# ```
88
#
99
# This will install lintrunner on your system and download all the necessary
1010
# dependencies to run linters locally.
11-
# If you want to see what lintrunner init will install, run
12-
# `lintrunner init --dry-run`.
1311
#
14-
# To lint local changes:
12+
# To format local changes:
1513
#
1614
# ```bash
17-
# lintrunner
15+
# lintrunner -a
1816
# ```
1917
#
20-
# To lint all files:
18+
# To format all files:
2119
#
2220
# ```bash
23-
# lintrunner --all-files
24-
# ```
25-
#
26-
# To format files:
27-
#
28-
# ```bash
29-
# lintrunner f --all-files
21+
# lintrunner -a --all-files
3022
# ```
3123
#
3224
# To read more about lintrunner, see [wiki](https://github.com/pytorch/pytorch/wiki/lintrunner).

CODEOWNERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
/onnxruntime/core/graph/contrib_ops/quantization_defs.* @microsoft/onnxruntime-mlas
1010
/onnxruntime/core/mlas/** @microsoft/onnxruntime-mlas
1111

12-
# build pipelines and workflows
13-
/tools/ci_build/github/azure-pipelines @microsoft/onnxruntime-es
14-
/.github/workflows @microsoft/onnxruntime-es
15-
1612
# Dependencies
1713
requirements-dev.txt @microsoft/onnxruntime-admin
1814
requirements-doc.txt @microsoft/onnxruntime-admin

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
|System|Inference|Training|
2626
|---|---|---|
27-
|Windows|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Windows%20CPU%20CI%20Pipeline?label=Windows+CPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=9)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Windows%20GPU%20CI%20Pipeline?label=Windows+GPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=10)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Windows%20GPU%20TensorRT%20CI%20Pipeline?label=Windows+GPU+TensorRT)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=47)||
28-
|Linux|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20CPU%20CI%20Pipeline?label=Linux+CPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=11)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20CPU%20Minimal%20Build%20E2E%20CI%20Pipeline?label=Linux+CPU+Minimal+Build)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=64)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20GPU%20CI%20Pipeline?label=Linux+GPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=12)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20GPU%20TensorRT%20CI%20Pipeline?label=Linux+GPU+TensorRT)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=45)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20OpenVINO%20CI%20Pipeline?label=Linux+OpenVINO)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=55)|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/orttraining-linux-ci-pipeline?label=Linux+CPU+Training)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=86)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/orttraining-linux-gpu-ci-pipeline?label=Linux+GPU+Training)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=84)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/orttraining/orttraining-ortmodule-distributed?label=Training+Distributed)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=148)|
27+
|Windows|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Windows%20CPU%20CI%20Pipeline?label=Windows+CPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=9)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Windows%20GPU%20CUDA%20CI%20Pipeline?label=Windows+GPU+CUDA)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=218)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Windows%20GPU%20TensorRT%20CI%20Pipeline?label=Windows+GPU+TensorRT)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=47)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Windows%20GPU%20WebGPU%20CI%20Pipeline?label=Windows+GPU+WebGPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=228)||
28+
|Linux|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20CPU%20CI%20Pipeline?label=Linux+CPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=11)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20CPU%20Minimal%20Build%20E2E%20CI%20Pipeline?label=Linux+CPU+Minimal+Build)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=64)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20GPU%20CI%20Pipeline?label=Linux+GPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=12)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20GPU%20TensorRT%20CI%20Pipeline?label=Linux+GPU+TensorRT)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=45)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Linux%20OpenVINO%20CI%20Pipeline?label=Linux+OpenVINO)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=55)|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/orttraining-linux-ci-pipeline?label=Linux+CPU+Training)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=86)<br>[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/orttraining-linux-gpu-ci-pipeline?label=Linux+GPU+Training)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=84)|
2929
|Mac|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/MacOS%20CI%20Pipeline?label=MacOS+CPU)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=13)||
3030
|Android|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/Android%20CI%20Pipeline?label=Android)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=53)||
3131
|iOS|[![Build Status](https://dev.azure.com/onnxruntime/onnxruntime/_apis/build/status/iOS%20CI%20Pipeline?label=iOS)](https://dev.azure.com/onnxruntime/onnxruntime/_build/latest?definitionId=134)||

0 commit comments

Comments
 (0)