cherry pick: fix pkg_zip nested zip issue from 2.9 to main (#3862)

Author: lanluo-nvidia

BUILD.bazel

@@ -43,19 +43,6 @@ pkg_tar(
     ],
 )
 
-pkg_zip(
-    name = "include_core_zip",
-    srcs = [
-        "//core:include_zip",
-        "//core/plugins:impl_include_zip",
-        "//core/plugins:include_zip",
-        "//core/runtime:include_zip",
-        "//core/util:include_zip",
-        "//core/util/logging:include_zip",
-    ],
-    out = "include_core.zip",
-    package_dir = "include/torch_tensorrt",
-)
 
 pkg_tar(
     name = "include_rt",
@@ -65,15 +52,6 @@ pkg_tar(
     ],
 )
 
-pkg_zip(
-    name = "include_rt_zip",
-    srcs = [
-        "//core/runtime:include",
-    ],
-    out = "include_rt.zip",
-    package_dir = "include/torch_tensorrt",
-)
-
 pkg_tar(
     name = "include",
     srcs = [
@@ -82,15 +60,6 @@ pkg_tar(
     package_dir = "include/torch_tensorrt/",
 )
 
-pkg_zip(
-    name = "include_zip",
-    srcs = [
-        "//cpp:api_headers",
-    ],
-    out = "include.zip",
-    package_dir = "include/torch_tensorrt/",
-)
-
 # Non-Windows tar target for lib
 pkg_tar(
     name = "lib",
@@ -103,15 +72,6 @@ pkg_tar(
     package_dir = "lib/",
 )
 
-# Windows-specific zip target for lib
-pkg_zip(
-    name = "lib_zip",
-    srcs = ["//cpp/lib:torchtrt.dll"],
-    out = "lib.zip",
-    mode = "0755",
-    package_dir = "lib/",
-)
-
 # Non-Windows tar target for lib_rt
 pkg_tar(
     name = "lib_rt",
@@ -120,15 +80,6 @@ pkg_tar(
     package_dir = "lib/",
 )
 
-# Windows-specific zip target for lib_rt
-pkg_zip(
-    name = "lib_rt_zip",
-    srcs = ["//cpp/lib:torchtrt_runtime.dll"],
-    out = "lib_rt.zip",
-    mode = "0755",
-    package_dir = "lib/",
-)
-
 pkg_tar(
     name = "bin",
     srcs = [
@@ -142,9 +93,12 @@ pkg_tar(
 pkg_zip(
     name = "libtorchtrt_zip",
     srcs = [
-        ":include_core_zip",
-        ":include_zip",
-        ":lib_zip",
+        "//core/plugins:impl_include_pkg_files",
+        "//core:include_pkg_files",
+        "//core/runtime:include_pkg_files",
+        "//core/util:include_pkg_files",
+        "//core/util/logging:include_pkg_files",
+        "//cpp/lib:lib_pkg_files",
         "//:LICENSE",
         "//third_party/torch_tensorrt:BUILD",
     ],
@@ -183,19 +137,6 @@ alias(
     }),
 )
 
-# Windows-specific zip target for runtime
-pkg_zip(
-    name = "libtorchtrt_runtime_zip",
-    srcs = [
-        ":include_rt_zip",
-        ":lib_rt_zip",
-        "//:LICENSE",
-        "//third_party/torch_tensorrt:BUILD",
-    ],
-    out = "libtorchtrt_runtime.zip",
-    package_dir = "torch_tensorrt_runtime",
-)
-
 # Non-Windows tar target for runtime
 pkg_tar(
     name = "libtorchtrt_runtime_tar",

core/BUILD

@@ -1,6 +1,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar", "pkg_zip")
-
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
@@ -104,11 +104,11 @@ pkg_tar(
     package_dir = "core/",
 )
 
-pkg_zip(
-    name = "include_zip",
+pkg_files(
+    name = "include_pkg_files",
     srcs = [
         "compiler.h",
     ],
-    out = "include.zip",
-    package_dir = "core/",
+    visibility = ["//visibility:public"],
+    prefix = "include/torch_tensorrt/core/",
 )

core/plugins/BUILD

@@ -1,6 +1,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar", "pkg_zip")
-
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
@@ -127,13 +127,6 @@ pkg_tar(
     package_dir = "core/plugins/",
 )
 
-pkg_zip(
-    name = "include_zip",
-    srcs = ["plugins.h"],
-    out = "include.zip",
-    package_dir = "core/plugins/",
-)
-
 filegroup(
     name = "impl_include_files",
     srcs = [
@@ -143,15 +136,15 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-pkg_tar(
-    name = "impl_include",
+pkg_files(
+    name = "impl_include_pkg_files",
     srcs = [":impl_include_files"],
-    package_dir = "core/plugins/impl",
+    visibility = ["//visibility:public"],
+    prefix = "include/torch_tensorrt/core/plugins/impl",
 )
 
-pkg_zip(
-    name = "impl_include_zip",
+pkg_tar(
+    name = "impl_include",
     srcs = [":impl_include_files"],
-    out = "impl_include.zip",
     package_dir = "core/plugins/impl",
 )

core/runtime/BUILD

@@ -1,6 +1,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar", "pkg_zip")
-
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
@@ -118,9 +118,9 @@ pkg_tar(
     package_dir = "core/runtime/",
 )
 
-pkg_zip(
-    name = "include_zip",
+pkg_files(
+    name = "include_pkg_files",
     srcs = [":include_files"],
-    out = "include.zip",
-    package_dir = "core/runtime/",
+    visibility = ["//visibility:public"],
+    prefix = "include/torch_tensorrt/core/runtime/",
 )

core/util/BUILD

@@ -1,6 +1,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar", "pkg_zip")
-
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
@@ -172,9 +172,9 @@ pkg_tar(
     package_dir = "core/util/",
 )
 
-pkg_zip(
-    name = "include_zip",
+pkg_files(
+    name = "include_pkg_files",
     srcs = ["//core/util:include_files"],
-    out = "include.zip",
-    package_dir = "core/util/",
+    visibility = ["//visibility:public"],
+    prefix = "include/torch_tensorrt/core/util/",
 )

core/util/logging/BUILD

@@ -1,6 +1,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_pkg//:pkg.bzl", "pkg_tar", "pkg_zip")
-
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
@@ -86,9 +86,9 @@ pkg_tar(
     package_dir = "core/util/logging",
 )
 
-pkg_zip(
-    name = "include_zip",
+pkg_files(
+    name = "include_pkg_files",
     srcs = ["TorchTRTLogger.h"],
-    out = "include.zip",
-    package_dir = "core/util/logging",
+    visibility = ["//visibility:public"],
+    prefix = "include/torch_tensorrt/core/util/logging/",
 )

cpp/lib/BUILD

@@ -1,5 +1,5 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
-
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 package(default_visibility = ["//visibility:public"])
 
 cc_binary(
@@ -53,3 +53,11 @@ cc_binary(
         "//core/runtime",
     ],
 )
+
+
+pkg_files(
+    name = "lib_pkg_files",
+    srcs = ["torchtrt.dll"],
+    visibility = ["//visibility:public"],
+    prefix = "lib/",
+)