From a0e2b971b0ae71766677a459cd2f6a1d7f427f5a Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Wed, 12 Jun 2019 11:31:14 -0700 Subject: [PATCH] Adjust structure of all BUILD files to recommended style (https://docs.bazel.build/versions/master/skylark/build-style.html#file-structure), moving loads to top. PiperOrigin-RevId: 252864967 --- tensorflow/compiler/jit/BUILD | 8 ++++---- tensorflow/compiler/jit/ops/BUILD | 4 ++-- tensorflow/compiler/xrt/tests/BUILD | 12 ++++++------ tensorflow/core/debug/BUILD | 13 ++++--------- tensorflow/core/kernels/boosted_trees/BUILD | 16 ++++++++-------- tensorflow/core/profiler/BUILD | 8 +++----- tensorflow/core/profiler/rpc/BUILD | 4 ++-- tensorflow/core/protobuf/tpu/BUILD | 12 ++++++------ tensorflow/examples/label_image/BUILD | 4 ++-- tensorflow/examples/speech_commands/BUILD | 6 ++---- tensorflow/examples/wav_to_spectrogram/BUILD | 5 ++--- tensorflow/lite/delegates/gpu/gl/kernels/BUILD | 4 ++-- tensorflow/lite/examples/minimal/BUILD | 4 ++-- tensorflow/lite/experimental/swift/BUILD.apple | 8 ++++---- tensorflow/lite/python/optimize/BUILD | 4 ++-- tensorflow/lite/tools/evaluation/BUILD | 4 ++-- tensorflow/python/compat/BUILD | 4 ++-- tensorflow/python/compiler/BUILD | 4 ++-- tensorflow/python/debug/BUILD | 9 +++------ tensorflow/python/kernel_tests/random/BUILD | 7 +++---- tensorflow/python/module/BUILD | 4 ++-- tensorflow/python/ops/distributions/BUILD | 2 -- tensorflow/tools/test/BUILD | 11 +++++------ 23 files changed, 70 insertions(+), 87 deletions(-) diff --git a/tensorflow/compiler/jit/BUILD b/tensorflow/compiler/jit/BUILD index 77e7a22d1ae..79822437d76 100644 --- a/tensorflow/compiler/jit/BUILD +++ b/tensorflow/compiler/jit/BUILD @@ -1,3 +1,7 @@ +load("//tensorflow:tensorflow.bzl", "tf_cc_test", "cc_header_only_library") +load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda") +load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library") + package( default_visibility = [ ":internal", @@ -22,10 +26,6 @@ package_group( ], ) -load("//tensorflow:tensorflow.bzl", "tf_cc_test", "cc_header_only_library") -load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda") -load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library") - # Target that bundles up the XLA CPU and GPU JIT devices. cc_library( name = "jit", diff --git a/tensorflow/compiler/jit/ops/BUILD b/tensorflow/compiler/jit/ops/BUILD index 3b7a74ec780..afc96a8e68c 100644 --- a/tensorflow/compiler/jit/ops/BUILD +++ b/tensorflow/compiler/jit/ops/BUILD @@ -1,10 +1,10 @@ +load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py") + package( default_visibility = ["//tensorflow/compiler/tf2xla:internal"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py") - cc_library( name = "xla_ops", srcs = ["xla_ops.cc"], diff --git a/tensorflow/compiler/xrt/tests/BUILD b/tensorflow/compiler/xrt/tests/BUILD index f8341e1ee0f..cc6ab9a3ed4 100644 --- a/tensorflow/compiler/xrt/tests/BUILD +++ b/tensorflow/compiler/xrt/tests/BUILD @@ -1,3 +1,9 @@ +load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_cuda_cc_test") +load( + "//tensorflow/core:platform/default/build_config_root.bzl", + "tf_cuda_tests_tags", +) + package( default_visibility = [ "//learning/brain:__subpackages__", @@ -6,12 +12,6 @@ package( licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_cuda_cc_test") -load( - "//tensorflow/core:platform/default/build_config_root.bzl", - "tf_cuda_tests_tags", -) - cc_library( name = "raw_api_test_lib", testonly = 1, diff --git a/tensorflow/core/debug/BUILD b/tensorflow/core/debug/BUILD index f4eca1c691b..4a0d88580a0 100644 --- a/tensorflow/core/debug/BUILD +++ b/tensorflow/core/debug/BUILD @@ -12,11 +12,6 @@ # a watch state. # ":debug_node_key" - Defines a struct used for tracking tensors. -package( - default_visibility = ["//tensorflow:internal"], - licenses = ["notice"], # Apache 2.0 -) - load( "//tensorflow:tensorflow.bzl", "check_deps", @@ -31,11 +26,11 @@ load( "tf_additional_all_protos", "tf_kernel_tests_linkstatic", "tf_proto_library", - "tf_proto_library_cc", ) -load( - "//tensorflow/core:platform/default/build_config_root.bzl", - "tf_cuda_tests_tags", + +package( + default_visibility = ["//tensorflow:internal"], + licenses = ["notice"], # Apache 2.0 ) # Check that tensorflow/core:tensorflow does not depend on grpc. diff --git a/tensorflow/core/kernels/boosted_trees/BUILD b/tensorflow/core/kernels/boosted_trees/BUILD index ac94371de14..f6414c8d38e 100644 --- a/tensorflow/core/kernels/boosted_trees/BUILD +++ b/tensorflow/core/kernels/boosted_trees/BUILD @@ -1,14 +1,6 @@ # Description: # OpKernels for boosted trees ops. -package( - default_visibility = [ - "//tensorflow:__subpackages__", - "//tensorflow:internal", - ], - licenses = ["notice"], # Apache 2.0 -) - load( "//tensorflow:tensorflow.bzl", "tf_cc_test", @@ -19,6 +11,14 @@ load( "tf_proto_library", ) +package( + default_visibility = [ + "//tensorflow:__subpackages__", + "//tensorflow:internal", + ], + licenses = ["notice"], # Apache 2.0 +) + tf_proto_library( name = "boosted_trees_proto", srcs = [ diff --git a/tensorflow/core/profiler/BUILD b/tensorflow/core/profiler/BUILD index 410c7582ffa..151cbe6166e 100644 --- a/tensorflow/core/profiler/BUILD +++ b/tensorflow/core/profiler/BUILD @@ -1,13 +1,11 @@ +load("//tensorflow:tensorflow.bzl", "tf_cc_binary") +load("//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library", "tf_additional_all_protos", "tf_profiler_all_protos") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "tf_cc_binary") -load("//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library") -load("//tensorflow/core:platform/default/build_config.bzl", "tf_additional_all_protos") -load("//tensorflow/core:platform/default/build_config.bzl", "tf_profiler_all_protos") - tf_cc_binary( name = "profiler", srcs = ["profiler.cc"], diff --git a/tensorflow/core/profiler/rpc/BUILD b/tensorflow/core/profiler/rpc/BUILD index 8d027a18d87..53be5f11b48 100644 --- a/tensorflow/core/profiler/rpc/BUILD +++ b/tensorflow/core/profiler/rpc/BUILD @@ -1,10 +1,10 @@ +load("//tensorflow:tensorflow.bzl", "tf_cuda_library") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "tf_cuda_library") - tf_cuda_library( name = "profiler_service_impl", srcs = ["profiler_service_impl.cc"], diff --git a/tensorflow/core/protobuf/tpu/BUILD b/tensorflow/core/protobuf/tpu/BUILD index 86c324780cb..146939ba954 100644 --- a/tensorflow/core/protobuf/tpu/BUILD +++ b/tensorflow/core/protobuf/tpu/BUILD @@ -1,9 +1,3 @@ -package( - licenses = ["notice"], # Apache 2.0 -) - -exports_files(["LICENSE"]) - load( "//tensorflow/core:platform/default/build_config.bzl", "tf_additional_all_protos", @@ -11,6 +5,12 @@ load( "tf_proto_library_py", ) +package( + licenses = ["notice"], # Apache 2.0 +) + +exports_files(["LICENSE"]) + tf_proto_library( name = "tpu_embedding_configuration_proto", srcs = [ diff --git a/tensorflow/examples/label_image/BUILD b/tensorflow/examples/label_image/BUILD index 9f8e9a67ce3..efa637db03f 100644 --- a/tensorflow/examples/label_image/BUILD +++ b/tensorflow/examples/label_image/BUILD @@ -1,6 +1,8 @@ # Description: # TensorFlow C++ inference example for labeling images. +load("//tensorflow:tensorflow.bzl", "tf_cc_binary") + package( default_visibility = ["//tensorflow:internal"], licenses = ["notice"], # Apache 2.0 @@ -10,8 +12,6 @@ exports_files(["LICENSE"]) exports_files(["data/grace_hopper.jpg"]) -load("//tensorflow:tensorflow.bzl", "tf_cc_binary") - tf_cc_binary( name = "label_image", srcs = [ diff --git a/tensorflow/examples/speech_commands/BUILD b/tensorflow/examples/speech_commands/BUILD index 23e3c5760f2..53ff2318b11 100644 --- a/tensorflow/examples/speech_commands/BUILD +++ b/tensorflow/examples/speech_commands/BUILD @@ -1,3 +1,5 @@ +load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test", "tf_py_test") + package( default_visibility = [ "//visibility:public", @@ -9,10 +11,6 @@ exports_files([ "LICENSE", ]) -load("//tensorflow:tensorflow.bzl", "tf_cc_binary") -load("//tensorflow:tensorflow.bzl", "tf_cc_test") -load("//tensorflow:tensorflow.bzl", "tf_py_test") - py_library( name = "models", srcs = [ diff --git a/tensorflow/examples/wav_to_spectrogram/BUILD b/tensorflow/examples/wav_to_spectrogram/BUILD index 2303cfb1b39..9aeaf9414ae 100644 --- a/tensorflow/examples/wav_to_spectrogram/BUILD +++ b/tensorflow/examples/wav_to_spectrogram/BUILD @@ -1,6 +1,8 @@ # Description: # TensorFlow C++ inference example for labeling images. +load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test") + package( default_visibility = ["//tensorflow:internal"], licenses = ["notice"], # Apache 2.0 @@ -8,9 +10,6 @@ package( exports_files(["LICENSE"]) -load("//tensorflow:tensorflow.bzl", "tf_cc_binary") -load("//tensorflow:tensorflow.bzl", "tf_cc_test") - cc_library( name = "wav_to_spectrogram_lib", srcs = ["wav_to_spectrogram.cc"], diff --git a/tensorflow/lite/delegates/gpu/gl/kernels/BUILD b/tensorflow/lite/delegates/gpu/gl/kernels/BUILD index d627e62744a..eac397ffc8d 100644 --- a/tensorflow/lite/delegates/gpu/gl/kernels/BUILD +++ b/tensorflow/lite/delegates/gpu/gl/kernels/BUILD @@ -1,10 +1,10 @@ +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") - cc_library( name = "add", srcs = ["add.cc"], diff --git a/tensorflow/lite/examples/minimal/BUILD b/tensorflow/lite/examples/minimal/BUILD index 907e02f1bc5..a2276d8411a 100644 --- a/tensorflow/lite/examples/minimal/BUILD +++ b/tensorflow/lite/examples/minimal/BUILD @@ -1,13 +1,13 @@ # Description: # TensorFlow Lite minimal example. +load("//tensorflow/lite:build_def.bzl", "tflite_linkopts") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow/lite:build_def.bzl", "tflite_linkopts") - cc_binary( name = "minimal", srcs = [ diff --git a/tensorflow/lite/experimental/swift/BUILD.apple b/tensorflow/lite/experimental/swift/BUILD.apple index 7e0bf94dfca..a26fef2177e 100644 --- a/tensorflow/lite/experimental/swift/BUILD.apple +++ b/tensorflow/lite/experimental/swift/BUILD.apple @@ -1,14 +1,14 @@ # TensorFlow Lite for Swift +load("//tensorflow/lite/experimental/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION") +load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_unit_test") +load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") + package( default_visibility = ["//visibility:private"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow/lite/experimental/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION") -load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_unit_test") -load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") - swift_library( name = "TensorFlowLite", srcs = glob(["Sources/*.swift"]), diff --git a/tensorflow/lite/python/optimize/BUILD b/tensorflow/lite/python/optimize/BUILD index 07e597813f7..9bf81f1a92b 100644 --- a/tensorflow/lite/python/optimize/BUILD +++ b/tensorflow/lite/python/optimize/BUILD @@ -1,10 +1,10 @@ +load("//tensorflow:tensorflow.bzl", "tf_py_wrap_cc") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "tf_py_wrap_cc") - cc_library( name = "calibration_wrapper_lib", srcs = ["calibration_wrapper.cc"], diff --git a/tensorflow/lite/tools/evaluation/BUILD b/tensorflow/lite/tools/evaluation/BUILD index b5d7cdeb0ba..fe8c7117e09 100644 --- a/tensorflow/lite/tools/evaluation/BUILD +++ b/tensorflow/lite/tools/evaluation/BUILD @@ -13,13 +13,13 @@ # limitations under the License. # ============================================================================== +load("//tensorflow/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") - exports_files(glob([ "testdata/**", ])) diff --git a/tensorflow/python/compat/BUILD b/tensorflow/python/compat/BUILD index 8b7f9b5fecf..43f4a67b47d 100644 --- a/tensorflow/python/compat/BUILD +++ b/tensorflow/python/compat/BUILD @@ -1,11 +1,11 @@ +load("//tensorflow:tensorflow.bzl", "tf_py_test") + package( licenses = ["notice"], # Apache 2.0 ) exports_files(["LICENSE"]) -load("//tensorflow:tensorflow.bzl", "tf_py_test") - py_library( name = "v2_compat", srcs = ["v2_compat.py"], diff --git a/tensorflow/python/compiler/BUILD b/tensorflow/python/compiler/BUILD index 2079e0fb7ad..9d3aa19d44d 100644 --- a/tensorflow/python/compiler/BUILD +++ b/tensorflow/python/compiler/BUILD @@ -1,13 +1,13 @@ # Description: # Python APIs for various Tensorflow backends. +load("//tensorflow:tensorflow.bzl", "if_not_windows") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "if_not_windows") - exports_files(["LICENSE"]) py_library( diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD index caf889cefdf..3c19804f0c1 100644 --- a/tensorflow/python/debug/BUILD +++ b/tensorflow/python/debug/BUILD @@ -8,6 +8,9 @@ # For a user interface walkthrough, see https://www.tensorflow.org/guide/debugger # ":grpc_debug_server": Server interface for grpc:// debug URLs. +load("//tensorflow:tensorflow.bzl", "cuda_py_test") +load("//tensorflow:tensorflow.bzl", "py_test", "py_binary", "if_not_v2", "if_not_windows") + package( default_visibility = ["//tensorflow:internal"], licenses = ["notice"], # Apache 2.0 @@ -15,12 +18,6 @@ package( exports_files(["LICENSE"]) -load("//tensorflow:tensorflow.bzl", "cuda_py_test") -load("//tensorflow:tensorflow.bzl", "py_test") -load("//tensorflow:tensorflow.bzl", "py_binary") -load("//tensorflow:tensorflow.bzl", "if_not_v2") -load("//tensorflow:tensorflow.bzl", "if_not_windows") - py_library( name = "debug_py", srcs = ["__init__.py"], diff --git a/tensorflow/python/kernel_tests/random/BUILD b/tensorflow/python/kernel_tests/random/BUILD index 09a73d4e19a..340a39903e1 100644 --- a/tensorflow/python/kernel_tests/random/BUILD +++ b/tensorflow/python/kernel_tests/random/BUILD @@ -1,14 +1,13 @@ # Tests of TensorFlow kernels written using the Python API. +load("//tensorflow:tensorflow.bzl", "tf_py_test") +load("//tensorflow:tensorflow.bzl", "cuda_py_test") + package( default_visibility = ["//tensorflow:internal"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "tf_py_test") -load("//tensorflow:tensorflow.bzl", "cuda_py_test") -load("//tensorflow:tensorflow.bzl", "sycl_py_test") - # CPU only tests should use tf_py_test, GPU tests use cuda_py_test # Please avoid the py_tests and cuda_py_tests (plural) while we # fix the shared/overbroad dependencies. diff --git a/tensorflow/python/module/BUILD b/tensorflow/python/module/BUILD index e2c8f6c8370..ed397cd04bd 100644 --- a/tensorflow/python/module/BUILD +++ b/tensorflow/python/module/BUILD @@ -1,10 +1,10 @@ +load("//tensorflow:tensorflow.bzl", "tf_py_test") + package( default_visibility = ["//tensorflow:internal"], licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "tf_py_test") - exports_files(["LICENSE"]) py_library( diff --git a/tensorflow/python/ops/distributions/BUILD b/tensorflow/python/ops/distributions/BUILD index 3aec4c18202..53b48827907 100644 --- a/tensorflow/python/ops/distributions/BUILD +++ b/tensorflow/python/ops/distributions/BUILD @@ -3,8 +3,6 @@ package( licenses = ["notice"], # Apache 2.0 ) -load("//tensorflow:tensorflow.bzl", "py_test") - py_library( name = "distributions", srcs = glob( diff --git a/tensorflow/tools/test/BUILD b/tensorflow/tools/test/BUILD index 191d6c4130b..20cbcd18b20 100644 --- a/tensorflow/tools/test/BUILD +++ b/tensorflow/tools/test/BUILD @@ -1,17 +1,16 @@ # Description: # Tools for testing -package( - default_visibility = ["//tensorflow:internal"], - licenses = ["notice"], # Apache 2.0 -) - load( "//tensorflow/tools/test:performance.bzl", "tf_cc_logged_benchmark", "tf_py_logged_benchmark", ) -load("//tensorflow:tensorflow.bzl", "py_test") + +package( + default_visibility = ["//tensorflow:internal"], + licenses = ["notice"], # Apache 2.0 +) exports_files(["LICENSE"])