Skip to content

Commit

Permalink
Merged PR 6835169: RI 12/9/21 - 01/12/22
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Lai authored and Ryan Lai committed Jan 13, 2022
1 parent 94dc844 commit c07e251
Show file tree
Hide file tree
Showing 809 changed files with 33,581 additions and 17,886 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/publish-c-apidocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Update C/C++ API Docs
on:
workflow_dispatch

jobs:
publish:
name: Generate C/C++ API docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install doxygen and dependencies
run: |
sudo apt update
sudo apt-get install libclang-9-dev
sudo apt-get install libclang-cpp9
wget https://www.doxygen.nl/files/doxygen-1.9.2.linux.bin.tar.gz
tar xvzf doxygen-1.9.2.linux.bin.tar.gz
- name: Set commit ID
id: vars
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Run doxygen
run: |
mkdir -p build/doxygen
cd docs/c_cxx
../../doxygen-1.9.2/bin/doxygen
- uses: actions/checkout@v2
with:
ref: gh-pages
clean: false
- name: Move API docs into target area
run: |
rm -rf docs/api/c
mv build/doxygen/html docs/api/c
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: gh-pages-pr
base: gh-pages
title: '[Automated]: Update C/C++ API docs'
commit-message: 'Update C/C++ API docs to commit ${{ steps.vars.outputs.sha_short }}'
add-paths: docs/api/c


49 changes: 49 additions & 0 deletions .github/workflows/publish-python-apidocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Update Python API Docs
on:
workflow_dispatch

jobs:
publish:
name: Generate Python API docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install tools
run: |
sudo apt update
sudo apt-get install pip
sudo apt-get install graphviz
- name: Install dependencies
run: |
cd docs/python
pip install -r requirements.txt
pip install flatbuffers protobuf==3.19.1
pip install -i https://test.pypi.org/simple/ ort-nightly
pip list
- name: Generate Python docs with Sphinx
run: |
cd tools/doc
./builddoc.sh /usr/bin ../.. ../../build
- name: Set vars
id: vars
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Check outputs
run: echo ${{ steps.vars.outputs.sha_short }}
- uses: actions/checkout@v2
with:
ref: gh-pages
clean: false
- name: Move API docs into target area
run: |
rm -rf docs/api/python
mv build/docs/inference/html docs/api/python
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: gh-pages-pr-python-docs
base: gh-pages
title: '[Automated]: Update Python API docs'
commit-message: 'Update Python API docs to commit ${{ steps.vars.outputs.sha_short }}'
add-paths: docs/api/python


1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ gen
*~
.vs
.DS_Store
*.DS_Store
TestResults/
.idea/
onnxruntime.egg-info
Expand Down
11 changes: 7 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
url = https://github.com/google/benchmark.git
[submodule "cmake/external/onnx"]
path = cmake/external/onnx
url = https://github.com/onnx/onnx
url = https://github.com/onnx/onnx.git
[submodule "cmake/external/tvm"]
path = cmake/external/tvm
url = https://github.com/microsoft/onnxruntime-tvm.git
Expand All @@ -18,7 +18,7 @@
url = https://github.com/HowardHinnant/date.git
[submodule "cmake/external/nsync"]
path = cmake/external/nsync
url = https://github.com/google/nsync
url = https://github.com/google/nsync.git
[submodule "cmake/external/re2"]
path = cmake/external/re2
url = https://github.com/google/re2.git
Expand All @@ -39,10 +39,10 @@
url = https://github.com/NVlabs/cub.git
[submodule "cmake/external/wil"]
path = cmake/external/wil
url = https://github.com/microsoft/wil
url = https://github.com/microsoft/wil.git
[submodule "cmake/external/json"]
path = cmake/external/json
url = https://github.com/nlohmann/json
url = https://github.com/nlohmann/json.git
[submodule "server/external/spdlog"]
path = server/external/spdlog
url = https://github.com/gabime/spdlog.git
Expand Down Expand Up @@ -79,3 +79,6 @@
[submodule "cmake/external/onnx-tensorrt"]
path = cmake/external/onnx-tensorrt
url = https://github.com/onnx/onnx-tensorrt.git
[submodule "cmake/external/tvm_update"]
path = cmake/external/tvm_update
url = https://github.com/apache/tvm
15 changes: 15 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
cff-version: 1.2.0
title: ONNX Runtime
message: "Please use this information to cite ONNX Runtime in
research or other publications."
authors:
- affiliation: Microsoft Corporation
given-names: ONNX Runtime developers
title: "ONNX Runtime"
date-released: 2018-11-29
url: "https://onnxruntime.ai"
repository-code: "https://github.com/microsoft/onnxruntime"
license: "MIT License"
keywords:
- deep learning
- machine learning
36 changes: 36 additions & 0 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4741,3 +4741,39 @@ has been taken from other projects or from the open internet. Every line of
code can be traced back to its original author, and all of those authors have
public domain dedications on file. So the SQLite code base is clean and is
uncontaminated with licensed code from other projects.

_____

google/XNNPACK

BSD License

For XNNPACK software

Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
Copyright 2019 Google LLC

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name Facebook nor the names of its contributors may be used to
endorse or promote products derived from this software without specific
prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion VERSION_NUMBER
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.0
1.11.0
10 changes: 10 additions & 0 deletions cgmanifests/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,16 @@
"DownloadUrl": "http://security.ubuntu.com/ubuntu/pool/main/s/sqlite3/libsqlite3-dev_3.22.0-1ubuntu0.4_amd64.deb"
}
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "512d44b9aa22690fd7d7e665fcab9bdcb590f118",
"repositoryUrl": "https://github.com/google/XNNPACK.git"
},
"comments": "xnnpack"
}
}
],
"Version": 1
Expand Down
Loading

0 comments on commit c07e251

Please sign in to comment.