Skip to content

Commit 3c64809

Browse files
committed
Merge branch 'master' into anuragd/optimize_model_hub
Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
2 parents 4c2340d + 160fe4f commit 3c64809

File tree

236 files changed

+92528
-79466
lines changed

Some content is hidden

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

236 files changed

+92528
-79466
lines changed

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ examples/int8/qat/qat
6060
examples/int8/training/vgg16/data/*
6161
examples/int8/datasets/data/*
6262
env/**/*
63-
*.ts
63+
*.ts
64+
.nox/**/*

.github/workflows/docgen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
build-docs:
1313
runs-on: ubuntu-18.04
1414
container:
15-
image: ghcr.io/nvidia/torch-tensorrt/docgen:latest
15+
image: docker.pkg.github.com/pytorch/tensorrt/docgen:latest
1616
credentials:
1717
username: ${{ github.actor }}
1818
password: ${{ secrets.GITHUB_TOKEN }}
@@ -30,7 +30,7 @@ jobs:
3030
run: echo "::set-output name=sha::$(git rev-parse --short HEAD)"
3131
- name: Build Python Package
3232
run: |
33-
cp docker/WORKSPACE.docs WORKSPACE
33+
cp docker/WORKSPACE.docker WORKSPACE
3434
cd py
3535
python3 setup.py install
3636
- name: Generate New Docs

.github/workflows/linter.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ jobs:
2828
- name: Docker login
2929
uses: docker/login-action@v1
3030
with:
31-
registry: ghcr.io
31+
registry: docker.pkg.github.com
3232
username: ${{ github.actor }}
3333
password: ${{ secrets.GITHUB_TOKEN }}
3434
- name: Run image
3535
run: |
36-
docker run -it -d --name cpplinter -e GITHUB_TOKEN=$GITHUB_TOKEN -v $GITHUB_WORKSPACE:/workspace -v $GITHUB_EVENT_PATH:/GITHUB_EVENT.json -w /workspace ghcr.io/nvidia/torch-tensorrt/docgen:latest
37-
docker exec cpplinter bash -c "cp /workspace/docker/WORKSPACE.docs /workspace/WORKSPACE"
36+
docker pull docker.pkg.github.com/pytorch/tensorrt/docgen:latest
37+
docker run -it -d --name cpplinter -e GITHUB_TOKEN=$GITHUB_TOKEN -v $GITHUB_WORKSPACE:/workspace -v $GITHUB_EVENT_PATH:/GITHUB_EVENT.json -w /workspace docker.pkg.github.com/pytorch/tensorrt/docgen:latest
38+
docker exec cpplinter bash -c "cp /workspace/docker/WORKSPACE.docker /workspace/WORKSPACE"
3839
env:
3940
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4041
- name: Install dependencies
@@ -65,13 +66,14 @@ jobs:
6566
- name: Docker login
6667
uses: docker/login-action@v1
6768
with:
68-
registry: ghcr.io
69+
registry: docker.pkg.github.com
6970
username: ${{ github.actor }}
7071
password: ${{ secrets.GITHUB_TOKEN }}
7172
- name: Run image
7273
run: |
73-
docker run -it -d --name pylinter -e GITHUB_TOKEN=$GITHUB_TOKEN -v $GITHUB_WORKSPACE:/workspace -v $GITHUB_EVENT_PATH:/GITHUB_EVENT.json -w /workspace ghcr.io/nvidia/torch-tensorrt/docgen:latest
74-
docker exec pylinter bash -c "cp /workspace/docker/WORKSPACE.docs /workspace/WORKSPACE"
74+
docker pull docker.pkg.github.com/pytorch/tensorrt/docgen:latest
75+
docker run -it -d --name pylinter -e GITHUB_TOKEN=$GITHUB_TOKEN -v $GITHUB_WORKSPACE:/workspace -v $GITHUB_EVENT_PATH:/GITHUB_EVENT.json -w /workspace docker.pkg.github.com/pytorch/tensorrt/docgen:latest
76+
docker exec pylinter bash -c "cp /workspace/docker/WORKSPACE.docker /workspace/WORKSPACE"
7577
env:
7678
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
7779
- name: Install dependencies

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,7 @@ examples/int8/training/vgg16/data/*
5858
examples/int8/datasets/data/*
5959
env/**/*
6060
model_manifest.json
61+
bazel-Torch-TensorRT-Preview
62+
docsrc/src/
63+
bazel-TensorRT
64+
bazel-tensorrt

CHANGELOG.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -792,8 +792,8 @@ Signed-off-by: Naren Dasan <[email protected]>
792792
Signed-off-by: Naren Dasan <[email protected]>
793793

794794

795-
# 1.1.0 (2022-05-09)
796795

796+
# 1.1.0 (2022-05-10)
797797

