Skip to content

[WIP] upgrade to public TRT 10.1.0.27 #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Torch-TensorRT
[![Documentation](https://img.shields.io/badge/docs-master-brightgreen)](https://nvidia.github.io/Torch-TensorRT/)
[![pytorch](https://img.shields.io/badge/PyTorch-2.4-green)](https://www.python.org/downloads/release/python-31013/)
[![cuda](https://img.shields.io/badge/CUDA-12.4-green)](https://developer.nvidia.com/cuda-downloads)
[![trt](https://img.shields.io/badge/TensorRT-10.0.1-green)](https://github.com/nvidia/tensorrt-llm)
[![trt](https://img.shields.io/badge/TensorRT-10.1.0-green)](https://github.com/nvidia/tensorrt-llm)
[![license](https://img.shields.io/badge/license-BSD--3--Clause-blue)](./LICENSE)
[![linux_tests](https://github.com/pytorch/TensorRT/actions/workflows/build-test-linux.yml/badge.svg)](https://github.com/pytorch/TensorRT/actions/workflows/build-test-linux.yml)
[![windows_tests](https://github.com/pytorch/TensorRT/actions/workflows/build-test-windows.yml/badge.svg)](https://github.com/pytorch/TensorRT/actions/workflows/build-test-windows.yml)
Expand Down Expand Up @@ -119,7 +119,7 @@ These are the following dependencies used to verify the testcases. Torch-TensorR
- Bazel 6.3.2
- Libtorch 2.5.0.dev (latest nightly) (built with CUDA 12.4)
- CUDA 12.4
- TensorRT 10.0.1.6
- TensorRT 10.1.0.27

## Deprecation Policy

Expand Down
14 changes: 6 additions & 8 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,23 @@ http_archive(
http_archive(
name = "tensorrt",
build_file = "@//third_party/tensorrt/archive:BUILD",
sha256 = "a5cd2863793d69187ce4c73b2fffc1f470ff28cfd91e3640017e53b8916453d5",
strip_prefix = "TensorRT-10.0.1.6",
sha256 = "606436ed219c72d1a25a889b2b0ae5cb5a68499dd6f944da4cabb3c34c067d55",
strip_prefix = "TensorRT-10.1.0.27",
urls = [
"https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.0.1/tars/TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz",
"https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.1.0/tars/TensorRT-10.1.0.27.Linux.x86_64-gnu.cuda-12.4.tar.gz",
],
)

http_archive(
name = "tensorrt_win",
build_file = "@//third_party/tensorrt/archive:BUILD",
sha256 = "d667bd10b178e239b621a8929008ef3e27967d181bf07a39845a0f99edeec47a",
strip_prefix = "TensorRT-10.0.1.6",
sha256 = "2eb98008944945377eb328871a308704e95bf3bb295fc548784c6da41a70bbed",
strip_prefix = "TensorRT-10.1.0.27",
urls = [
"https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.0.1/zip/TensorRT-10.0.1.6.Windows10.win10.cuda-12.4.zip",
"https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.1.0/zip/TensorRT-10.1.0.27.Windows.win10.cuda-12.4.zip",
],
)



####################################################################################
# Locally installed dependencies (use in cases of custom dependencies or aarch64)
####################################################################################
Expand Down
10 changes: 10 additions & 0 deletions core/ir/Input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ bool valid_dtype_format_combo(nvinfer1::DataType dtype, nvinfer1::TensorFormat f
default:
return false;
}
case nvinfer1::DataType::kINT64: // Supports just Linear (NCHW)
switch (format) {
case nvinfer1::TensorFormat::kLINEAR:
return true;
case nvinfer1::TensorFormat::kHWC:
default:
return false;
}
case nvinfer1::DataType::kINT32: // Supports just Linear (NCHW)
switch (format) {
case nvinfer1::TensorFormat::kLINEAR:
Expand Down Expand Up @@ -64,6 +72,8 @@ bool valid_input_dtype(nvinfer1::DataType dtype) {
return true;
case nvinfer1::DataType::kINT32:
return true;
case nvinfer1::DataType::kINT64:
return true;
default:
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion dev_dep_versions.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__: "2.5.0.dev0"
__cuda_version__: "12.4"
__tensorrt_version__: "10.0.1"
__tensorrt_version__: "10.1.0"
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ Note: By default the container uses the `pre-cxx11-abi` version of Torch + Torch

### Instructions

- The example below uses TensorRT 10.0.1.6
- The example below uses TensorRT 10.1.0.27
- See <a href="https://github.com/pytorch/TensorRT#dependencies">dependencies</a> for a list of current default dependencies.

> From root of Torch-TensorRT repo

Build:
```
DOCKER_BUILDKIT=1 docker build --build-arg TENSORRT_VERSION=10.0.1 -f docker/Dockerfile -t torch_tensorrt:latest .
DOCKER_BUILDKIT=1 docker build --build-arg TENSORRT_VERSION=10.1.0 -f docker/Dockerfile -t torch_tensorrt:latest .
```

Run:
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamo/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cupy==13.1.0
tensorrt==10.0.1
tensorrt==10.1.0
torch>=2.4.0.dev20240503+cu121
torch-tensorrt>=2.4.0.dev20240503+cu121
triton==2.3.0
2 changes: 1 addition & 1 deletion packaging/pre_build_script_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pip install tensorrt==${TRT_VERSION} tensorrt-${CU_VERSION::4}-bindings==${TRT_V

choco install bazelisk -y

curl -Lo TensorRT.zip https://developer.download.nvidia.com/compute/machine-learning/tensorrt/10.0.1/zip/TensorRT-10.0.1.6.Windows10.win10.cuda-12.4.zip
curl -Lo TensorRT.zip https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.1.0/zip/TensorRT-10.1.0.27.Windows.win10.cuda-12.4.zip
unzip -o TensorRT.zip -d C:/

export CUDA_HOME="$(echo ${CUDA_PATH} | sed -e 's#\\#\/#g')"
Expand Down
2 changes: 1 addition & 1 deletion packaging/smoke_test_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# The issue was smoke test installs the built torch_tensorrt wheel file and checks `import torch_tensorrt; print(torch_tensorrt.__version__)`
# Since tensorrt cannot be pip installable in CI, the smoke test will fail.
# One way we tried to handle it is manually install tensorrt wheel while by extracting from the tarball.
# However, the TensorRT-10.0.0.6/lib path doesn't seem to show up in LD_LIBRARY_PATH even if we explicitly set it.
# However, the TensorRT-10.1.0.27/lib path doesn't seem to show up in LD_LIBRARY_PATH even if we explicitly set it.
# TODO: Implement a custom smoke_test script to verify torch_tensorrt installation.
12 changes: 6 additions & 6 deletions py/ci/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ FROM pytorch/manylinux-builder:cuda12.4
RUN yum install -y ninja-build

# download TensorRT tarball
RUN wget -q https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.0.1/tars/TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz \
&& gunzip TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz \
&& tar -xvf TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar \
&& rm TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar
RUN wget -q https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.1.0/tars/TensorRT-10.1.0.27.Linux.x86_64-gnu.cuda-12.4.tar.gz \
&& gunzip TensorRT-10.1.0.27.Linux.x86_64-gnu.cuda-12.4.tar.gz \
&& tar -xvf TensorRT-10.1.0.27.Linux.x86_64-gnu.cuda-12.4.tar \
&& rm TensorRT-10.1.0.27.Linux.x86_64-gnu.cuda-12.4.tar

ENV TENSORRT_DIR=/TensorRT-10.0.1.6
ENV TENSORRT_VERSION=10.0.1
ENV TENSORRT_DIR=/TensorRT-10.1.0.27
ENV TENSORRT_VERSION=10.1.0

RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.17.0/bazelisk-linux-amd64 \
&& mv bazelisk-linux-amd64 /usr/bin/bazel \
Expand Down
2 changes: 1 addition & 1 deletion py/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ torch>=2.5.0.dev,<2.6.0
torchvision>=0.19.0.dev,<0.20.0
--extra-index-url https://pypi.ngc.nvidia.com
pyyaml
tensorrt==10.0.1
tensorrt==10.1.0
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ requires = [
"cffi>=1.15.1",
"typing-extensions>=4.7.0",
"future>=0.18.3",
"tensorrt==10.0.1",
"tensorrt==10.1.0",
"torch >=2.5.0.dev,<2.6.0",
"pybind11==2.6.2",
"numpy",
Expand Down Expand Up @@ -42,9 +42,9 @@ requires-python = ">=3.8"
keywords = ["pytorch", "torch", "tensorrt", "trt", "ai", "artificial intelligence", "ml", "machine learning", "dl", "deep learning", "compiler", "dynamo", "torchscript", "inference"]
dependencies = [
"torch >=2.5.0.dev,<2.6.0",
"tensorrt==10.0.1",
"tensorrt-cu12_bindings==10.0.1",
"tensorrt-cu12_libs==10.0.1",
"tensorrt==10.1.0",
"tensorrt-cu12_bindings==10.1.0",
"tensorrt-cu12_libs==10.1.0",
"packaging>=23",
"numpy",
"typing-extensions>=4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/py/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameterized>=0.2.0
pytest>=8.2.1
pytest-xdist>=3.6.1
pyyaml
tensorrt==10.0.1
tensorrt==10.1.0
timm>=1.0.3
transformers==4.39.3
--extra-index-url https://pypi.nvidia.com
2 changes: 1 addition & 1 deletion toolchains/ci_workspaces/WORKSPACE.win.release.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ http_archive(

new_local_repository(
name = "tensorrt_win",
path = "C:/TensorRT-10.0.1.6",
path = "C:/TensorRT-10.1.0.27",
build_file = "@//third_party/tensorrt/local:BUILD"
)

Expand Down
6 changes: 3 additions & 3 deletions toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ http_archive(
http_archive(
name = "tensorrt",
build_file = "@//third_party/tensorrt/archive:BUILD",
sha256 = "a5cd2863793d69187ce4c73b2fffc1f470ff28cfd91e3640017e53b8916453d5",
strip_prefix = "TensorRT-10.0.1.6",
sha256 = "606436ed219c72d1a25a889b2b0ae5cb5a68499dd6f944da4cabb3c34c067d55",
strip_prefix = "TensorRT-10.1.0.27",
urls = [
"https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.0.1/tars/TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz",
"https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/10.1.0/tars/TensorRT-10.1.0.27.Linux.x86_64-gnu.cuda-12.4.tar.gz",
],
)

Expand Down
Loading