web.bzl: avoid depset union operators

Summary: The `+`, `+=`, and `|` operators on depsets, as well as `depset.union`, are deprecated due to performance problems: <bazelbuild/bazel#5817> As of a recent Bazel commit, `.union` is removed is removed entirely, so the operators may be soon on the chopping block: <bazelbuild/bazel@693963f> This commit removes remaining uses from TensorBoard. Google-internal source: <http://cl/283060975> (thanks, @laurentlb!). Test Plan: Running `bazel run //tensorboard` still works. Co-authored-by: Laurent Le Brun <[email protected]> wchargin-branch: remove-depset-union
tensorflow · Dec 4, 2019 · bc445d0 · bc445d0
1 parent fd4183f
commit bc445d0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tensorboard/defs/web.bzl b/tensorboard/defs/web.bzl
@@ -203,11 +203,13 @@ def _tf_web_library(ctx):
     # If a rule exists purely to export other build rules, then it's
     # appropriate for the exported sources to be included in the
     # development web server.
-    devserver_manifests = depset(order="postorder")
     export_deps = unfurl(ctx.attr.exports)
-    for dep in export_deps:
-      devserver_manifests += dep.webfiles.manifests
-    devserver_manifests = manifests + devserver_manifests
+    devserver_manifests = depset(
+        order = "postorder",
+        transitive = (
+            [manifests] + [dep.webfiles.manifests for dep in export_deps]
+        ),
+    )
   params = struct(
       label=str(ctx.label),
       bind="localhost:6006",