Resolve trivial aliases for portable TensorFlow targets.

PiperOrigin-RevId: 311548335
Change-Id: I837aa5a62500682783607841f0c993c2b6c238ed
This commit is contained in:
A. Unique TensorFlower 2020-05-14 09:35:50 -07:00 committed by TensorFlower Gardener
parent 8565ed2eed
commit 5d3c548620
12 changed files with 54 additions and 54 deletions

View File

@ -85,7 +85,7 @@ tf_cuda_library(
], ],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//tensorflow:chromiumos": [ "//tensorflow:chromiumos": [
":tf_attrtype", ":tf_attrtype",
@ -182,7 +182,7 @@ tf_cuda_library(
":tf_status_internal", ":tf_status_internal",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
":tf_status", ":tf_status",
@ -219,7 +219,7 @@ tf_cuda_library(
], ],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:lib", "//tensorflow/core:lib",
@ -234,7 +234,7 @@ cc_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
":tf_status_internal", ":tf_status_internal",
@ -272,7 +272,7 @@ cc_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = select({ deps = select({
"//tensorflow:android": [ "//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": [ "//conditions:default": [
"//tensorflow/core:framework", "//tensorflow/core:framework",
@ -288,7 +288,7 @@ cc_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
":tensor_interface", ":tensor_interface",
@ -313,7 +313,7 @@ tf_cuda_library(
visibility = ["//tensorflow:internal"], visibility = ["//tensorflow:internal"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
":tensor_interface", ":tensor_interface",
@ -426,7 +426,7 @@ tf_cuda_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:framework", "//tensorflow/core:framework",
@ -457,7 +457,7 @@ tf_cuda_library(
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
":c_api_internal", ":c_api_internal",
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
":c_api_internal", ":c_api_internal",
@ -484,7 +484,7 @@ tf_cuda_library(
":tf_status_helper", ":tf_status_helper",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:framework", "//tensorflow/core:framework",

View File

@ -35,7 +35,7 @@ tf_cuda_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
":context_interface", ":context_interface",
@ -412,7 +412,7 @@ tf_cuda_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
":c_api", ":c_api",

View File

@ -84,7 +84,7 @@ cc_library(
"//tensorflow/core:ops", "//tensorflow/core:ops",
"//tensorflow/core:protos_all_cc", "//tensorflow/core:protos_all_cc",
]) + if_android([ ]) + if_android([
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
]), ]),
) )

View File

@ -251,7 +251,7 @@ cc_library(
visibility = [":friends"], visibility = [":friends"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:graph", "//tensorflow/core:graph",

View File

@ -47,7 +47,7 @@ tf_cuda_library(
visibility = ["//tensorflow:internal"], visibility = ["//tensorflow:internal"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:core_cpu_lib", "//tensorflow/core:core_cpu_lib",
@ -83,7 +83,7 @@ tf_cuda_library(
"//tensorflow/core/distributed_runtime:worker_env", "//tensorflow/core/distributed_runtime:worker_env",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"@com_google_absl//absl/types:optional", "@com_google_absl//absl/types:optional",
@ -147,7 +147,7 @@ tf_cuda_library(
"//tensorflow/core/platform:platform_port", "//tensorflow/core/platform:platform_port",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:core_cpu_lib", "//tensorflow/core:core_cpu_lib",
@ -181,7 +181,7 @@ tf_cuda_library(
":eager_executor", ":eager_executor",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"@com_google_absl//absl/types:variant", "@com_google_absl//absl/types:variant",
@ -207,7 +207,7 @@ tf_cuda_library(
":tensor_handle_data", ":tensor_handle_data",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
@ -312,7 +312,7 @@ tf_cuda_library(
"@farmhash_archive//:farmhash", "@farmhash_archive//:farmhash",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//tensorflow:windows": KERNEL_AND_DEVICE_DEPS, "//tensorflow:windows": KERNEL_AND_DEVICE_DEPS,
"//conditions:default": KERNEL_AND_DEVICE_DEPS + [ "//conditions:default": KERNEL_AND_DEVICE_DEPS + [
@ -381,7 +381,7 @@ cc_library(
"//tensorflow/core/profiler/lib:traceme", "//tensorflow/core/profiler/lib:traceme",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core/distributed_runtime/eager:remote_mgr", "//tensorflow/core/distributed_runtime/eager:remote_mgr",
@ -498,7 +498,7 @@ cc_library(
"//tensorflow/core/profiler/lib:traceme", "//tensorflow/core/profiler/lib:traceme",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core/distributed_runtime/eager:remote_mgr", "//tensorflow/core/distributed_runtime/eager:remote_mgr",
@ -527,7 +527,7 @@ tf_cuda_library(
"@farmhash_archive//:farmhash", "@farmhash_archive//:farmhash",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu",

View File

@ -4021,7 +4021,7 @@ cc_library(
], ],
deps = select({ deps = select({
"//tensorflow:android": [ "//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": [ "//conditions:default": [
"//third_party/eigen3", "//third_party/eigen3",
@ -4046,7 +4046,7 @@ cc_library(
":eigen_spatial_convolutions-inl", ":eigen_spatial_convolutions-inl",
] + select({ ] + select({
"//tensorflow:android": [ "//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": [ "//conditions:default": [
"//tensorflow/core:framework", "//tensorflow/core:framework",
@ -4062,7 +4062,7 @@ cc_library(
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
":conv_3d_mobile", ":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": [ "//conditions:default": [
":conv_3d", ":conv_3d",
@ -7270,8 +7270,8 @@ tf_cc_binary(
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
":android_tensorflow_kernels", ":android_tensorflow_kernels",
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
"//tensorflow/core:android_tensorflow_test_lib", "//tensorflow/core:portable_tensorflow_test_lib",
], ],
"//conditions:default": [ "//conditions:default": [
":quantized_ops", ":quantized_ops",
@ -7331,8 +7331,8 @@ cc_binary(
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
":android_tensorflow_kernels", ":android_tensorflow_kernels",
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
"//tensorflow/core:android_tensorflow_test_lib", "//tensorflow/core:portable_tensorflow_test_lib",
], ],
"//conditions:default": [ "//conditions:default": [
":ops_util", ":ops_util",
@ -7416,8 +7416,8 @@ cc_binary(
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
":android_tensorflow_kernels", ":android_tensorflow_kernels",
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
"//tensorflow/core:android_tensorflow_test_lib", "//tensorflow/core:portable_tensorflow_test_lib",
], ],
"//conditions:default": [ "//conditions:default": [
":ops_testutil", ":ops_testutil",
@ -7603,8 +7603,8 @@ cc_binary(
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
":android_tensorflow_kernels", ":android_tensorflow_kernels",
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
"//tensorflow/core:android_tensorflow_test_lib", "//tensorflow/core:portable_tensorflow_test_lib",
], ],
"//conditions:default": [ "//conditions:default": [
":ops_util", ":ops_util",
@ -7829,8 +7829,8 @@ cc_binary(
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
":android_tensorflow_kernels", ":android_tensorflow_kernels",
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
"//tensorflow/core:android_tensorflow_test_lib", "//tensorflow/core:portable_tensorflow_test_lib",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:framework", "//tensorflow/core:framework",

View File

@ -35,7 +35,7 @@ tf_cc_binary(
# cc:cc_ops is used to include image ops (for label_image) # cc:cc_ops is used to include image ops (for label_image)
# Jpg, gif, and png related code won't be included # Jpg, gif, and png related code won't be included
"//tensorflow/cc:cc_ops", "//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 # cc:android_tensorflow_image_op is for including jpeg/gif/png
# decoder to enable real-image evaluation on Android # decoder to enable real-image evaluation on Android
"//tensorflow/core/kernels:android_tensorflow_image_op", "//tensorflow/core/kernels:android_tensorflow_image_op",

View File

@ -30,7 +30,7 @@ tf_cuda_library(
}), }),
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/c:c_api", "//tensorflow/c:c_api",

View File

@ -23,7 +23,7 @@ cc_library(
"//tensorflow/lite:string_util", "//tensorflow/lite:string_util",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
@ -63,7 +63,7 @@ cc_library(
":delegate_only_runtime", ":delegate_only_runtime",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
@ -100,7 +100,7 @@ cc_library(
"//tensorflow/lite:util", "//tensorflow/lite:util",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
@ -134,7 +134,7 @@ cc_library(
"@com_google_absl//absl/memory", "@com_google_absl//absl/memory",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
@ -180,7 +180,7 @@ cc_library(
# set of core TensorFlow kernels. We may want to revisit this dependency # set of core TensorFlow kernels. We may want to revisit this dependency
# to allow selective registration via build targets. # to allow selective registration via build targets.
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
@ -208,7 +208,7 @@ tf_cc_test(
"@com_google_googletest//:gtest", "@com_google_googletest//:gtest",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
@ -242,7 +242,7 @@ cc_library(
"//tensorflow/lite:kernel_api", "//tensorflow/lite:kernel_api",
] + select({ ] + select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib_lite", "//tensorflow/core:portable_tensorflow_lib_lite",

View File

@ -68,8 +68,8 @@ exports_files([
"//tensorflow/core:test", "//tensorflow/core:test",
], ],
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
"//tensorflow/core:android_tensorflow_test_lib", "//tensorflow/core:portable_tensorflow_test_lib",
], ],
}), }),
) for conversion_mode, test_name, tags, args in generated_test_models_all() + merged_test_models()] ) 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/core:tensorflow",
], ],
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
@ -365,7 +365,7 @@ cc_library(
"//tensorflow/core:framework", "//tensorflow/core:framework",
], ],
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
@ -405,7 +405,7 @@ cc_library(
"//tensorflow/core:lib", "//tensorflow/core:lib",
], ],
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
@ -440,7 +440,7 @@ cc_library(
"//tensorflow/core:lib", "//tensorflow/core:lib",
], ],
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
"//tensorflow:ios": [ "//tensorflow:ios": [
"//tensorflow/core:portable_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",

View File

@ -25,7 +25,7 @@ cc_library(
"//tensorflow/core:lib", "//tensorflow/core:lib",
], ],
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
], ],
}), }),
) )

View File

@ -28,8 +28,8 @@ cc_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = select({ deps = select({
"//tensorflow:android": [ "//tensorflow:android": [
"//tensorflow/core:android_tensorflow_lib", "//tensorflow/core:portable_tensorflow_lib",
"//tensorflow/core:android_tensorflow_test_lib", "//tensorflow/core:portable_tensorflow_test_lib",
], ],
"//conditions:default": [ "//conditions:default": [
"//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu",