Skip to content

Commit 0e42d97

Browse files
committed
chore: resolve conflicts
Signed-off-by: Dheeraj Peri <[email protected]>
2 parents 04ded55 + 09bef46 commit 0e42d97

File tree

777 files changed

+194885
-12247
lines changed

Some content is hidden

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

777 files changed

+194885
-12247
lines changed

.circleci/config.yml

Lines changed: 332 additions & 451 deletions
Large diffs are not rendered by default.

.github/actions/assigner/dist/index.js

Lines changed: 743 additions & 5 deletions
Large diffs are not rendered by default.

.github/actions/assigner/src/main.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,16 @@ async function main() {
9999
assignees = assignees.filter((i) => i !== issue.user?.login);
100100

101101
if (assignees.length > 0) {
102+
const currDate = new Date();
103+
const currDay = currDate.getDate();
104+
let assigned = [assignees[currDay % assignees.length]];
105+
console.log(assigned);
102106
if (!issue.pull_request) {
103-
core.debug(`Assigning ${assignees} to issue #${issueNum}`);
104-
await addAssignees(ghClient, issueNum, assignees);
107+
core.debug(`Assigning ${assigned} to issue #${issueNum}`);
108+
await addAssignees(ghClient, issueNum, assigned);
105109
} else {
106-
core.debug(`Requesting ${assignees} to review PR #${issueNum}`);
107-
await addReviewers(ghClient, issueNum, assignees);
110+
core.debug(`Requesting ${assigned} to review PR #${issueNum}`);
111+
await addReviewers(ghClient, issueNum, assigned);
108112
}
109113
} else {
110114
core.debug("No addtional assignees to add");

.github/code-owners.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
"component: build system":
1111
- "narendasan"
12-
- "andi4191"
1312

1413
"component: conversion":
1514
- "narendasan"
@@ -29,7 +28,6 @@
2928
- "peri044"
3029

3130
"component: execution":
32-
- "andi4191"
3331
- "narendasan"
3432

3533
"component: lowering":
@@ -42,21 +40,17 @@
4240

4341
"component: plugins":
4442
- "peri044"
45-
- "andi4191"
4643

4744
"component: quantization":
4845
- "peri044"
4946

5047
"component: runtime":
51-
- "andi4191"
5248
- "narendasan"
5349

5450
"component: tests":
55-
- "andi4191"
5651
- "narendasan"
5752

5853
"component: torchtrtc":
59-
- "andi4191"
6054
- "narendasan"
6155

6256
"component: dependencies":
@@ -74,24 +68,20 @@
7468
- "tanayvarshney"
7569

7670
"infrastructre":
77-
- "andi4191"
7871
- "narendasan"
7972

8073
"component: packaging":
8174
- "narendasan"
82-
- "andi4191"
8375
- "peri044"
8476

8577
"channel: NGC":
86-
- "andi4191"
8778
- "peri044"
8879

8980
"channel: linux-x86":
9081
- "narendasan"
9182
- "peri044"
9283

9384
"channel: linux-sbsa":
94-
- "andi4191"
9585
- "bowang007"
9686

9787
"channel: windows":
@@ -102,16 +92,13 @@
10292
- "bowang007"
10393

10494
"component: tooling":
105-
- "andi4191"
10695
- "narendasan"
10796

10897
"performance":
109-
- "andi4191"
11098
- "peri044"
11199
- "bowang007"
112100

113101
"channel: docker":
114-
- "andi4191"
115102
- "narendasan"
116103

117104
"ux":

.github/workflows/docgen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Generate Docs
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [ master ]
9+
branches: [ main ]
1010

1111
jobs:
1212
build-docs:

.github/workflows/linter.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- uses: actions/checkout@v2
2626
with:
2727
ref: ${{ github.event.pull_request.head.sha }}
28-
- name: Set up Python 3.9.4
29-
uses: actions/setup-python@v2
28+
- name: Set up Python 3.9
29+
uses: actions/setup-python@v3
3030
with:
31-
python-version: 3.9.4
31+
python-version: '3.9'
3232
- name: Setup env
3333
run: |
3434
sudo ln -s $GITHUB_EVENT_PATH /GITHUB_EVENT.json
@@ -65,16 +65,10 @@ jobs:
6565
- uses: actions/checkout@v2
6666
with:
6767
ref: ${{ github.event.pull_request.head.sha }}
68-
- name: Set up Python 3.9.4
69-
uses: actions/setup-python@v2
68+
- name: Set up Python 3.9
69+
uses: actions/setup-python@v3
7070
with:
71-
python-version: 3.9.4
72-
- name: Docker login
73-
uses: docker/login-action@v1
74-
with:
75-
registry: docker.pkg.github.com
76-
username: ${{ github.actor }}
77-
password: ${{ secrets.GITHUB_TOKEN }}
71+
python-version: '3.9'
7872
- name: Setup env
7973
run: |
8074
sudo ln -s $GITHUB_EVENT_PATH /GITHUB_EVENT.json

.pre-commit-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ repos:
66
- id: check-yaml
77
- id: trailing-whitespace
88
- id: check-added-large-files
9+
args:
10+
- --maxkb=1000
911
- id: check-vcs-permalinks
1012
- id: check-merge-conflict
1113
- id: mixed-line-ending

BUILD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ pkg_tar(
2222
"//core/lowering:include",
2323
"//core/lowering/passes:include",
2424
"//core/partitioning:include",
25+
"//core/partitioning/partitioningctx:include",
26+
"//core/partitioning/partitioninginfo:include",
27+
"//core/partitioning/segmentedblock:include",
2528
"//core/plugins:impl_include",
2629
"//core/plugins:include",
2730
"//core/runtime:include",

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
cmake_minimum_required(VERSION 3.17)
33
project(Torch-TensorRT LANGUAGES CXX)
44

5-
# use c++17
6-
set(CMAKE_CXX_STANDARD 17)
5+
# use c++14 like PyTorch
6+
set(CMAKE_CXX_STANDARD 14)
77

88
# Build the libraries with -fPIC
99
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Torch-TensorRT
22

33
[![Documentation](https://img.shields.io/badge/docs-master-brightgreen)](https://nvidia.github.io/Torch-TensorRT/)
4+
[![CircleCI](https://circleci.com/gh/pytorch/TensorRT.svg?style=svg)](https://app.circleci.com/pipelines/github/pytorch/TensorRT)
45

56
> Ahead of Time (AOT) compiling for PyTorch JIT and FX
67
@@ -113,15 +114,19 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedd
113114
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.
114115

115116
- Bazel 5.2.0
116-
- Libtorch 1.12.1 (built with CUDA 11.6)
117-
- CUDA 11.6
118-
- cuDNN 8.4.1
119-
- TensorRT 8.4.3.1
117+
- Libtorch 2.0.0.dev20230103 (built with CUDA 11.7)
118+
- CUDA 11.7
119+
- cuDNN 8.5.0
120+
- TensorRT 8.5.1.7
120121

121122
## Prebuilt Binaries and Wheel files
122123

123124
Releases: https://github.com/pytorch/TensorRT/releases
124125

126+
```
127+
pip install torch-tensorrt==1.2.0 --find-links https://github.com/pytorch/TensorRT/releases/expanded_assets/v1.2.0
128+
```
129+
125130
## Compiling Torch-TensorRT
126131

127132
### Installing Dependencies

0 commit comments

Comments
 (0)