798798
### Bug Fixes
799799

@@ -855,13 +855,11 @@ Signed-off-by: Naren Dasan <[email protected]>
855855

856856
* **//core/conversion:** Better tooling for debugging ([c5c5c47](https://github.com/NVIDIA/TRTorch/commit/c5c5c47))
857857
* **//core/conversion/evaluators:** aten::pow support ([c4fdfcb](https://github.com/NVIDIA/TRTorch/commit/c4fdfcb))
858+
* **//docker:** New base container to let master build in container ([446bf18](https://github.com/NVIDIA/TRTorch/commit/446bf18))
858859
* **//py:** Context managers to quickly switch logging level ([12e470f](https://github.com/NVIDIA/TRTorch/commit/12e470f))
859-
* **//tests:** Adding BERT to the test suite ([7996a10](https://github.com/NVIDIA/TRTorch/commit/7996a10))
860-
* **aten::__range_length:** Adding range length evaluator ([11c4608](https://github.com/NVIDIA/TRTorch/commit/11c4608))
861-
* **aten::add:** adding string concat evaluator ([65dbf90](https://github.com/NVIDIA/TRTorch/commit/65dbf90))
862860
* Add converter files for reflection pad 1d and 2d ([406d860](https://github.com/NVIDIA/TRTorch/commit/406d860))
863-
* Add converter files for torch::max ([569bcde](https://github.com/NVIDIA/TRTorch/commit/569bcde))
864861
* Add converter files for torch::max ([f628aca](https://github.com/NVIDIA/TRTorch/commit/f628aca))
862+
* Add converter files for torch::max ([569bcde](https://github.com/NVIDIA/TRTorch/commit/569bcde))
865863
* Add converter files for torch::max ([dd7a44e](https://github.com/NVIDIA/TRTorch/commit/dd7a44e))
866864
* Add converter for reflection pad 1d and 2d operation ([2484a43](https://github.com/NVIDIA/TRTorch/commit/2484a43))
867865
* Added comprehensive perf benchmark script ([a8016ff](https://github.com/NVIDIA/TRTorch/commit/a8016ff))
@@ -880,11 +878,14 @@ Signed-off-by: Naren Dasan <[email protected]>
880878
* support aten::div.Tensor_mode ([bb3046a](https://github.com/NVIDIA/TRTorch/commit/bb3046a))
881879
* support aten::extend evaluator ([33c523d](https://github.com/NVIDIA/TRTorch/commit/33c523d))
882880
* support aten::format evaluator ([3a33d33](https://github.com/NVIDIA/TRTorch/commit/3a33d33))
881+
* Update Pytorch version to 1.11 ([c009a1f](https://github.com/NVIDIA/TRTorch/commit/c009a1f))
882+
* Upgrade TensorRT to 8.2.4.2 ([f1f151b](https://github.com/NVIDIA/TRTorch/commit/f1f151b))
883+
* **//tests:** Adding BERT to the test suite ([7996a10](https://github.com/NVIDIA/TRTorch/commit/7996a10))
884+
* **aten::__range_length:** Adding range length evaluator ([11c4608](https://github.com/NVIDIA/TRTorch/commit/11c4608))
885+
* **aten::add:** adding string concat evaluator ([65dbf90](https://github.com/NVIDIA/TRTorch/commit/65dbf90))
883886
* **aten::Int:** Adding a new pass to remove single use ([46ac757](https://github.com/NVIDIA/TRTorch/commit/46ac757))
884887
* **aten::Int:** Lowers out aten::Int ([908340f](https://github.com/NVIDIA/TRTorch/commit/908340f))
885888
* **core//conversion:** Implement converter for torch unbind ([268a49b](https://github.com/NVIDIA/TRTorch/commit/268a49b))
886-
* Update Pytorch version to 1.11 ([c009a1f](https://github.com/NVIDIA/TRTorch/commit/c009a1f))
887-
* Upgrade TensorRT to 8.2.4.2 ([f1f151b](https://github.com/NVIDIA/TRTorch/commit/f1f151b))
888889

889890

890891
### BREAKING CHANGES

CODE_OF_CONDUCT.md

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to make participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies within all project spaces, and it also applies when
49+
an individual is representing the project or its community in public spaces.
50+
Examples of representing a project or community include using an official
51+
project e-mail address, posting via an official social media account, or acting
52+
as an appointed representative at an online or offline event. Representation of
53+
a project may be further defined and clarified by project maintainers.
54+
55+
This Code of Conduct also applies outside the project spaces when there is a
56+
reasonable belief that an individual's behavior may have a negative impact on
57+
the project or its community.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported by contacting the project team at <[email protected]>. All
63+
complaints will be reviewed and investigated and will result in a response that
64+
is deemed necessary and appropriate to the circumstances. The project team is
65+
obligated to maintain confidentiality with regard to the reporter of an incident.
66+
Further details of specific enforcement policies may be posted separately.
67+
68+
Project maintainers who do not follow or enforce the Code of Conduct in good
69+
faith may face temporary or permanent repercussions as determined by other
70+
members of the project's leadership.
71+
72+
## Attribution
73+
74+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
75+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
76+
77+
[homepage]: https://www.contributor-covenant.org
78+
79+
For answers to common questions about this code of conduct, see
80+
https://www.contributor-covenant.org/faq

CONTRIBUTING.md

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,43 +49,7 @@ We use the PyTorch Slack for communication about core development, integration w
4949

5050
- Typically we try to follow the guidelines set by https://www.conventionalcommits.org/en/v1.0.0/ for commit messages for clarity. Again not strictly enforced.
5151

52-
- #### Sign Your Work
53-
We require that all contributors "sign-off" on their commits. This certifies that the contribution is your original work, or you have rights to submit it under the same license, or a compatible license.
54-
55-
Any contribution which contains commits that are not Signed-Off will not be accepted.
56-
57-
To sign off on a commit you simply use the `--signoff` (or `-s`) option when committing your changes:
58-
59-
$ git commit -s -m "Add cool feature."
60-
61-
This will append the following to your commit message:
62-
63-
Signed-off-by: Your Name <[email protected]>
64-
65-
By doing this you certify the below:
66-
67-
Developer Certificate of Origin
68-
Version 1.1
69-
70-
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
71-
1 Letterman Drive
72-
Suite D4700
73-
San Francisco, CA, 94129
74-
75-
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
76-
77-
78-
Developer's Certificate of Origin 1.1
79-
80-
By making a contribution to this project, I certify that:
81-
82-
(a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
83-
84-
(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
85-
86-
(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
87-
88-
(d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
52+
- We require that all contributors sign CLA for submitting PRs. In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.
8953

9054

9155
Thanks in advance for your patience as we review your contributions; we do appreciate them!

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedd
9696
| Platform | Support |
9797
| ------------------- | ------------------------------------------------ |
9898
| Linux AMD64 / GPU | **Supported** |
99-
| Linux aarch64 / GPU | **Native Compilation Supported on JetPack-4.4+** |
100-
| Linux aarch64 / DLA | **Native Compilation Supported on JetPack-4.4+** |
99+
| Linux aarch64 / GPU | **Native Compilation Supported on JetPack-4.4+ (use v1.0.0 for the time being)** |
100+
| Linux aarch64 / DLA | **Native Compilation Supported on JetPack-4.4+ (use v1.0.0 for the time being)** |
101101
| Windows / GPU | **Unofficial Support** |
102102
| Linux ppc64le / GPU | - |
103103
| NGC Containers | **Included in PyTorch NGC Containers 21.11+** |
@@ -110,11 +110,11 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedd
110110

111111
These are the following dependencies used to verify the testcases. Torch-TensorRT can work with other versions, but the tests are not guaranteed to pass.
112112

113-
- Bazel 4.2.1
113+
- Bazel 5.1.1
114114
- Libtorch 1.11.0 (built with CUDA 11.3)
115-
- CUDA 11.3 (10.2 on Jetson)
115+
- CUDA 11.3
116116
- cuDNN 8.2.1
117-
- TensorRT 8.2.4.2 (TensorRT 8.2.1 on Jetson)
117+
- TensorRT 8.2.4.2
118118

119119
## Prebuilt Binaries and Wheel files
120120

core/lowering/passes/linear_to_addmm.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void replaceLinearWithBiasNonePattern(std::shared_ptr<torch::jit::Graph> graph)
3535
} else {
3636
torch::jit::WithInsertPoint guard(*it);
3737
std::shared_ptr<torch::jit::Graph> d_graph = toGraphFunction(decompose_funcs.get_function("linear")).graph();
38-
;
3938
torch::jit::Value* new_output = insertGraph(*it->owningGraph(), *d_graph, it->inputs()).at(0);
4039
new_output->setType(it->output()->type());
4140
it->output()->replaceAllUsesWith(new_output);

cpp/include/torch_tensorrt/macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define STR(x) XSTR(x)
2121

2222
#define TORCH_TENSORRT_MAJOR_VERSION 1
23-
#define TORCH_TENSORRT_MINOR_VERSION 1
23+
#define TORCH_TENSORRT_MINOR_VERSION 2
2424
#define TORCH_TENSORRT_PATCH_VERSION 0
2525
#define TORCH_TENSORRT_VERSION \
2626
STR(TORCH_TENSORRT_MAJOR_VERSION) \

0 commit comments

Comments
 (0)