From 8e421548a00ff0ed47707fdf1091c7650da912c8 Mon Sep 17 00:00:00 2001 From: Riley Jones Date: Wed, 16 Oct 2024 16:46:09 +0000 Subject: [PATCH 1/2] change source of java binary build rule --- tensorboard/BUILD | 6 +++--- tensorboard/defs/BUILD | 6 +++--- tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD | 2 ++ tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD | 2 +- tensorboard/plugins/histogram/BUILD | 2 +- tensorboard/plugins/hparams/BUILD | 6 +++--- tensorboard/plugins/image/BUILD | 2 +- tensorboard/plugins/mesh/BUILD | 2 +- tensorboard/plugins/pr_curve/BUILD | 2 +- tensorboard/plugins/projector/BUILD | 2 +- tensorboard/plugins/scalar/BUILD | 2 +- tensorboard/plugins/text/BUILD | 2 +- tensorboard/summary/BUILD | 2 +- tensorboard/util/BUILD | 2 +- third_party/workspace.bzl | 2 +- 15 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tensorboard/BUILD b/tensorboard/BUILD index 6d0badb1254..1a0a9ecfdfa 100644 --- a/tensorboard/BUILD +++ b/tensorboard/BUILD @@ -1,12 +1,12 @@ # Description: # TensorBoard, a dashboard for investigating TensorFlow -load("//tensorboard/defs:py_repl.bzl", "py_repl") -load("//tensorboard/defs:web.bzl", "tf_web_library") -load("//tensorboard/defs:zipper.bzl", "tensorboard_zip_file") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:py_repl.bzl", "py_repl") +load("//tensorboard/defs:web.bzl", "tf_web_library") +load("//tensorboard/defs:zipper.bzl", "tensorboard_zip_file") package(default_visibility = [":internal"]) diff --git a/tensorboard/defs/BUILD b/tensorboard/defs/BUILD index 54cdd450e2d..f4a9e99bc4c 100644 --- a/tensorboard/defs/BUILD +++ b/tensorboard/defs/BUILD @@ -1,8 +1,8 @@ -load("//tensorboard/defs:protos.bzl", "tb_proto_library") -load("@rules_python//python:py_binary.bzl", "py_binary") -load("@rules_python//python:py_test.bzl", "py_test") load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") load("@npm//@bazel/concatjs:index.bzl", "ts_library") +load("@rules_python//python:py_binary.bzl", "py_binary") +load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD b/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD index b404f31998a..33ed45428a1 100644 --- a/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD +++ b/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary") + package(default_visibility = ["//tensorboard:internal"]) licenses(["notice"]) diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD index b849cc35c73..5d5426180d2 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD @@ -1,5 +1,5 @@ -load("//tensorboard/defs:defs.bzl", "tf_ng_module", "tf_ng_web_test_suite", "tf_sass_binary", "tf_ts_library") load("@rules_python//python:py_binary.bzl", "py_binary") +load("//tensorboard/defs:defs.bzl", "tf_ng_module", "tf_ng_web_test_suite", "tf_sass_binary", "tf_ts_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/histogram/BUILD b/tensorboard/plugins/histogram/BUILD index 77fa2d1f0f8..0f652342aa1 100644 --- a/tensorboard/plugins/histogram/BUILD +++ b/tensorboard/plugins/histogram/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for histograms -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/hparams/BUILD b/tensorboard/plugins/hparams/BUILD index 74667a28195..15fa8486e87 100644 --- a/tensorboard/plugins/hparams/BUILD +++ b/tensorboard/plugins/hparams/BUILD @@ -1,12 +1,12 @@ # Description: # TensorBoard plugin for hparams -load("//tensorboard/defs:defs.bzl", "tf_ts_library") -load("//tensorboard/defs:web.bzl", "tf_web_library") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:defs.bzl", "tf_ts_library") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") +load("//tensorboard/defs:web.bzl", "tf_web_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/image/BUILD b/tensorboard/plugins/image/BUILD index 4ced32d7117..092873ace4f 100644 --- a/tensorboard/plugins/image/BUILD +++ b/tensorboard/plugins/image/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for images -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/mesh/BUILD b/tensorboard/plugins/mesh/BUILD index 14cc2d6459a..a042c328b14 100644 --- a/tensorboard/plugins/mesh/BUILD +++ b/tensorboard/plugins/mesh/BUILD @@ -1,7 +1,7 @@ -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/pr_curve/BUILD b/tensorboard/plugins/pr_curve/BUILD index 49ef7608273..6afb48c1197 100644 --- a/tensorboard/plugins/pr_curve/BUILD +++ b/tensorboard/plugins/pr_curve/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for precision-recall curves. -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/projector/BUILD b/tensorboard/plugins/projector/BUILD index bad14aa188b..e7962837e2f 100644 --- a/tensorboard/plugins/projector/BUILD +++ b/tensorboard/plugins/projector/BUILD @@ -1,9 +1,9 @@ # Embedding Projector plugin. -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/scalar/BUILD b/tensorboard/plugins/scalar/BUILD index 6a6d044f4e5..c7879cb725f 100644 --- a/tensorboard/plugins/scalar/BUILD +++ b/tensorboard/plugins/scalar/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for scalars -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/text/BUILD b/tensorboard/plugins/text/BUILD index 8476737993b..433bf21a691 100644 --- a/tensorboard/plugins/text/BUILD +++ b/tensorboard/plugins/text/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for the Text -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/summary/BUILD b/tensorboard/summary/BUILD index aeddf61a3b9..2eec391962e 100644 --- a/tensorboard/summary/BUILD +++ b/tensorboard/summary/BUILD @@ -1,9 +1,9 @@ # Description: # Summary API for TensorBoard. -load("//tensorboard/defs:py_repl.bzl", "py_repl") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:py_repl.bzl", "py_repl") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/util/BUILD b/tensorboard/util/BUILD index 2ff3470d047..c8c40f44b35 100644 --- a/tensorboard/util/BUILD +++ b/tensorboard/util/BUILD @@ -1,6 +1,6 @@ -load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/third_party/workspace.bzl b/third_party/workspace.bzl index 9f15e0b3b00..634fbc261ff 100644 --- a/third_party/workspace.bzl +++ b/third_party/workspace.bzl @@ -20,8 +20,8 @@ load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external") load("@io_bazel_rules_webtesting//web:web.bzl", "platform_archive") load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.3.bzl", "browser_repositories") load("//third_party:fonts.bzl", "tensorboard_fonts_workspace") -load("//third_party:python.bzl", "tensorboard_python_workspace") load("//third_party:js.bzl", "tensorboard_js_workspace") +load("//third_party:python.bzl", "tensorboard_python_workspace") load("//third_party:rust.bzl", "tensorboard_rust_workspace") def tensorboard_workspace(name = ""): From 2070b5c3d9cc835ba3749103c157f6e489632c99 Mon Sep 17 00:00:00 2001 From: Riley Jones Date: Thu, 17 Oct 2024 16:31:04 +0000 Subject: [PATCH 2/2] revert unwanted changes --- tensorboard/BUILD | 6 +++--- tensorboard/defs/BUILD | 6 +++--- tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD | 2 +- tensorboard/plugins/histogram/BUILD | 2 +- tensorboard/plugins/hparams/BUILD | 6 +++--- tensorboard/plugins/image/BUILD | 2 +- tensorboard/plugins/mesh/BUILD | 2 +- tensorboard/plugins/pr_curve/BUILD | 2 +- tensorboard/plugins/projector/BUILD | 2 +- tensorboard/plugins/scalar/BUILD | 2 +- tensorboard/plugins/text/BUILD | 2 +- tensorboard/summary/BUILD | 2 +- tensorboard/util/BUILD | 2 +- third_party/workspace.bzl | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tensorboard/BUILD b/tensorboard/BUILD index 1a0a9ecfdfa..6d0badb1254 100644 --- a/tensorboard/BUILD +++ b/tensorboard/BUILD @@ -1,12 +1,12 @@ # Description: # TensorBoard, a dashboard for investigating TensorFlow -load("@rules_python//python:py_binary.bzl", "py_binary") -load("@rules_python//python:py_library.bzl", "py_library") -load("@rules_python//python:py_test.bzl", "py_test") load("//tensorboard/defs:py_repl.bzl", "py_repl") load("//tensorboard/defs:web.bzl", "tf_web_library") load("//tensorboard/defs:zipper.bzl", "tensorboard_zip_file") +load("@rules_python//python:py_binary.bzl", "py_binary") +load("@rules_python//python:py_library.bzl", "py_library") +load("@rules_python//python:py_test.bzl", "py_test") package(default_visibility = [":internal"]) diff --git a/tensorboard/defs/BUILD b/tensorboard/defs/BUILD index f4a9e99bc4c..54cdd450e2d 100644 --- a/tensorboard/defs/BUILD +++ b/tensorboard/defs/BUILD @@ -1,8 +1,8 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") -load("@npm//@bazel/concatjs:index.bzl", "ts_library") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") +load("@npm//@bazel/concatjs:index.bzl", "ts_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD index 5d5426180d2..b849cc35c73 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD @@ -1,5 +1,5 @@ -load("@rules_python//python:py_binary.bzl", "py_binary") load("//tensorboard/defs:defs.bzl", "tf_ng_module", "tf_ng_web_test_suite", "tf_sass_binary", "tf_ts_library") +load("@rules_python//python:py_binary.bzl", "py_binary") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/histogram/BUILD b/tensorboard/plugins/histogram/BUILD index 0f652342aa1..77fa2d1f0f8 100644 --- a/tensorboard/plugins/histogram/BUILD +++ b/tensorboard/plugins/histogram/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for histograms +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/hparams/BUILD b/tensorboard/plugins/hparams/BUILD index 15fa8486e87..74667a28195 100644 --- a/tensorboard/plugins/hparams/BUILD +++ b/tensorboard/plugins/hparams/BUILD @@ -1,12 +1,12 @@ # Description: # TensorBoard plugin for hparams +load("//tensorboard/defs:defs.bzl", "tf_ts_library") +load("//tensorboard/defs:web.bzl", "tf_web_library") +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:defs.bzl", "tf_ts_library") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") -load("//tensorboard/defs:web.bzl", "tf_web_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/image/BUILD b/tensorboard/plugins/image/BUILD index 092873ace4f..4ced32d7117 100644 --- a/tensorboard/plugins/image/BUILD +++ b/tensorboard/plugins/image/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for images +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/mesh/BUILD b/tensorboard/plugins/mesh/BUILD index a042c328b14..14cc2d6459a 100644 --- a/tensorboard/plugins/mesh/BUILD +++ b/tensorboard/plugins/mesh/BUILD @@ -1,7 +1,7 @@ +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/pr_curve/BUILD b/tensorboard/plugins/pr_curve/BUILD index 6afb48c1197..49ef7608273 100644 --- a/tensorboard/plugins/pr_curve/BUILD +++ b/tensorboard/plugins/pr_curve/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for precision-recall curves. +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/projector/BUILD b/tensorboard/plugins/projector/BUILD index e7962837e2f..bad14aa188b 100644 --- a/tensorboard/plugins/projector/BUILD +++ b/tensorboard/plugins/projector/BUILD @@ -1,9 +1,9 @@ # Embedding Projector plugin. +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/scalar/BUILD b/tensorboard/plugins/scalar/BUILD index c7879cb725f..6a6d044f4e5 100644 --- a/tensorboard/plugins/scalar/BUILD +++ b/tensorboard/plugins/scalar/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for scalars +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/plugins/text/BUILD b/tensorboard/plugins/text/BUILD index 433bf21a691..8476737993b 100644 --- a/tensorboard/plugins/text/BUILD +++ b/tensorboard/plugins/text/BUILD @@ -1,10 +1,10 @@ # Description: # TensorBoard plugin for the Text +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/summary/BUILD b/tensorboard/summary/BUILD index 2eec391962e..aeddf61a3b9 100644 --- a/tensorboard/summary/BUILD +++ b/tensorboard/summary/BUILD @@ -1,9 +1,9 @@ # Description: # Summary API for TensorBoard. +load("//tensorboard/defs:py_repl.bzl", "py_repl") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:py_repl.bzl", "py_repl") package(default_visibility = ["//tensorboard:internal"]) diff --git a/tensorboard/util/BUILD b/tensorboard/util/BUILD index c8c40f44b35..2ff3470d047 100644 --- a/tensorboard/util/BUILD +++ b/tensorboard/util/BUILD @@ -1,6 +1,6 @@ +load("//tensorboard/defs:protos.bzl", "tb_proto_library") load("@rules_python//python:py_library.bzl", "py_library") load("@rules_python//python:py_test.bzl", "py_test") -load("//tensorboard/defs:protos.bzl", "tb_proto_library") package(default_visibility = ["//tensorboard:internal"]) diff --git a/third_party/workspace.bzl b/third_party/workspace.bzl index 634fbc261ff..9f15e0b3b00 100644 --- a/third_party/workspace.bzl +++ b/third_party/workspace.bzl @@ -20,8 +20,8 @@ load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external") load("@io_bazel_rules_webtesting//web:web.bzl", "platform_archive") load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.3.bzl", "browser_repositories") load("//third_party:fonts.bzl", "tensorboard_fonts_workspace") -load("//third_party:js.bzl", "tensorboard_js_workspace") load("//third_party:python.bzl", "tensorboard_python_workspace") +load("//third_party:js.bzl", "tensorboard_js_workspace") load("//third_party:rust.bzl", "tensorboard_rust_workspace") def tensorboard_workspace(name = ""):