Skip to content

Commit 980dc1c

Browse files
peri044peri044
committed
chore: rebase
Signed-off-by: Dheeraj Peri <[email protected]>
2 parents e926724 + 890ba72 commit 980dc1c

File tree

148 files changed

+1839
-342
lines changed

Some content is hidden

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

148 files changed

+1839
-342
lines changed

‎.github/workflows/build-test.yml

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,40 @@ jobs:
5454
AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }}
5555
AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}
5656

57-
# tests-py-torchscript-fe:
58-
# name: Test torchscript frontend [Python]
59-
# needs: [generate-matrix, build]
60-
# strategy:
61-
# fail-fast: false
62-
# matrix:
63-
# include:
64-
# - repository: pytorch/tensorrt
65-
# package-name: torch_tensorrt
66-
# pre-script: packaging/pre_build_script.sh
67-
# uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
68-
# with:
69-
# job-name: tests-py-torchscript-fe
70-
# repository: "pytorch/tensorrt"
71-
# ref: ""
72-
# test-infra-repository: pytorch/test-infra
73-
# test-infra-ref: main
74-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
75-
# pre-script: ${{ matrix.pre-script }}
76-
# script: |
77-
# export USE_HOST_DEPS=1
78-
# pushd .
79-
# cd tests/modules
80-
# ${CONDA_RUN} python -m pip install -r requirements.txt
81-
# ${CONDA_RUN} python hub.py
82-
# popd
83-
# pushd .
84-
# cd tests/py/ts
85-
# ${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
86-
# ${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
87-
# ${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
88-
# ${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
89-
# popd
57+
tests-py-torchscript-fe:
58+
name: Test torchscript frontend [Python]
59+
needs: [generate-matrix, build]
60+
strategy:
61+
fail-fast: false
62+
matrix:
63+
include:
64+
- repository: pytorch/tensorrt
65+
package-name: torch_tensorrt
66+
pre-script: packaging/pre_build_script.sh
67+
uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
68+
with:
69+
job-name: tests-py-torchscript-fe
70+
repository: "pytorch/tensorrt"
71+
ref: ""
72+
test-infra-repository: pytorch/test-infra
73+
test-infra-ref: main
74+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
75+
pre-script: ${{ matrix.pre-script }}
76+
script: |
77+
export USE_HOST_DEPS=1
78+
export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
79+
pushd .
80+
cd tests/modules
81+
${CONDA_RUN} python -m pip install --pre -r requirements.txt --use-deprecated=legacy-resolver
82+
${CONDA_RUN} python hub.py
83+
popd
84+
pushd .
85+
cd tests/py/ts
86+
${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
87+
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
88+
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
89+
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
90+
popd
9091
9192
tests-py-dynamo-converters:
9293
name: Test dynamo converters [Python]

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedd
116116
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.
117117

118118
- Bazel 5.2.0
119-
- Libtorch 2.1.0.dev20230703 (built with CUDA 12.1)
119+
- Libtorch 2.2.0.dev (latest nightly) (built with CUDA 12.1)
120120
- CUDA 12.1
121121
- cuDNN 8.8.1
122122
- TensorRT 8.6.1

‎cpp/include/torch_tensorrt/macros.h

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

2626
#define TORCH_TENSORRT_MAJOR_VERSION 2
27-
#define TORCH_TENSORRT_MINOR_VERSION 0
27+
#define TORCH_TENSORRT_MINOR_VERSION 2
2828
#define TORCH_TENSORRT_PATCH_VERSION 0
2929
#define TORCH_TENSORRT_VERSION \
3030
STR(TORCH_TENSORRT_MAJOR_VERSION) \

‎dev_dep_versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__: "2.0.0.dev0"
1+
__version__: "2.2.0.dev0"
22
__cuda_version__: "12.1"
33
__cudnn_version__: "8.8"
44
__tensorrt_version__: "8.6"

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Class DataType &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Class Device::DeviceType &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Class TensorFormat &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Template Class Int8CacheCalibrator &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Template Class Int8Calibrator &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define STR &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define TORCH_TENSORRT_PATCH_VERSION &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define TORCH_TENSORRT_MAJOR_VERSION &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define TORCH_TENSORRT_MINOR_VERSION &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define TORCHTRT_API &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define XSTR &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define TORCHTRT_HIDDEN &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Define TORCH_TENSORRT_VERSION &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -225,7 +225,7 @@
225225

226226

227227
<div class="version">
228-
v2.0.0.dev0+5af4103
228+
v2.2.0.dev0+40f8064
229229
</div>
230230

231231

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Directory cpp &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -223,7 +223,7 @@
223223

224224

225225
<div class="version">
226-
v2.0.0.dev0+5af4103
226+
v2.2.0.dev0+40f8064
227227
</div>
228228

229229

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Directory include &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -223,7 +223,7 @@
223223

224224

225225
<div class="version">
226-
v2.0.0.dev0+5af4103
226+
v2.2.0.dev0+40f8064
227227
</div>
228228

229229

‎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 v2.0.0.dev0+5af4103 documentation</title>
13+
<title>Directory torch_tensorrt &mdash; Torch-TensorRT v2.2.0.dev0+40f8064 documentation</title>
1414

1515

1616

@@ -223,7 +223,7 @@
223223

224224

225225
<div class="version">
226-
v2.0.0.dev0+5af4103
226+
v2.2.0.dev0+40f8064
227227
</div>
228228

229229

0 commit comments

Comments
 (0)