Update installation of Torch-TRT

BUILD.bazel

@@ -66,7 +66,7 @@ pkg_tar(
 pkg_tar(
     name = "lib_rt",
     srcs = select({
-        ":windows": ["//cpp/lib:torch_tensorrt_runtime.dll"],
+        ":windows": ["//cpp/lib:torchtrt_runtime.dll"],
         "//conditions:default": [
             "//cpp/lib:libtorchtrt_runtime.so",
         ],

cpp/lib/BUILD

@@ -42,3 +42,14 @@ cc_binary(
         "//cpp:torch_tensorrt",
     ],
 )
+
+cc_binary(
+    name = "torchtrt_runtime.dll",
+    srcs = [],
+    linkshared = True,
+    linkstatic = True,
+    deps = [
+        "//core/plugins:torch_tensorrt_plugins",
+        "//core/runtime",
+    ],
+)

packaging/smoke_test_windows.py

@@ -1,3 +1,33 @@
+import glob
+import os
+import shutil
+import site
+import subprocess
+
+python_site_packages = site.getsitepackages()[-1]
+extra_cudnn = os.path.join(python_site_packages, "nvidia", "cudnn")
+extra_torch = os.path.join(python_site_packages, "torch", "lib")
+
+print(f"CUDNN DLLS: {list(glob.glob(os.path.join(extra_cudnn, '**', '*.dll'), recursive=True))}")
+print(f"ALL TORCH DLLS: {list(glob.glob(os.path.join(extra_torch, '**', '*.dll'), recursive=True))}")
+print(f"Current PATH: {os.getenv('PATH')}")
+
+# Move TRT cuDNN DLLs into torch path
+for dll in glob.glob(os.path.join(extra_cudnn, "**", "*.dll"), recursive=True):
+    shutil.copy(dll, extra_torch)
+
 import torch
+
+print(f"Torch CUDA version: {torch.version.cuda}")
+
+result = subprocess.run(
+    ["nvcc", "--version"],
+    capture_output=True,
+    text=True,
+)
+print(result.stdout)
+print(result.stderr)
+
+
 import tensorrt
 import torch_tensorrt

py/torch_tensorrt/__init__.py

@@ -95,7 +95,7 @@ def _register_with_torch() -> None:
         "/torchtrt.dll" if sys.platform.startswith("win") else "/lib/libtorchtrt.so"
     )
     linked_file_runtime = (
-        "/torch_tensorrt_runtime.dll"
+        "/torchtrt_runtime.dll"
         if sys.platform.startswith("win")
         else "/lib/libtorchtrt_runtime.so"
     )

third_party/tensorrt/local/BUILD

@@ -30,7 +30,7 @@ cc_library(
     name = "nvinfer_headers",
     hdrs = select({
         ":aarch64_linux": [
-            "include/aarch64-linux-gnu/NvUtils.h",
+            # "include/aarch64-linux-gnu/NvUtils.h",
         ] + glob(
             [
                 "include/aarch64-linux-gnu/NvInfer*.h",
@@ -41,7 +41,7 @@ cc_library(
             ],
         ),
         ":ci_rhel_x86_64_linux": [
-            "include/NvUtils.h",
+            # "include/NvUtils.h",
         ] + glob(
             [
                 "include/NvInfer*.h",
@@ -52,7 +52,7 @@ cc_library(
             ],
         ),
         ":windows": [
-            "include/NvUtils.h",
+            # "include/NvUtils.h",
         ] + glob(
             [
                 "include/NvInfer*.h",
@@ -63,7 +63,7 @@ cc_library(
             ],
         ),
         "//conditions:default": [
-            "include/x86_64-linux-gnu/NvUtils.h",
+            # "include/x86_64-linux-gnu/NvUtils.h",
         ] + glob(
             [
                 "include/x86_64-linux-gnu/NvInfer*.h",