Skip to content

Version updates in preparation for TRTorch 0.0.3 #128

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 9, 2020
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
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.3.1
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts")

### Dependencies

- Bazel 3.2.0
- Libtorch 1.5.0
- Bazel 3.3.1
- Libtorch 1.5.1
- CUDA 10.2
- cuDNN 7.6.5
- TensorRT 7.0.0
- cuDNN 8.0.1
- TensorRT 7.1.3

## Prebuilt Binaries and Wheel files

Expand Down
22 changes: 11 additions & 11 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ http_archive(
name = "libtorch",
build_file = "@//third_party/libtorch:BUILD",
strip_prefix = "libtorch",
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.5.0.zip"],
sha256 = "0efdd4e709ab11088fa75f0501c19b0e294404231442bab1d1fb953924feb6b5"
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.5.1.zip"],
sha256 = "cf0691493d05062fe3239cf76773bae4c5124f4b039050dbdd291c652af3ab2a"
)

http_archive(
name = "libtorch_pre_cxx11_abi",
build_file = "@//third_party/libtorch:BUILD",
strip_prefix = "libtorch",
sha256 = "ea8de17c5f70015583f3a7a43c7a5cdf91a1d4bd19a6a7bc11f074ef6cd69e27",
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-shared-with-deps-1.5.0.zip"],
sha256 = "818977576572eadaf62c80434a25afe44dbaa32ebda3a0919e389dcbe74f8656",
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-shared-with-deps-1.5.1.zip"],
)

# Download these tarballs manually from the NVIDIA website
Expand All @@ -71,29 +71,29 @@ http_archive(

http_archive(
name = "cudnn",
urls = ["https://developer.nvidia.com/compute/machine-learning/cudnn/secure/7.6.5.32/Production/10.2_20191118/cudnn-10.2-linux-x64-v7.6.5.32.tgz"],
urls = ["https://developer.nvidia.com/compute/machine-learning/cudnn/secure/8.0.1.13/10.2_20200626/cudnn-10.2-linux-x64-v8.0.1.13.tgz"],
build_file = "@//third_party/cudnn/archive:BUILD",
sha256 = "600267f2caaed2fd58eb214ba669d8ea35f396a7d19b94822e6b36f9f7088c20",
sha256 = "0c106ec84f199a0fbcf1199010166986da732f9b0907768c9ac5ea5b120772db",
strip_prefix = "cuda"
)

http_archive(
name = "tensorrt",
urls = ["https://developer.nvidia.com/compute/machine-learning/tensorrt/secure/7.0/7.0.0.11/tars/TensorRT-7.0.0.11.Ubuntu-18.04.x86_64-gnu.cuda-10.2.cudnn7.6.tar.gz"],
urls = ["https://developer.nvidia.com/compute/machine-learning/tensorrt/secure/7.1/tars/TensorRT-7.1.3.4.Ubuntu-18.04.x86_64-gnu.cuda-10.2.cudnn8.0.tar.gz"],
build_file = "@//third_party/tensorrt/archive:BUILD",
sha256 = "c7d73b2585b18aae68b740249efa8c8ba5ae852abe9a023720595432a8eb4efd",
strip_prefix = "TensorRT-7.0.0.11"
sha256 = "9205bed204e2ae7aafd2e01cce0f21309e281e18d5bfd7172ef8541771539d41",
strip_prefix = "TensorRT-7.1.3.4"
)

####################################################################################
# Locally installed dependencies (use in cases of custom dependencies or aarch64)
####################################################################################

# NOTE: In the case you are using just the pre-cxx11-abi path or just the cxx11 abi path
# NOTE: In the case you are using just the pre-cxx11-abi path or just the cxx11 abi path
# with your local libtorch, just point deps at the same path to satisfy bazel.

# NOTE: NVIDIA's aarch64 PyTorch (python) wheel file uses the CXX11 ABI unlike PyTorch's standard
# x86_64 python distribution. If using NVIDIA's version just point to the root of the package
# x86_64 python distribution. If using NVIDIA's version just point to the root of the package
# for both versions here and do not use --config=pre-cxx11-abi

#new_local_repository(
Expand Down
3 changes: 1 addition & 2 deletions tests/util/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ cc_library(
"run_forward.cpp"
],
deps = [
"@tensorrt//:nvinfer",
"//core/conversion",
"//core/util:prelude",
"//cpp/api:trtorch",
"@tensorrt//:nvinfer"
"@tensorrt//:nvinfer"
] + select({
":use_pre_cxx11_abi": [
"@libtorch_pre_cxx11_abi//:libtorch",
Expand Down
4 changes: 2 additions & 2 deletions third_party/cudnn/archive/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package(default_visibility = ["//visibility:public"])

cc_library(
name = "cudnn_headers",
hdrs = ["include/cudnn.h"] + glob(["include/cudnn+.h"]),
hdrs = glob(["include/cudnn*.h"]),
includes = ["include/"],
visibility = ["//visibility:private"],
)

cc_import(
name = "cudnn_lib",
shared_library = "lib64/libcudnn.so.7.6.5",
shared_library = "lib64/libcudnn.so",
visibility = ["//visibility:private"],
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/cudnn/local/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cc_import(
name = "cudnn_lib",
shared_library = select({
":aarch64_linux": "lib/aarch64-linux-gnu/libcudnn.so",
"//conditions:default": "lib/x86_64-linux-gnu/libcudnn.so.7.6.5",
"//conditions:default": "lib/x86_64-linux-gnu/libcudnn.so",
}),
visibility = ["//visibility:private"],
)
Expand Down
12 changes: 6 additions & 6 deletions third_party/tensorrt/archive/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cc_library(

cc_import(
name = "nvinfer_lib",
shared_library = "lib/libnvinfer.so.7.0.0",
shared_library = "lib/libnvinfer.so",
visibility = ["//visibility:private"],
)

Expand All @@ -34,7 +34,7 @@ cc_library(

cc_import(
name = "nvparsers_lib",
shared_library = "lib/libnvparsers.so.7.0.0",
shared_library = "lib/libnvparsers.so",
visibility = ["//visibility:private"],
)

Expand Down Expand Up @@ -66,7 +66,7 @@ cc_library(

cc_import(
name = "nvonnxparser_lib",
shared_library = "lib/libnvonnxparser.so.7.0.0",
shared_library = "lib/libnvonnxparser.so",
visibility = ["//visibility:private"],
)

Expand Down Expand Up @@ -95,7 +95,7 @@ cc_library(

cc_import(
name = "nvonnxparser_runtime_lib",
shared_library = "lib/libnvonnxparser_runtime.so.7.0.0",
shared_library = "lib/libnvonnxparser_runtime.so",
visibility = ["//visibility:public"],
)

Expand All @@ -120,7 +120,7 @@ cc_library(

cc_import(
name = "nvcaffeparser_lib",
shared_library = "lib/libnvcaffe_parsers.so.7.0.0",
shared_library = "lib/libnvcaffe_parsers.so",
visibility = ["//visibility:private"],
)

Expand All @@ -145,7 +145,7 @@ cc_library(

cc_import(
name = "nvinferplugin_lib",
shared_library = "lib/libnvinfer_plugin.so.7.0.0",
shared_library = "lib/libnvinfer_plugin.so",
visibility = ["//visibility:private"],
)

Expand Down