Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into Cjian/cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
jchen351 committed Aug 30, 2024
2 parents 2733bb0 + 60b0762 commit 2944c6f
Show file tree
Hide file tree
Showing 5,119 changed files with 634,870 additions and 389,712 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ BasedOnStyle: Google
ColumnLimit: 0
SortIncludes: false
DerivePointerAlignment: false
# Avoid adding spaces between tokens in GSL_SUPPRESS arguments.
# E.g., don't change "GSL_SUPPRESS(r.11)" to "GSL_SUPPRESS(r .11)".
WhitespaceSensitiveMacros: ["GSL_SUPPRESS"]

# if you want to customize when working locally see https://clang.llvm.org/docs/ClangFormatStyleOptions.html for options.
# See ReformatSource.ps1 for a script to update all source according to the current options in this file.
Expand Down
2 changes: 1 addition & 1 deletion .gdn/.gdntsa
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"codebaseName": "onnxruntime_master"
"codebaseName": "onnxruntime_main"
}
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This sets the default behaviour, overriding core.autocrlf
# This sets the default behavior, overriding core.autocrlf
* text=auto

# All source files should have unix line-endings in the repository,
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/05-performance.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Performance
description: issues related to performance
title: "[Performance] "
labels: ["performance"]
body:
- type: markdown
attributes:
Expand Down
31 changes: 18 additions & 13 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
api:javascript: '/\bjavascript\b/i'
api:CSharp: '/(\bc\s*sharp\b|\bc#)/i'
api:java: '/\bjava\b/i'
api:javascript: '/\bjavascript\b/i'
ep:ACL: '/\bacl\b/i'
ep:ArmNN: '/\barmnn\b/i'
ep:CUDA: '/\bcuda\b/i'
ep:DML: '/(\bdirectml\b|\bdml\b)/i'
ep:MIGraphX: '/\bmigraphx\b/i'
ep:oneDNN: '/\bonednn\b/i'
ep:CANN: '/\bcann\b/i'
ep:CoreML: '/\bcore\s*ml\b/i'
ep:DML: '/(\bdirect\s*ml\b|\bdml\b)/i'
ep:MIGraphX: '/\bmi\s*graph\s*x\b/i'
ep:oneDNN: '/\bone\s*dnn\b/i'
ep:OpenVINO: '/\bopen\s*vino\b/i'
ep:RockchipNPU: '/\brockchip\b/i'
ep:QNN: '/\bqnn\b/i'
ep:RockchipNPU: '/\brockchip(?:npu)?\b/i'
ep:ROCm: '/\brocm\b/i'
ep:TensorRT: '/(\btensor\s*rt\b|\btrt\b)/i'
ep:SNPE: '/\bsnpe\b/i'
ep:tvm: '/\btvm\b/i'
ep:VitisAI: '/\bvitis(?:ai)?\b/i'
platform:jetson: '/\bjetson\b/i'
platform:mobile: '/(\bobj(?:ective)?-?c\b|\bnnapi\b|\bcore-?ml\b|\bmobile\b|\bandroid\b|\bios\b|\bxamarin\b|\bmaui\b)/i'
platform:web: '/(\bwebgl\b|\bweb-?gpu\b|\bwasm\b|\bonnxruntime-node\b|\bonnxruntime-web\b)/i'
platform:windows: '/(\bwindows\b|\bwinrt\b|\bwinml\b)/i'
model:transformer: '/(\bbert\b|\bgpt-?2\b|\bhugging-?face\b|\blong-?former\b|\bt5\b)/i'
quantization: '/(is this a quantized model\?\n\nYes|\bquantization\b)/i'
ep:WebGPU: '/\bwebgpu\b/i'
ep:WebNN: '/\bwebnn\b/i'
ep:Xnnpack: '/\bxnn\s*pack\b/i'
.NET: '/(\bdot\s*net\b|\bnuget\b|\.net\b)/i'
platform:jetson: '/(\bjetson\b|\bjetpack\b)/i'
platform:mobile: '/(\bobj(?:ective)?-?c\b|\bnnapi\b|\bmobile\b|\bandroid\b|\bios\b|\bxamarin\b|\bmaui\b)/i'
platform:web: '/(\bwebgl\b|\bweb-?gpu\b|\bwasm\b|\bonnxruntime-node\b|\bonnxruntime-web\b|\bonnxruntime-react-native\b|\bnpm\b|\btransformers\.js\b)/i'
model:transformer: '/\btransformers(?!\.js)\b/i'
22 changes: 0 additions & 22 deletions .github/stale.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/title-only-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ep:CUDA: '/\bcuda\b/i'
ep:TensorRT: '/(\btensor\s*rt\b|\btrt\b)/i'
platform:windows: '/(\bwindows\b|\bwinrt\b|\bwinml\b)/i'
quantization: '/(quant|\bqdq\b)/i'
2 changes: 1 addition & 1 deletion .github/workflows/cffconvert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out a copy of the repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Check whether the citation metadata from CITATION.cff is valid
uses: citation-file-format/[email protected]
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -47,11 +47,19 @@ jobs:
# 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
queries: security-extended,security-and-quality

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
36 changes: 0 additions & 36 deletions .github/workflows/generated_fake_win_gpu_ci.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v3
5 changes: 4 additions & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ on:
issues:
types: [opened, edited]

permissions:
issues: write

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: github/issue-labeler@v2.5
- uses: github/issue-labeler@v3.4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml
Expand Down
30 changes: 21 additions & 9 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ name: Lint
on:
push:
branches:
- master
- main
- rel-*
pull_request:

jobs:
optional-lint:
name: Optional Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: misspell # Check spellings as well
uses: reviewdog/action-misspell@v1
with:
Expand All @@ -34,9 +34,9 @@ jobs:
name: Python format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Version range or exact version of Python to use, using SemVer's version range syntax. Reads from .python-version if unset.
python-version: "3.10"
Expand Down Expand Up @@ -65,15 +65,15 @@ jobs:
- name: Upload SARIF file
if: always()
continue-on-error: true
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
# Path to SARIF file relative to the root of the repository
sarif_file: lintrunner.sarif
category: lintrunner
checkout_path: ${{ github.workspace }}

lint-cpp:
name: Lint C++
name: Optional Lint C++
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand All @@ -89,18 +89,30 @@ jobs:
- name: Generate ONNX protobuf files
run: cmake --build build/Debug --config Debug --target onnx_proto
- uses: reviewdog/action-cpplint@master
continue-on-error: true
with:
github_token: ${{ secrets.github_token }}
reporter: github-pr-check
level: warning
flags: --linelength=120 --exclude=java/src/main/native/*.c
level: info
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/*
filter: "-runtime/references"

lint-js:
name: Lint JavaScript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: reviewdog/action-eslint@v1
with:
reporter: github-pr-check
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/linux.yml

This file was deleted.

Loading

0 comments on commit 2944c6f

Please sign in to comment.