Skip to content

Commit

Permalink
Merge branch 'microsoft:master' into cudnn_mod
Browse files Browse the repository at this point in the history
  • Loading branch information
WolframRhodium authored Mar 29, 2022
2 parents 745cc6c + 3b6cee8 commit 91924d9
Show file tree
Hide file tree
Showing 1,918 changed files with 94,079 additions and 64,491 deletions.
8 changes: 8 additions & 0 deletions .config/tsaoptions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"notificationAliases": ["[email protected]"],
"areaPath": "Vienna\\ONNX Runtime\\Shared Core",
"codebaseName": "onnxruntime_master",
"instanceUrl": "https://msdata.visualstudio.com/",
"projectName": "Vienna",
"ignoreBranchName": true
}
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


48 changes: 48 additions & 0 deletions .github/workflows/publish-python-apidocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
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)"
- uses: actions/checkout@v2
with:
ref: gh-pages
clean: false
- name: Move API docs into target area
run: |
ls docs/api
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


5 changes: 1 addition & 4 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 Expand Up @@ -48,10 +49,6 @@ java/gradle
java/.gradle
java/hs_*.log
onnxruntime/python/version_info.py
/tools/perf_util/target/classes/com/msft/send_perf_metrics
/tools/perf_util/send_perf_metrics.iml
/tools/perf_util/target/classes
/tools/perf_util/src/main/resources
/orttraining/orttraining/eager/ort_aten.g.cpp
/orttraining/orttraining/eager/ort_customops.g.cpp
/csharp/**/packages
Expand Down
17 changes: 5 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,13 @@
url = https://github.com/google/benchmark.git
[submodule "cmake/external/onnx"]
path = cmake/external/onnx
url = https://github.com/onnx/onnx
[submodule "cmake/external/tvm"]
path = cmake/external/tvm
url = https://github.com/microsoft/onnxruntime-tvm.git
url = https://github.com/onnx/onnx.git
[submodule "cmake/external/date"]
path = cmake/external/date
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 +36,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 All @@ -59,23 +56,19 @@
[submodule "cmake/external/mp11"]
path = cmake/external/mp11
url = https://github.com/boostorg/mp11.git
[submodule "cmake/external/coremltools"]
path = cmake/external/coremltools
url = https://github.com/apple/coremltools.git
[submodule "cmake/external/dlpack"]
path = cmake/external/dlpack
url = https://github.com/dmlc/dlpack.git
[submodule "cmake/external/emsdk"]
path = cmake/external/emsdk
url = https://github.com/emscripten-core/emsdk.git
branch = 2.0.26
branch = 3.1.3
[submodule "cmake/external/onnxruntime-extensions"]
path = cmake/external/onnxruntime-extensions
url = https://github.com/microsoft/onnxruntime-extensions.git
[submodule "cmake/external/pytorch_cpuinfo"]
path = cmake/external/pytorch_cpuinfo
url = https://github.com/pytorch/cpuinfo.git

[submodule "cmake/external/onnx-tensorrt"]
path = cmake/external/onnx-tensorrt
url = https://github.com/onnx/onnx-tensorrt.git
Loading

0 comments on commit 91924d9

Please sign in to comment.