diff --git a/BUILD.bazel b/BUILD.bazel index 950839a40e..685e5e75c6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -88,8 +88,7 @@ pkg_tar( name = "libtorchtrt", srcs = [ "//:LICENSE", - "//bzl_def:BUILD", - "//bzl_def:WORKSPACE", + "//third_party/torch_tensorrt:BUILD", ], extension = "tar.gz", package_dir = "torch_tensorrt", @@ -107,8 +106,7 @@ pkg_tar( name = "libtorchtrt_runtime", srcs = [ "//:LICENSE", - "//bzl_def:BUILD", - "//bzl_def:WORKSPACE", + "//third_party/torch_tensorrt:BUILD", ], extension = "tar.gz", package_dir = "torch_tensorrt_runtime", diff --git a/MODULE.bazel b/MODULE.bazel index 1b66e2c900..a83920825e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -24,14 +24,16 @@ git_override( local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository") + +new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository") + # External dependency for torch_tensorrt if you already have precompiled binaries. -local_repository( +new_local_repository( name = "torch_tensorrt", - path = "/opt/conda/lib/python3.11/site-packages/torch_tensorrt", + build_file = "@//third_party/torch_tensorrt:BUILD", + path = "/usr/local/lib/python3.12/site-packages/torch_tensorrt/", ) -new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository") - # CUDA should be installed on the system locally # for linux x86_64 and aarch64 new_local_repository( diff --git a/bzl_def/WORKSPACE b/bzl_def/WORKSPACE deleted file mode 100644 index 5ef6dd8e0c..0000000000 --- a/bzl_def/WORKSPACE +++ /dev/null @@ -1 +0,0 @@ -workspace(name = "torch_tensorrt") diff --git a/docker/MODULE.bazel.ngc b/docker/MODULE.bazel.ngc index e406a2cee7..137f49b16c 100644 --- a/docker/MODULE.bazel.ngc +++ b/docker/MODULE.bazel.ngc @@ -24,14 +24,17 @@ git_override( local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository") + +new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository") + + # External dependency for torch_tensorrt if you already have precompiled binaries. -local_repository( +new_local_repository( name = "torch_tensorrt", + build_file = "@//third_party/torch_tensorrt:BUILD", path = "/usr/local/lib/python3.12/dist-packages/torch_tensorrt/", ) -new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository") - # CUDA should be installed on the system locally new_local_repository( @@ -55,8 +58,29 @@ new_local_repository( build_file = "third_party/libtorch/BUILD" ) + +# This is a workaround (WAR), not a functional Bazel repository. +# It directly references a system-installed PyTorch package, which breaks hermeticity +new_local_repository( + name = "torch_l4t", + path = "/usr/local/lib/python3.12/dist-packages/torch/", + build_file = "third_party/libtorch/BUILD" +) + new_local_repository( name = "tensorrt", path = "/usr/", build_file = "@//third_party/tensorrt/local:BUILD" ) + +new_local_repository( + name = "tensorrt_sbsa", + path = "/usr/", + build_file = "@//third_party/tensorrt/local:BUILD" +) + +new_local_repository( + name = "tensorrt_l4t", + path = "/usr/", + build_file = "@//third_party/tensorrt/local:BUILD" +) \ No newline at end of file diff --git a/setup.py b/setup.py index f829602f1a..caa08227e5 100644 --- a/setup.py +++ b/setup.py @@ -613,8 +613,6 @@ def run(self): package_data.update( { "torch_tensorrt": [ - "BUILD", - "WORKSPACE", "include/torch_tensorrt/*.h", "include/torch_tensorrt/core/*.h", "include/torch_tensorrt/core/conversion/*.h", @@ -644,8 +642,6 @@ def run(self): package_data.update( { "torch_tensorrt": [ - "BUILD", - "WORKSPACE", "include/torch_tensorrt/*.h", "include/torch_tensorrt/core/*.h", "include/torch_tensorrt/core/runtime/*.h", diff --git a/bzl_def/BUILD b/third_party/torch_tensorrt/BUILD similarity index 100% rename from bzl_def/BUILD rename to third_party/torch_tensorrt/BUILD diff --git a/bzl_def/BUILD.bazel b/third_party/torch_tensorrt/BUILD.bazel similarity index 80% rename from bzl_def/BUILD.bazel rename to third_party/torch_tensorrt/BUILD.bazel index 15f7822df5..ce5f3391af 100644 --- a/bzl_def/BUILD.bazel +++ b/third_party/torch_tensorrt/BUILD.bazel @@ -1,6 +1,5 @@ package(default_visibility = ["//visibility:public"]) exports_files([ - "WORKSPACE", "BUILD", -]) +]) \ No newline at end of file