From 5d3c548620a5e23ba765cd8d7a09feaa08e9b056 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 14 May 2020 09:35:50 -0700 Subject: [PATCH] Resolve trivial aliases for portable TensorFlow targets. PiperOrigin-RevId: 311548335 Change-Id: I837aa5a62500682783607841f0c993c2b6c238ed --- tensorflow/c/BUILD | 20 ++++++++--------- tensorflow/c/eager/BUILD | 4 ++-- tensorflow/cc/saved_model/BUILD | 2 +- tensorflow/compiler/jit/BUILD | 2 +- tensorflow/core/common_runtime/eager/BUILD | 18 +++++++-------- tensorflow/core/kernels/BUILD | 26 +++++++++++----------- tensorflow/examples/label_image/BUILD | 2 +- tensorflow/java/src/main/native/BUILD | 2 +- tensorflow/lite/delegates/flex/BUILD | 14 ++++++------ tensorflow/lite/testing/BUILD | 12 +++++----- tensorflow/lite/testing/kernel_test/BUILD | 2 +- tensorflow/tools/benchmark/BUILD | 4 ++-- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD index 66ade5c7bd4..7fb02028837 100644 --- a/tensorflow/c/BUILD +++ b/tensorflow/c/BUILD @@ -85,7 +85,7 @@ tf_cuda_library( ], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//tensorflow:chromiumos": [ ":tf_attrtype", @@ -182,7 +182,7 @@ tf_cuda_library( ":tf_status_internal", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ ":tf_status", @@ -219,7 +219,7 @@ tf_cuda_library( ], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core:lib", @@ -234,7 +234,7 @@ cc_library( visibility = ["//visibility:public"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ ":tf_status_internal", @@ -272,7 +272,7 @@ cc_library( visibility = ["//visibility:public"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs + "//tensorflow/core:portable_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs ], "//conditions:default": [ "//tensorflow/core:framework", @@ -288,7 +288,7 @@ cc_library( visibility = ["//visibility:public"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ ":tensor_interface", @@ -313,7 +313,7 @@ tf_cuda_library( visibility = ["//tensorflow:internal"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ ":tensor_interface", @@ -426,7 +426,7 @@ tf_cuda_library( visibility = ["//visibility:public"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core:framework", @@ -457,7 +457,7 @@ tf_cuda_library( ] + select({ "//tensorflow:android": [ ":c_api_internal", - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ ":c_api_internal", @@ -484,7 +484,7 @@ tf_cuda_library( ":tf_status_helper", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core:framework", diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD index 69808f6f49f..fe4d5ac6ffe 100644 --- a/tensorflow/c/eager/BUILD +++ b/tensorflow/c/eager/BUILD @@ -35,7 +35,7 @@ tf_cuda_library( visibility = ["//visibility:public"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ ":context_interface", @@ -412,7 +412,7 @@ tf_cuda_library( visibility = ["//visibility:public"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ ":c_api", diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD index a20cc9c9945..b13d8db48a9 100644 --- a/tensorflow/cc/saved_model/BUILD +++ b/tensorflow/cc/saved_model/BUILD @@ -84,7 +84,7 @@ cc_library( "//tensorflow/core:ops", "//tensorflow/core:protos_all_cc", ]) + if_android([ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ]), ) diff --git a/tensorflow/compiler/jit/BUILD b/tensorflow/compiler/jit/BUILD index 28d922f9e3c..bc8fac0e88f 100644 --- a/tensorflow/compiler/jit/BUILD +++ b/tensorflow/compiler/jit/BUILD @@ -251,7 +251,7 @@ cc_library( visibility = [":friends"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//conditions:default": [ "//tensorflow/core:graph", diff --git a/tensorflow/core/common_runtime/eager/BUILD b/tensorflow/core/common_runtime/eager/BUILD index 2b2313d91ff..625468b39d5 100644 --- a/tensorflow/core/common_runtime/eager/BUILD +++ b/tensorflow/core/common_runtime/eager/BUILD @@ -47,7 +47,7 @@ tf_cuda_library( visibility = ["//tensorflow:internal"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core:core_cpu_lib", @@ -83,7 +83,7 @@ tf_cuda_library( "//tensorflow/core/distributed_runtime:worker_env", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "@com_google_absl//absl/types:optional", @@ -147,7 +147,7 @@ tf_cuda_library( "//tensorflow/core/platform:platform_port", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core:core_cpu_lib", @@ -181,7 +181,7 @@ tf_cuda_library( ":eager_executor", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "@com_google_absl//absl/types:variant", @@ -207,7 +207,7 @@ tf_cuda_library( ":tensor_handle_data", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "@com_google_absl//absl/strings", @@ -312,7 +312,7 @@ tf_cuda_library( "@farmhash_archive//:farmhash", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//tensorflow:windows": KERNEL_AND_DEVICE_DEPS, "//conditions:default": KERNEL_AND_DEVICE_DEPS + [ @@ -381,7 +381,7 @@ cc_library( "//tensorflow/core/profiler/lib:traceme", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core/distributed_runtime/eager:remote_mgr", @@ -498,7 +498,7 @@ cc_library( "//tensorflow/core/profiler/lib:traceme", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core/distributed_runtime/eager:remote_mgr", @@ -527,7 +527,7 @@ tf_cuda_library( "@farmhash_archive//:farmhash", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//conditions:default": [ "//tensorflow/core:core_cpu", diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD index 6cb8704f494..788924e8b37 100644 --- a/tensorflow/core/kernels/BUILD +++ b/tensorflow/core/kernels/BUILD @@ -4021,7 +4021,7 @@ cc_library( ], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs + "//tensorflow/core:portable_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs ], "//conditions:default": [ "//third_party/eigen3", @@ -4046,7 +4046,7 @@ cc_library( ":eigen_spatial_convolutions-inl", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs + "//tensorflow/core:portable_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs ], "//conditions:default": [ "//tensorflow/core:framework", @@ -4062,7 +4062,7 @@ cc_library( deps = select({ "//tensorflow:android": [ ":conv_3d_mobile", - "//tensorflow/core:android_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs + "//tensorflow/core:portable_tensorflow_lib_lite", # TODO(annarev): exclude runtime srcs ], "//conditions:default": [ ":conv_3d", @@ -7270,8 +7270,8 @@ tf_cc_binary( ] + select({ "//tensorflow:android": [ ":android_tensorflow_kernels", - "//tensorflow/core:android_tensorflow_lib", - "//tensorflow/core:android_tensorflow_test_lib", + "//tensorflow/core:portable_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_test_lib", ], "//conditions:default": [ ":quantized_ops", @@ -7331,8 +7331,8 @@ cc_binary( ] + select({ "//tensorflow:android": [ ":android_tensorflow_kernels", - "//tensorflow/core:android_tensorflow_lib", - "//tensorflow/core:android_tensorflow_test_lib", + "//tensorflow/core:portable_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_test_lib", ], "//conditions:default": [ ":ops_util", @@ -7416,8 +7416,8 @@ cc_binary( ] + select({ "//tensorflow:android": [ ":android_tensorflow_kernels", - "//tensorflow/core:android_tensorflow_lib", - "//tensorflow/core:android_tensorflow_test_lib", + "//tensorflow/core:portable_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_test_lib", ], "//conditions:default": [ ":ops_testutil", @@ -7603,8 +7603,8 @@ cc_binary( ] + select({ "//tensorflow:android": [ ":android_tensorflow_kernels", - "//tensorflow/core:android_tensorflow_lib", - "//tensorflow/core:android_tensorflow_test_lib", + "//tensorflow/core:portable_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_test_lib", ], "//conditions:default": [ ":ops_util", @@ -7829,8 +7829,8 @@ cc_binary( ] + select({ "//tensorflow:android": [ ":android_tensorflow_kernels", - "//tensorflow/core:android_tensorflow_lib", - "//tensorflow/core:android_tensorflow_test_lib", + "//tensorflow/core:portable_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_test_lib", ], "//conditions:default": [ "//tensorflow/core:framework", diff --git a/tensorflow/examples/label_image/BUILD b/tensorflow/examples/label_image/BUILD index 162a44ac109..a0e5005d45a 100644 --- a/tensorflow/examples/label_image/BUILD +++ b/tensorflow/examples/label_image/BUILD @@ -35,7 +35,7 @@ tf_cc_binary( # cc:cc_ops is used to include image ops (for label_image) # Jpg, gif, and png related code won't be included "//tensorflow/cc:cc_ops", - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", # cc:android_tensorflow_image_op is for including jpeg/gif/png # decoder to enable real-image evaluation on Android "//tensorflow/core/kernels:android_tensorflow_image_op", diff --git a/tensorflow/java/src/main/native/BUILD b/tensorflow/java/src/main/native/BUILD index 0b363ff577e..e38e58d6fe6 100644 --- a/tensorflow/java/src/main/native/BUILD +++ b/tensorflow/java/src/main/native/BUILD @@ -30,7 +30,7 @@ tf_cuda_library( }), deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//conditions:default": [ "//tensorflow/c:c_api", diff --git a/tensorflow/lite/delegates/flex/BUILD b/tensorflow/lite/delegates/flex/BUILD index d69d2207e63..98314fdc1b8 100644 --- a/tensorflow/lite/delegates/flex/BUILD +++ b/tensorflow/lite/delegates/flex/BUILD @@ -23,7 +23,7 @@ cc_library( "//tensorflow/lite:string_util", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib_lite", @@ -63,7 +63,7 @@ cc_library( ":delegate_only_runtime", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib", @@ -100,7 +100,7 @@ cc_library( "//tensorflow/lite:util", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib_lite", @@ -134,7 +134,7 @@ cc_library( "@com_google_absl//absl/memory", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib_lite", @@ -180,7 +180,7 @@ cc_library( # set of core TensorFlow kernels. We may want to revisit this dependency # to allow selective registration via build targets. "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib_lite", @@ -208,7 +208,7 @@ tf_cc_test( "@com_google_googletest//:gtest", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib", @@ -242,7 +242,7 @@ cc_library( "//tensorflow/lite:kernel_api", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib_lite", + "//tensorflow/core:portable_tensorflow_lib_lite", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib_lite", diff --git a/tensorflow/lite/testing/BUILD b/tensorflow/lite/testing/BUILD index df85f659bf3..379230b3a4b 100644 --- a/tensorflow/lite/testing/BUILD +++ b/tensorflow/lite/testing/BUILD @@ -68,8 +68,8 @@ exports_files([ "//tensorflow/core:test", ], "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", - "//tensorflow/core:android_tensorflow_test_lib", + "//tensorflow/core:portable_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_test_lib", ], }), ) for conversion_mode, test_name, tags, args in generated_test_models_all() + merged_test_models()] @@ -326,7 +326,7 @@ cc_library( "//tensorflow/core:tensorflow", ], "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib", @@ -365,7 +365,7 @@ cc_library( "//tensorflow/core:framework", ], "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib", @@ -405,7 +405,7 @@ cc_library( "//tensorflow/core:lib", ], "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib", @@ -440,7 +440,7 @@ cc_library( "//tensorflow/core:lib", ], "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], "//tensorflow:ios": [ "//tensorflow/core:portable_tensorflow_lib", diff --git a/tensorflow/lite/testing/kernel_test/BUILD b/tensorflow/lite/testing/kernel_test/BUILD index 5180f2f4e5a..76333c76259 100644 --- a/tensorflow/lite/testing/kernel_test/BUILD +++ b/tensorflow/lite/testing/kernel_test/BUILD @@ -25,7 +25,7 @@ cc_library( "//tensorflow/core:lib", ], "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_lib", ], }), ) diff --git a/tensorflow/tools/benchmark/BUILD b/tensorflow/tools/benchmark/BUILD index 93b408d522e..674133431f1 100644 --- a/tensorflow/tools/benchmark/BUILD +++ b/tensorflow/tools/benchmark/BUILD @@ -28,8 +28,8 @@ cc_library( visibility = ["//visibility:public"], deps = select({ "//tensorflow:android": [ - "//tensorflow/core:android_tensorflow_lib", - "//tensorflow/core:android_tensorflow_test_lib", + "//tensorflow/core:portable_tensorflow_lib", + "//tensorflow/core:portable_tensorflow_test_lib", ], "//conditions:default": [ "//tensorflow/core:core_cpu",