Skip to content

Commit 14de59a

Browse files
peri044peri044
committed
Merge branch 'master' into clone_cuda11.7_update
2 parents 5a3a837 + 81f2dab commit 14de59a

File tree

116 files changed

+360
-250
lines changed

Some content is hidden

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

116 files changed

+360
-250
lines changed

‎.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

‎core/lowering/passes/op_aliasing.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,20 @@ void AliasOperators(std::shared_ptr<torch::jit::Graph>& graph) {
3535
rewrite_scatter.RegisterRewritePattern(scatter_sub_pattern, scatter_pattern);
3636
rewrite_scatter.runOnGraph(graph);
3737
LOG_GRAPH("Post map scatter_ -> scatter: " << *graph);
38+
39+
std::string multiply_pattern = R"IR(
40+
graph(%self, %other):
41+
%o : Tensor = aten::multiply(%self, %other)
42+
return (%o))IR";
43+
std::string mul_pattern = R"IR(
44+
graph(%self, %other):
45+
%o : Tensor = aten::mul(%self, %other)
46+
return (%o))IR";
47+
48+
torch::jit::SubgraphRewriter rewrite_multiply;
49+
rewrite_multiply.RegisterRewritePattern(multiply_pattern, mul_pattern);
50+
rewrite_multiply.runOnGraph(graph);
51+
LOG_GRAPH("Post map multiply -> mul: " << *graph);
3852
}
3953

4054
} // namespace passes

‎docs/_cpp_api/classtorch__tensorrt_1_1DataType.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Class DataType &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Class DataType &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/classtorch__tensorrt_1_1Device_1_1DeviceType.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Class Device::DeviceType &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Class Device::DeviceType &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/classtorch__tensorrt_1_1TensorFormat.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Class TensorFormat &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Class TensorFormat &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/classtorch__tensorrt_1_1ptq_1_1Int8CacheCalibrator.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Template Class Int8CacheCalibrator &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Template Class Int8CacheCalibrator &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/classtorch__tensorrt_1_1ptq_1_1Int8Calibrator.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Template Class Int8Calibrator &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Template Class Int8Calibrator &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1a18d295a837ac71add5578860b55e5502.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define STR &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define STR &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1a282fd3c0b1c3a215148ae372070e1268.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define TORCH_TENSORRT_PATCH_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define TORCH_TENSORRT_PATCH_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1a31398a6d4d27e28817afb0f0139e909e.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define TORCH_TENSORRT_MAJOR_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define TORCH_TENSORRT_MAJOR_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1a35703561b26b1a9d2738ad7d58b27827.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define TORCH_TENSORRT_MINOR_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define TORCH_TENSORRT_MINOR_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1abd1465eb38256d3f22cc1426b23d516b.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define TORCHTRT_API &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define TORCHTRT_API &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1abe87b341f562fd1cf40b7672e4d759da.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define XSTR &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define XSTR &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1ad19939408f7be171a74a89928b36eb59.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define TORCHTRT_HIDDEN &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define TORCHTRT_HIDDEN &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/define_macros_8h_1adad592a7b1b7eed529cdf6acd584c883.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Define TORCH_TENSORRT_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Define TORCH_TENSORRT_VERSION &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/dir_cpp.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Directory cpp &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Directory cpp &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -213,7 +213,7 @@
213213

214214

215215
<div class="version">
216-
v1.4.0dev0+b91e3e0
216+
v1.4.0dev0+b7ceedf
217217
</div>
218218

219219

‎docs/_cpp_api/dir_cpp_include.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Directory include &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Directory include &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -213,7 +213,7 @@
213213

214214

215215
<div class="version">
216-
v1.4.0dev0+b91e3e0
216+
v1.4.0dev0+b7ceedf
217217
</div>
218218

219219

‎docs/_cpp_api/dir_cpp_include_torch_tensorrt.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Directory torch_tensorrt &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Directory torch_tensorrt &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -213,7 +213,7 @@
213213

214214

215215
<div class="version">
216-
v1.4.0dev0+b91e3e0
216+
v1.4.0dev0+b7ceedf
217217
</div>
218218

219219

‎docs/_cpp_api/enum_logging_8h_1a130f65408ad8cbaee060f05e8db69558.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Enum Level &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Enum Level &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/enum_torch__tensorrt_8h_1a3fbe5d72e4fc624dbd038853079620eb.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>Enum EngineCapability &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>Enum EngineCapability &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -215,7 +215,7 @@
215215

216216

217217
<div class="version">
218-
v1.4.0dev0+b91e3e0
218+
v1.4.0dev0+b7ceedf
219219
</div>
220220

221221

‎docs/_cpp_api/file_cpp_include_torch_tensorrt_logging.h.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1212

13-
<title>File logging.h &mdash; Torch-TensorRT v1.4.0dev0+b91e3e0 documentation</title>
13+
<title>File logging.h &mdash; Torch-TensorRT v1.4.0dev0+b7ceedf documentation</title>
1414

1515

1616

@@ -213,7 +213,7 @@
213213

214214

215215
<div class="version">
216-
v1.4.0dev0+b91e3e0
216+
v1.4.0dev0+b7ceedf
217217
</div>
218218

219219

0 commit comments

Comments
 (0)