From a1e994f09ea212b4e9bdc3920f6deccc19f05eb9 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 25 Jun 2025 19:13:17 +0200 Subject: [PATCH 1/5] Remove Bazel files from wheel Once the wheel is built, the Bazel files are no longer needed. Fixes #3477 --- setup.py | 4 ---- 1 file changed, 4 deletions(-) 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", From 6f454e4dea43bf607f58b7cb30ffdf619c14b202 Mon Sep 17 00:00:00 2001 From: apbose Date: Mon, 30 Jun 2025 21:08:37 -0700 Subject: [PATCH 2/5] changes for DLFW for l4t target and removal of BUILD files from package --- docker/MODULE.bazel.ngc | 27 ++++++++++++-- third_party/BUILD | 83 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 3 deletions(-) diff --git a/docker/MODULE.bazel.ngc b/docker/MODULE.bazel.ngc index e406a2cee7..b3c3560d9d 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: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,26 @@ new_local_repository( build_file = "third_party/libtorch/BUILD" ) +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/third_party/BUILD b/third_party/BUILD index e69de29bb2..b6c8ded980 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -0,0 +1,83 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + +package(default_visibility = ["//visibility:public"]) + +load("@rules_cc//cc:defs.bzl", "cc_library") + +config_setting( + name = "aarch64_linux", + constraint_values = [ + "@platforms//cpu:aarch64", + "@platforms//os:linux", + ], +) + +config_setting( + name = "windows", + constraint_values = [ + "@platforms//os:windows", + ], +) + +cc_library( + name = "libtorchtrt", + srcs = select({ + ":windows": [ + "lib/x64/torchtrt.dll", + ], + "//conditions:default": [ + "lib/libtorchtrt.so", + ], + }), + hdrs = glob([ + "include/**/*.h", + ]), + includes = ["include/"], + strip_include_prefix = "include", +) + +cc_library( + name = "libtorchtrt_runtime", + srcs = select({ + ":windows": [ + "lib/x64/torchtrt_runtime.dll", + ], + "//conditions:default": [ + "lib/libtorchtrt_runtime.so", + ], + }), +) + +cc_library( + name = "libtorchtrt_plugins", + srcs = select({ + ":windows": [ + "lib/x64/torchtrt_plugins.dll", + ], + "//conditions:default": [ + "lib/libtorchtrt_plugins.so", + ], + }), + hdrs = glob([ + "include/torch_tensorrt/core/plugins/**/*.h", + ]), + includes = ["include/"], + strip_include_prefix = "include", +) + +cc_library( + name = "torch_tensorrt_core_hdrs", + hdrs = glob([ + "include/torch_tensorrt/core/**/*.h", + ]), + includes = ["include/torch_tensorrt/"], + strip_include_prefix = "include/torch_tensorrt", +) + +# Alias for ease of use +cc_library( + name = "torch_tensorrt", + deps = [ + ":libtorchtrt", + ], +) From 5eac5e58883185daf871d67d239bb1d2f141cde0 Mon Sep 17 00:00:00 2001 From: apbose Date: Mon, 7 Jul 2025 14:26:13 -0700 Subject: [PATCH 3/5] removing the C++ library target not required by cpp and core tests --- third_party/BUILD | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/third_party/BUILD b/third_party/BUILD index b6c8ded980..28b50c39cd 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -1,9 +1,8 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) -load("@rules_cc//cc:defs.bzl", "cc_library") - config_setting( name = "aarch64_linux", constraint_values = [ @@ -36,35 +35,6 @@ cc_library( strip_include_prefix = "include", ) -cc_library( - name = "libtorchtrt_runtime", - srcs = select({ - ":windows": [ - "lib/x64/torchtrt_runtime.dll", - ], - "//conditions:default": [ - "lib/libtorchtrt_runtime.so", - ], - }), -) - -cc_library( - name = "libtorchtrt_plugins", - srcs = select({ - ":windows": [ - "lib/x64/torchtrt_plugins.dll", - ], - "//conditions:default": [ - "lib/libtorchtrt_plugins.so", - ], - }), - hdrs = glob([ - "include/torch_tensorrt/core/plugins/**/*.h", - ]), - includes = ["include/"], - strip_include_prefix = "include", -) - cc_library( name = "torch_tensorrt_core_hdrs", hdrs = glob([ From f48328764b5016c98cb5b734a4060579f4200f35 Mon Sep 17 00:00:00 2001 From: apbose Date: Tue, 5 Aug 2025 10:57:16 -0700 Subject: [PATCH 4/5] removing the bzl_def folder and adding torch_tensorrt bzl folder --- BUILD.bazel | 6 +-- MODULE.bazel | 10 ++-- bzl_def/WORKSPACE | 1 - docker/MODULE.bazel.ngc | 2 +- third_party/BUILD | 53 ------------------- {bzl_def => third_party/torch_tensorrt}/BUILD | 0 .../torch_tensorrt}/BUILD.bazel | 3 +- 7 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 bzl_def/WORKSPACE rename {bzl_def => third_party/torch_tensorrt}/BUILD (100%) rename {bzl_def => third_party/torch_tensorrt}/BUILD.bazel (80%) 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 b3c3560d9d..f833f790a2 100644 --- a/docker/MODULE.bazel.ngc +++ b/docker/MODULE.bazel.ngc @@ -31,7 +31,7 @@ new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local. # External dependency for torch_tensorrt if you already have precompiled binaries. new_local_repository( name = "torch_tensorrt", - build_file = "@//third_party:BUILD", + build_file = "@//third_party/torch_tensorrt:BUILD", path = "/usr/local/lib/python3.12/dist-packages/torch_tensorrt/", ) diff --git a/third_party/BUILD b/third_party/BUILD index 28b50c39cd..e69de29bb2 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -1,53 +0,0 @@ -load("@rules_cc//cc:cc_library.bzl", "cc_library") -load("@rules_cc//cc:defs.bzl", "cc_library") - -package(default_visibility = ["//visibility:public"]) - -config_setting( - name = "aarch64_linux", - constraint_values = [ - "@platforms//cpu:aarch64", - "@platforms//os:linux", - ], -) - -config_setting( - name = "windows", - constraint_values = [ - "@platforms//os:windows", - ], -) - -cc_library( - name = "libtorchtrt", - srcs = select({ - ":windows": [ - "lib/x64/torchtrt.dll", - ], - "//conditions:default": [ - "lib/libtorchtrt.so", - ], - }), - hdrs = glob([ - "include/**/*.h", - ]), - includes = ["include/"], - strip_include_prefix = "include", -) - -cc_library( - name = "torch_tensorrt_core_hdrs", - hdrs = glob([ - "include/torch_tensorrt/core/**/*.h", - ]), - includes = ["include/torch_tensorrt/"], - strip_include_prefix = "include/torch_tensorrt", -) - -# Alias for ease of use -cc_library( - name = "torch_tensorrt", - deps = [ - ":libtorchtrt", - ], -) 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 From 7b1c04c3619f4b99420fadbb1b02dcbfad3829bd Mon Sep 17 00:00:00 2001 From: apbose Date: Thu, 7 Aug 2025 14:46:09 -0700 Subject: [PATCH 5/5] add WAR comment --- docker/MODULE.bazel.ngc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/MODULE.bazel.ngc b/docker/MODULE.bazel.ngc index f833f790a2..137f49b16c 100644 --- a/docker/MODULE.bazel.ngc +++ b/docker/MODULE.bazel.ngc @@ -58,6 +58,9 @@ 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/",