fix: TRT upgrade to 9.2 on Linux Testing

Author: gs-olive

README.md

@@ -119,7 +119,7 @@ These are the following dependencies used to verify the testcases. Torch-TensorR
 - Libtorch 2.2.0.dev (latest nightly) (built with CUDA 12.1)
 - CUDA 12.1
 - cuDNN 8.9.5
-- TensorRT 8.6.1
+- TensorRT 9.2.0
 
 ## Prebuilt Binaries and Wheel files
 

WORKSPACE

@@ -81,10 +81,10 @@ http_archive(
 http_archive(
     name = "tensorrt",
     build_file = "@//third_party/tensorrt/archive:BUILD",
-    sha256 = "0f8157a5fc5329943b338b893591373350afa90ca81239cdadd7580cd1eba254",
-    strip_prefix = "TensorRT-8.6.1.6",
+    sha256 = "3dd505a9e0d0adf9257080b543f51d91df736dbd1f75417b9dde1a7b7a5d87f2",
+    strip_prefix = "tensorrt-9.2.0.5",
     urls = [
-        "https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/secure/8.6.1/tars/TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz",
+        "https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt/9.2.0/tensorrt-9.2.0.5.linux.x86_64-gnu.cuda-12.2.tar.gz",
     ],
 )
 

dev_dep_versions.yml

@@ -1,4 +1,4 @@
 __version__: "2.2.0.dev0"
 __cuda_version__: "12.1"
 __cudnn_version__: "8.9"
-__tensorrt_version__: "8.6"
+__tensorrt_version__: "9.2"

docker/README.md

@@ -17,14 +17,14 @@ Note: By default the container uses the `pre-cxx11-abi` version of Torch + Torch
 
 ### Instructions
 
-- The example below uses CUDNN 8.9 and TensorRT 8.6
+- The example below uses CUDNN 8.9 and TensorRT 9.2
 - 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=8.6 --build-arg CUDNN_VERSION=8.9 -f docker/Dockerfile -t torch_tensorrt:latest .
+DOCKER_BUILDKIT=1 docker build --build-arg TENSORRT_VERSION=9.2 --build-arg CUDNN_VERSION=8.9 -f docker/Dockerfile -t torch_tensorrt:latest .
 ```
 
 Run:

py/requirements.txt

@@ -4,6 +4,6 @@ pybind11==2.6.2
 --extra-index-url https://download.pytorch.org/whl/nightly/cu121
 torch>=2.2.0.dev,<2.3.0
 torchvision>=0.17.0.dev,<0.18.0
---extra-index-url https://pypi.ngc.nvidia.com
-tensorrt==8.6.1
+--extra-index-url https://pypi.nvidia.com
+tensorrt==9.2.0.post12.dev5
 pyyaml

pyproject.toml

@@ -8,7 +8,7 @@ requires = [
     "cffi>=1.15.1",
     "typing-extensions>=4.7.0",
     "future>=0.18.3",
-    "tensorrt>=8.6,<8.7",
+    "tensorrt>=8.6",
     "torch >=2.2.0.dev,<2.3.0",
     #"torch==2.1.0.dev20230731",
     "pybind11==2.6.2",
@@ -44,7 +44,7 @@ keywords = ["pytorch", "torch", "tensorrt", "trt", "ai", "artificial intelligenc
 dependencies = [
     "torch >=2.2.0.dev,<2.3.0",
     #"torch==2.1.0.dev20230731",
-    "tensorrt>=8.6,<8.7",
+    "tensorrt>=8.6",
     "packaging>=23",
     "numpy",
     "typing-extensions>=4.7.0",

third_party/cudnn/local/BUILD

@@ -28,8 +28,8 @@ config_setting(
 
 cc_library(
     name = "cudnn_headers",
-    hdrs = ["include/cudnn.h"] + glob([
-        "include/cudnn_*.h",
+    hdrs = glob([
+        "include/cudnn*.h",
     ]),
     includes = ["include/"],
     visibility = ["//visibility:private"],
@@ -39,7 +39,7 @@ cc_import(
     name = "cudnn_lib",
     shared_library = select({
         ":aarch64_linux": "lib/aarch64-linux-gnu/libcudnn.so",
-        ":ci_rhel_x86_64_linux": "lib64/libcudnn.so",
+        ":ci_rhel_x86_64_linux": "lib/x64/libcudnn.so",
         ":windows": "bin/cudnn64_7.dll",  #Need to configure specific version for windows
         "//conditions:default": "lib/x86_64-linux-gnu/libcudnn.so",
     }),

third_party/tensorrt/local/BUILD

@@ -40,9 +40,7 @@ cc_library(
                 "include/aarch64-linux-gnu/NvInferPluginUtils.h",
             ],
         ),
-        ":ci_rhel_x86_64_linux": [
-            "include/NvUtils.h",
-        ] + glob(
+        ":ci_rhel_x86_64_linux": glob(
             [
                 "include/NvInfer*.h",
             ],
@@ -87,7 +85,7 @@ cc_import(
     name = "nvinfer_static_lib",
     static_library = select({
         ":aarch64_linux": "lib/aarch64-linux-gnu/libnvinfer_static.a",
-        ":ci_rhel_x86_64_linux": "lib64/libnvinfer_static.a",
+        ":ci_rhel_x86_64_linux": "targets/x86_64-linux-gnu/lib/libnvinfer_static.a",
         ":windows": "lib/nvinfer.lib",
         "//conditions:default": "lib/x86_64-linux-gnu/libnvinfer_static.a",
     }),
@@ -98,7 +96,7 @@ cc_import(
     name = "nvinfer_lib",
     shared_library = select({
         ":aarch64_linux": "lib/aarch64-linux-gnu/libnvinfer.so",
-        ":ci_rhel_x86_64_linux": "lib64/libnvinfer.so",
+        ":ci_rhel_x86_64_linux": "targets/x86_64-linux-gnu/lib/libnvinfer.so",
         ":windows": "lib/nvinfer.dll",
         "//conditions:default": "lib/x86_64-linux-gnu/libnvinfer.so",
     }),
@@ -122,7 +120,7 @@ cc_import(
     name = "nvparsers_lib",
     shared_library = select({
         ":aarch64_linux": "lib/aarch64-linux-gnu/libnvparsers.so",
-        ":ci_rhel_x86_64_linux": "lib64/libnvparsers.so",
+        ":ci_rhel_x86_64_linux": "targets/x86_64-linux-gnu/lib/libnvparsers.so",
         ":windows": "lib/nvparsers.dll",
         "//conditions:default": "lib/x86_64-linux-gnu/libnvparsers.so",
     }),
@@ -186,7 +184,7 @@ cc_import(
     name = "nvonnxparser_lib",
     shared_library = select({
         ":aarch64_linux": "lib/aarch64-linux-gnu/libnvonnxparser.so",
-        ":ci_rhel_x86_64_linux": "lib64/libnvonnxparser.so",
+        ":ci_rhel_x86_64_linux": "targets/x86_64-linux-gnu/lib/libnvonnxparser.so",
         ":windows": "lib/nvonnxparser.dll",
         "//conditions:default": "lib/x86_64-linux-gnu/libnvonnxparser.so",
     }),
@@ -242,7 +240,7 @@ cc_import(
     name = "nvonnxparser_runtime_lib",
     shared_library = select({
         ":aarch64_linux": "lib/x86_64-linux-gnu/libnvonnxparser_runtime.so",
-        ":ci_rhel_x86_64_linux": "lib64/libnvonnxparser_runtime.so",
+        ":ci_rhel_x86_64_linux": "targets/x86_64-linux-gnu/lib/libnvonnxparser_runtime.so",
         ":windows": "lib/nvonnxparser_runtime.dll",
         "//conditions:default": "lib/x86_64-linux-gnu/libnvonnxparser_runtime.so",
     }),
@@ -290,7 +288,7 @@ cc_import(
     name = "nvcaffeparser_lib",
     shared_library = select({
         ":aarch64_linux": "lib/aarch64-linux-gnu/libnvcaffe_parsers.so",
-        ":ci_rhel_x86_64_linux": "lib64/libnvcaffe_parsers.so",
+        ":ci_rhel_x86_64_linux": "targets/x86_64-linux-gnu/lib/libnvcaffe_parsers.so",
         ":windows": "lib/nvcaffe_parsers.dll",
         "//conditions:default": "lib/x86_64-linux-gnu/libnvcaffe_parsers.so",
     }),
@@ -338,7 +336,7 @@ cc_library(
     name = "nvinferplugin",
     srcs = select({
         ":aarch64_linux": ["lib/aarch64-linux-gnu/libnvinfer_plugin.so"],
-        ":ci_rhel_x86_64_linux": ["lib64/libnvinfer_plugin.so"],
+        ":ci_rhel_x86_64_linux": ["targets/x86_64-linux-gnu/lib/libnvinfer_plugin.so"],
         ":windows": ["lib/nvinfer_plugin.dll"],
         "//conditions:default": ["lib/x86_64-linux-gnu/libnvinfer_plugin.so"],
     }),

toolchains/legacy/pyproject.toml

@@ -8,7 +8,7 @@ requires = [
     "cffi>=1.15.1",
     "typing-extensions>=4.7.0",
     "future>=0.18.3",
-    "tensorrt>=8.6,<8.7",
+    "tensorrt>=8.6",
     "torch>=1.13.0,<2.0",
     "pybind11==2.6.2",
     "numpy",
@@ -42,7 +42,7 @@ requires-python = ">=3.8"
 keywords = ["pytorch", "torch", "tensorrt", "trt", "ai", "artificial intelligence", "ml", "machine learning", "dl", "deep learning", "compiler", "dynamo", "torchscript", "inference"]
 dependencies = [
     "torch>=1.13.0,<2.0",
-    "tensorrt>=8.6,<8.7",
+    "tensorrt>=8.6",
     "packaging>=23",
     "numpy",
     "typing-extensions>=4.7.0",