n/a

PiperOrigin-RevId: 232043298
2019-02-01 14:58:58 -08:00 · 2019-02-01 14:58:58 -08:00 · 522e0f7a55
commit 522e0f7a55
parent 2af9fe8670
7 changed files with 142 additions and 23 deletions
--- a/tensorflow/examples/speech_commands/BUILD
+++ b/tensorflow/examples/speech_commands/BUILD
@ -88,6 +88,13 @@ tf_py_test(

 py_binary(
    name = "freeze",
+    srcs = ["freeze.py"],
+    srcs_version = "PY2AND3",
+    deps = [":freeze_lib"],
+)
+
+py_library(
+    name = "freeze_lib",
    srcs = [
        "freeze.py",
    ],
@ -113,6 +120,13 @@ tf_py_test(

 py_binary(
    name = "wav_to_features",
+    srcs = ["wav_to_features.py"],
+    srcs_version = "PY2AND3",
+    deps = [":wav_to_features_lib"],
+)
+
+py_library(
+    name = "wav_to_features_lib",
    srcs = [
        "wav_to_features.py",
    ],
@ -138,6 +152,13 @@ tf_py_test(

 py_binary(
    name = "generate_streaming_test_wav",
+    srcs = ["generate_streaming_test_wav.py"],
+    srcs_version = "PY2AND3",
+    deps = [":generate_streaming_test_wav_lib"],
+)
+
+py_library(
+    name = "generate_streaming_test_wav_lib",
    srcs = [
        "generate_streaming_test_wav.py",
    ],
@ -178,6 +199,13 @@ tf_cc_binary(

 py_binary(
    name = "label_wav",
+    srcs = ["label_wav.py"],
+    srcs_version = "PY2AND3",
+    deps = [":label_wav_lib"],
+)
+
+py_library(
+    name = "label_wav_lib",
    srcs = [
        "label_wav.py",
    ],
--- a/tensorflow/lite/experimental/examples/lstm/BUILD
+++ b/tensorflow/lite/experimental/examples/lstm/BUILD
@ -46,7 +46,7 @@ py_test(
        "//tensorflow/lite/python:lite",
        "//tensorflow/python:framework",
        "//tensorflow/python:platform",
-        "//tensorflow/python/tools:optimize_for_inference",
+        "//tensorflow/python/tools:optimize_for_inference_lib",
        "//third_party/py/numpy",
        "@six_archive//:six",
    ],
--- a/tensorflow/lite/python/BUILD
+++ b/tensorflow/lite/python/BUILD
@ -40,6 +40,14 @@ py_binary(
    srcs = ["tflite_convert.py"],
    srcs_version = "PY2AND3",
    visibility = ["//visibility:public"],
+    deps = [":tflite_convert_lib"],
+)
+
+py_library(
+    name = "tflite_convert_lib",
+    srcs = ["tflite_convert.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
    deps = [
        ":lite",
    ],
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@ -47,7 +47,7 @@ py_library(
        ":cli_test_utils",
        ":debug_py",
        ":grpc_debug_test_server",
-        ":offline_analyzer",
+        ":offline_analyzer_lib",
        ":session_debug_testlib",
        ":source_remote",
    ] + if_not_windows([
@ -393,6 +393,13 @@ py_binary(
    name = "offline_analyzer",
    srcs = ["cli/offline_analyzer.py"],
    srcs_version = "PY2AND3",
+    deps = [":offline_analyzer_lib"],
+)
+
+py_library(
+    name = "offline_analyzer_lib",
+    srcs = ["cli/offline_analyzer.py"],
+    srcs_version = "PY2AND3",
    deps = [
        ":analyzer_cli",
        ":debug_data",
@ -404,12 +411,12 @@ py_binary(
 py_library(
    name = "debug_examples",
    deps = [
-        ":debug_errors",
-        ":debug_fibonacci",
-        ":debug_keras",
+        ":debug_errors_lib",
+        ":debug_fibonacci_lib",
+        ":debug_keras_lib",
    ] + if_not_v2([
-        ":debug_mnist",
-        ":debug_tflearn_iris",
+        ":debug_mnist_lib",
+        ":debug_tflearn_iris_lib",
    ]),
 )

@ -417,6 +424,13 @@ py_binary(
    name = "debug_fibonacci",
    srcs = ["examples/debug_fibonacci.py"],
    srcs_version = "PY2AND3",
+    deps = [":debug_fibonacci_lib"],
+)
+
+py_library(
+    name = "debug_fibonacci_lib",
+    srcs = ["examples/debug_fibonacci.py"],
+    srcs_version = "PY2AND3",
    deps = [
        ":debug_py",
        "//tensorflow:tensorflow_py",
@ -429,6 +443,13 @@ py_binary(
    name = "debug_errors",
    srcs = ["examples/debug_errors.py"],
    srcs_version = "PY2AND3",
+    deps = [":debug_errors_lib"],
+)
+
+py_library(
+    name = "debug_errors_lib",
+    srcs = ["examples/debug_errors.py"],
+    srcs_version = "PY2AND3",
    deps = [
        ":debug_py",
        "//tensorflow:tensorflow_py",
@ -440,6 +461,13 @@ py_binary(
    name = "debug_mnist",
    srcs = ["examples/debug_mnist.py"],
    srcs_version = "PY2AND3",
+    deps = [":debug_mnist_lib"],
+)
+
+py_library(
+    name = "debug_mnist_lib",
+    srcs = ["examples/debug_mnist.py"],
+    srcs_version = "PY2AND3",
    deps = [
        ":debug_py",
        "//tensorflow:tensorflow_py",
@ -451,6 +479,13 @@ py_binary(
    name = "debug_tflearn_iris",
    srcs = ["examples/debug_tflearn_iris.py"],
    srcs_version = "PY2AND3",
+    deps = [":debug_tflearn_iris_lib"],
+)
+
+py_library(
+    name = "debug_tflearn_iris_lib",
+    srcs = ["examples/debug_tflearn_iris.py"],
+    srcs_version = "PY2AND3",
    deps = [
        ":debug_py",
        "//tensorflow:tensorflow_py",
@ -462,6 +497,13 @@ py_binary(
    name = "debug_keras",
    srcs = ["examples/debug_keras.py"],
    srcs_version = "PY2AND3",
+    deps = [":debug_keras_lib"],
+)
+
+py_library(
+    name = "debug_keras_lib",
+    srcs = ["examples/debug_keras.py"],
+    srcs_version = "PY2AND3",
    deps = [
        ":debug_py",
        "//tensorflow:tensorflow_py",
--- a/tensorflow/python/tools/BUILD
+++ b/tensorflow/python/tools/BUILD
@ -14,23 +14,20 @@ load("//tensorflow:tensorflow.bzl", "py_binary")
 py_library(
    name = "tools_pip",
    deps = [
-        ":freeze_graph",
-        ":import_pb_to_tensorboard",
-        ":inspect_checkpoint",
-        ":optimize_for_inference",
-        ":print_selective_registration_header",
-        ":saved_model_cli",
+        ":freeze_graph_lib",
+        ":import_pb_to_tensorboard_lib",
+        ":inspect_checkpoint_lib",
+        ":optimize_for_inference_lib",
+        ":print_selective_registration_header_lib",
+        ":saved_model_cli_lib",
        ":saved_model_utils",
-        ":strip_unused",
+        ":strip_unused_lib",
        # The following py_library are needed because
        # py_binary may not depend on them when --define=no_tensorflow_py_deps=true
        # is specified. See https://github.com/tensorflow/tensorflow/issues/22390
-        ":freeze_graph_lib",
-        ":optimize_for_inference_lib",
        ":selective_registration_header_lib",
-        ":strip_unused_lib",
        # Include the TF upgrade script to users can run it directly after install TF
-        "//tensorflow/tools/compatibility:tf_upgrade_v2",
+        "//tensorflow/tools/compatibility:tf_upgrade_v2_lib",
    ],
 )

@ -86,6 +83,13 @@ py_binary(
    name = "import_pb_to_tensorboard",
    srcs = ["import_pb_to_tensorboard.py"],
    srcs_version = "PY2AND3",
+    deps = [":import_pb_to_tensorboard_lib"],
+)
+
+py_library(
+    name = "import_pb_to_tensorboard_lib",
+    srcs = ["import_pb_to_tensorboard.py"],
+    srcs_version = "PY2AND3",
    deps = [
        "//tensorflow/core:protos_all_py",
        "//tensorflow/python",
@ -103,7 +107,7 @@ py_test(
    srcs = ["freeze_graph_test.py"],
    srcs_version = "PY2AND3",
    deps = [
-        ":freeze_graph",
+        ":freeze_graph_lib",
        "//tensorflow/core:protos_all_py",
        "//tensorflow/python:client",
        "//tensorflow/python:client_testlib",
@ -120,6 +124,13 @@ py_binary(
    name = "inspect_checkpoint",
    srcs = ["inspect_checkpoint.py"],
    srcs_version = "PY2AND3",
+    deps = [":inspect_checkpoint_lib"],
+)
+
+py_library(
+    name = "inspect_checkpoint_lib",
+    srcs = ["inspect_checkpoint.py"],
+    srcs_version = "PY2AND3",
    deps = [
        "//tensorflow/python",  # TODO(b/34059704): remove when fixed
        "//tensorflow/python:platform",
@ -240,6 +251,14 @@ py_binary(
    srcs = ["print_selective_registration_header.py"],
    srcs_version = "PY2AND3",
    visibility = ["//visibility:public"],
+    deps = [":print_selective_registration_header_lib"],
+)
+
+py_library(
+    name = "print_selective_registration_header_lib",
+    srcs = ["print_selective_registration_header.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
    deps = [
        ":selective_registration_header_lib",
        "//tensorflow/python:platform",
@ -261,6 +280,13 @@ py_binary(
    name = "saved_model_cli",
    srcs = ["saved_model_cli.py"],
    srcs_version = "PY2AND3",
+    deps = [":saved_model_cli_lib"],
+)
+
+py_library(
+    name = "saved_model_cli_lib",
+    srcs = ["saved_model_cli.py"],
+    srcs_version = "PY2AND3",
    deps = [
        ":saved_model_utils",
        "//tensorflow/python",
@ -280,7 +306,7 @@ py_test(
        "no-internal-py3",
    ],
    deps = [
-        ":saved_model_cli",
+        ":saved_model_cli_lib",
        "//tensorflow/core:protos_all_py",
    ],
 )
--- a/tensorflow/tools/compatibility/BUILD
+++ b/tensorflow/tools/compatibility/BUILD
@ -34,6 +34,13 @@ py_binary(
    name = "tf_upgrade",
    srcs = ["tf_upgrade.py"],
    srcs_version = "PY2AND3",
+    deps = [":tf_upgrade_lib"],
+)
+
+py_library(
+    name = "tf_upgrade_lib",
+    srcs = ["tf_upgrade.py"],
+    srcs_version = "PY2AND3",
    deps = [":ast_edits"],
 )

@ -42,7 +49,7 @@ py_test(
    srcs = ["tf_upgrade_test.py"],
    srcs_version = "PY2AND3",
    deps = [
-        ":tf_upgrade",
+        ":tf_upgrade_lib",
        "//tensorflow/python:client_testlib",
        "//tensorflow/python:framework_test_lib",
        "@six_archive//:six",
@ -89,7 +96,7 @@ py_test(
    srcs = ["tf_upgrade_v2_test.py"],
    srcs_version = "PY2AND3",
    deps = [
-        ":tf_upgrade_v2",
+        ":tf_upgrade_v2_lib",
        "//tensorflow:tensorflow_py",
        "//tensorflow/python:client_testlib",
        "//tensorflow/python:framework_test_lib",
--- a/tensorflow/tools/dist_test/server/BUILD
+++ b/tensorflow/tools/dist_test/server/BUILD
@ -12,6 +12,14 @@ load("//tensorflow:tensorflow.bzl", "py_binary")

 py_binary(
    name = "grpc_tensorflow_server",
+    srcs = ["grpc_tensorflow_server.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
+    deps = [":grpc_tensorflow_server_lib"],
+)
+
+py_library(
+    name = "grpc_tensorflow_server_lib",
    srcs = [
        "grpc_tensorflow_server.py",
    ],
@ -33,7 +41,7 @@ py_test(
    main = "parse_cluster_spec_test.py",
    srcs_version = "PY2AND3",
    deps = [
-        ":grpc_tensorflow_server",
+        ":grpc_tensorflow_server_lib",
        "//tensorflow/core:protos_all_py",
        "//tensorflow/python:client_testlib",
    ],