Fix build (#1479)

* Fix build

* different nightly torch

* fix lint

* c10_cuda

* update WORKSPACE

* print torch version

* Update setup.py requirement

* fix TRTModuleNext

Author: Yinghai Lu

.circleci/config.yml

@@ -367,7 +367,7 @@ commands:
       - run:
           name: Test torch
           command: |
-            python3 -c "import torch; print(torch.cuda.is_available()); print(torch.cuda.device_count())"
+            python3 -c "import torch; print(torch.cuda.is_available()); print(torch.cuda.device_count()); print(torch.__version__)"
 
       - run:
           name: Get torch-tensorrt version information
@@ -946,7 +946,7 @@ parameters:
   # Nightly platform config
   torch-build:
     type: string
-    default: "1.13.0.dev20220921+cu116"
+    default: "1.14.0.dev20221114+cu116"
   torch-build-index:
     type: string
     default: "https://download.pytorch.org/whl/nightly/cu116"

WORKSPACE

@@ -56,17 +56,17 @@ new_local_repository(
 http_archive(
     name = "libtorch",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "486106ddc5b5ad532f030f447940a571b924da821b9534d25c0cef5503cdfaea",
+    sha256 = "b565c662435fd58ec295fa0791388ea52ad0f5fd33517b2d7c0fdcc91b6db531",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220921%2Bcu116.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.14.0.dev20221114%2Bcu116.zip"],
 )
 
 http_archive(
     name = "libtorch_pre_cxx11_abi",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "b304ebf26effcbbefcec99134bcfb0127c499306343fbe2e2cd127213448a4a6",
+    sha256 = "fbb37446c33b05c1e26256c09f6ffb46cea1f6ff9ee2ad5b79b146d09023b0c1",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.13.0.dev20220921%2Bcu116.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.14.0.dev20221114%2Bcu116.zip"],
 )
 
 # Download these tarballs manually from the NVIDIA website

core/BUILD

@@ -33,8 +33,8 @@ cc_library(
         "//core/util/logging",
         "@tensorrt//:nvinfer",
     ] + select({
-        ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch", "@libtorch_pre_cxx11_abi//:c10_cuda"],
+        "//conditions:default": ["@libtorch//:libtorch", "@libtorch//:c10_cuda"],
     }),
     alwayslink = True,
 )

core/runtime/TRTEngine.cpp

@@ -142,9 +142,9 @@ TRTEngine::TRTEngine(
     num_io = std::make_pair(inputs, outputs);
   }
 
-  #ifndef NDEBUG
-    this->enable_profiling();
-  #endif
+#ifndef NDEBUG
+  this->enable_profiling();
+#endif
   LOG_DEBUG(*this);
 }
 

cpp/CMakeLists.txt

@@ -24,7 +24,7 @@ target_sources(${lib_name}
 
 target_link_libraries(${lib_name}
     PUBLIC
-        torch
+        "${TORCH_LIBRARIES}"
         TensorRT::nvinfer
         core
 )
@@ -71,7 +71,7 @@ target_sources(${torchtrt_lib_name}
 target_link_libraries(${torchtrt_lib_name}
     PUBLIC
         TensorRT::TensorRT
-        torch
+        "${TORCH_LIBRARIES}"
     PRIVATE
         torch_tensorrt
         core
@@ -111,7 +111,7 @@ target_sources(${runtime_lib_name}
 target_link_libraries(${runtime_lib_name}
     PUBLIC
         TensorRT::TensorRT
-        torch
+        "${TORCH_LIBRARIES}"
     PRIVATE
         core_runtime
         core_plugins

py/requirements.txt

@@ -1,7 +1,7 @@
 numpy
 pybind11==2.6.2
 --extra-index-url https://download.pytorch.org/whl/nightly/cu116
-torch==1.13.0.dev20220921+cu116
+torch==1.14.0.dev20221114+cu116
 torchvision==0.14.0.dev20220921+cu116
 --extra-index-url https://pypi.ngc.nvidia.com
 nvidia-tensorrt==8.4.3.1

py/setup.py

@@ -376,7 +376,7 @@ def run(self):
     long_description=long_description,
     ext_modules=ext_modules,
     install_requires=[
-        "torch>=1.13.0.dev0,<1.14.0",
+        "torch>=1.14.0.dev0",
     ],
     setup_requires=[],
     cmdclass={

py/torch_tensorrt/_TRTModuleNext.py

@@ -31,7 +31,7 @@ class TRTModuleNext(torch.nn.Module):
 
     def __init__(
         self,
-        serialized_engine: bytearray,
+        serialized_engine: bytearray = bytearray(),
         name: str = "",
         input_binding_names: List[str] = [],
         output_binding_names: List[str] = [],