From 4c6e31c0857cd87e9754b4884db930b9564c6eeb Mon Sep 17 00:00:00 2001 From: Gunhan Gulsoy Date: Tue, 13 Oct 2020 10:18:13 -0700 Subject: [PATCH] Remove depencencies on unnecessary aliases in tensorflow/core Also remove the aforementioned aliases. PiperOrigin-RevId: 336902647 Change-Id: I6695049d389b48c890329a0262408f9bbae7d3b1 --- tensorflow/BUILD | 2 +- tensorflow/core/BUILD | 91 +------------------ tensorflow/core/common_runtime/eager/BUILD | 2 +- tensorflow/core/common_runtime/gpu/BUILD | 14 +-- tensorflow/core/example/BUILD | 2 +- tensorflow/core/framework/BUILD | 2 +- tensorflow/core/grappler/BUILD | 2 +- tensorflow/core/kernels/BUILD | 14 +-- .../core/kernels/data/experimental/BUILD | 4 +- tensorflow/core/kernels/image/BUILD | 4 +- tensorflow/core/kernels/linalg/BUILD | 2 +- tensorflow/core/kernels/mkl/BUILD | 4 +- tensorflow/core/kernels/mlir_generated/BUILD | 2 +- tensorflow/core/kernels/rnn/BUILD | 2 +- tensorflow/core/nccl/BUILD | 2 +- tensorflow/core/profiler/internal/BUILD | 20 ++-- tensorflow/core/profiler/internal/gpu/BUILD | 2 +- tensorflow/core/profiler/utils/BUILD | 2 +- tensorflow/core/util/BUILD | 2 +- tensorflow/lite/tools/evaluation/stages/BUILD | 2 +- tensorflow/python/BUILD | 2 +- tensorflow/python/kernel_tests/BUILD | 2 +- tensorflow/stream_executor/cuda/BUILD | 2 +- tensorflow/stream_executor/gpu/BUILD | 6 +- tensorflow/tools/pip_package/BUILD | 2 +- 25 files changed, 54 insertions(+), 137 deletions(-) diff --git a/tensorflow/BUILD b/tensorflow/BUILD index 15ef7f21ed0..420c7479e50 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -707,7 +707,7 @@ tf_cc_shared_object( deps = [ "//tensorflow/c/experimental/filesystem:filesystem_interface", "//tensorflow/cc/saved_model:loader_lite_impl", - "//tensorflow/core:core_cpu_impl", + "//tensorflow/core/common_runtime:core_cpu_impl", "//tensorflow/core:framework_internal_impl", "//tensorflow/core/common_runtime/gpu:gpu_runtime_impl", "//tensorflow/core/grappler/optimizers:custom_graph_optimizer_registry_impl", diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index c32284a3597..1e2415f6747 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -732,8 +732,8 @@ cc_library( ":framework", ":lib", ":lib_internal", - ":stream_executor", "//tensorflow/core/kernels:bounds_check_lib", + "//tensorflow/core/platform:stream_executor", ], alwayslink = 1, ) @@ -1151,10 +1151,10 @@ tf_cuda_library( ":ops", ":protos_all_cc", ":test", - ":testlib_ops", # TODO(gunan): resolve dependency issues and load these kernels dynamically. ":testlib_kernels_impl", "//tensorflow/cc:scope", + "//tensorflow/core/common_runtime:testlib_ops", "//tensorflow/core/framework:fake_input", "//tensorflow/core/framework:function_testlib", "//tensorflow/core/framework:shape_inference_testutil", @@ -1164,13 +1164,6 @@ tf_cuda_library( ], ) -alias( - name = "testlib_ops", - testonly = 1, - actual = - "//tensorflow/core/common_runtime:testlib_ops", -) - # This is a link-only library to provide a DirectSession # implementation of the Session interface. tf_cuda_library( @@ -1184,13 +1177,6 @@ tf_cuda_library( alwayslink = 1, ) -# ----------------------------------------------------------------------------- -# MKL targets -alias( - name = "mkl_graph_util", - actual = "//tensorflow/core/graph:mkl_graph_util", -) - # ----------------------------------------------------------------------------- # Public Android targets @@ -1356,12 +1342,6 @@ cc_library( alwayslink = 1, ) -alias( - name = "android_op_registrations_and_gradients", - actual = ":portable_op_registrations_and_gradients", - visibility = ["//visibility:public"], -) - filegroup( name = "portable_op_registrations_and_gradients", srcs = ["//tensorflow/c/kernels:android_all_ops"] + glob( @@ -1861,16 +1841,6 @@ cc_library( ], ) -alias( - name = "android_jpeg_internal", - actual = ":portable_jpeg_internal", -) - -alias( - name = "android_gif_internal", - actual = ":portable_gif_internal", -) - alias( name = "error_codes_proto_impl", actual = "//tensorflow/core/protobuf:error_codes_proto_impl", @@ -1881,11 +1851,6 @@ alias( actual = "//tensorflow/core/protobuf:error_codes_proto_impl_cc", ) -alias( - name = "error_codes_proto_cc", - actual = "//tensorflow/core/lib/core:error_codes_proto_cc", -) - alias( name = "version_lib", actual = "//tensorflow/core/util:version_info", @@ -2063,15 +2028,10 @@ cc_header_only_library( ], visibility = ["//visibility:public"], deps = [ - ":stream_executor", + "//tensorflow/core/platform:stream_executor", ], ) -alias( - name = "stream_executor", - actual = "//tensorflow/core/platform:stream_executor", -) - # Like stream_executor library, but compiles without --config=cuda # and does not include any cuda dependencies. alias( @@ -2129,12 +2089,6 @@ tf_cuda_library( alwayslink = 1, ) -alias( - name = "core_cpu_impl", - actual = - "//tensorflow/core/common_runtime:core_cpu_impl", -) - alias( name = "core_cpu_lib", actual = @@ -2147,18 +2101,6 @@ alias( "//tensorflow/core/common_runtime:core_cpu_internal", ) -alias( - name = "regexp_internal", - actual = - "//tensorflow/core/platform:regexp", - visibility = [ - "//tensorflow/compiler:__subpackages__", - "//tensorflow/core/kernels:__subpackages__", - "//tensorflow/core/profiler:__subpackages__", - "//tensorflow/stream_executor:__subpackages__", - ], -) - alias( name = "direct_session_internal", actual = @@ -2171,14 +2113,6 @@ alias( visibility = ["//visibility:public"], ) -alias( - name = "replay_log_proto_cc", - actual = "//tensorflow/core/protobuf:replay_log_proto_cc", - visibility = [ - "//tensorflow:internal", - ], -) - alias( name = "gpu_runtime", actual = @@ -2208,12 +2142,6 @@ alias( actual = "//tensorflow/core/framework:tensor_testutil", ) -# TODO(gonnet): Remove this alias once all users have been moved to the actual target. -alias( - name = "shape_inference_testutil", - actual = "//tensorflow/core/framework:shape_inference_testutil", -) - # Main program for tests alias( name = "test_main", @@ -2773,17 +2701,6 @@ filegroup( visibility = ["//visibility:public"], ) -alias( - name = "lmdb_testdata", - actual = "//tensorflow/core/lib/lmdb:lmdb_testdata", - visibility = ["//visibility:public"], -) - -alias( - name = "cuda_libdevice_path", - actual = "//tensorflow/core/platform:cuda_libdevice_path", -) - transitive_hdrs( name = "headers", visibility = ["//tensorflow:__subpackages__"], @@ -2792,7 +2709,7 @@ transitive_hdrs( ":framework", ":lib", ":protos_all_cc", - ":stream_executor", "//tensorflow/core/platform:platform_strings", + "//tensorflow/core/platform:stream_executor", ], ) diff --git a/tensorflow/core/common_runtime/eager/BUILD b/tensorflow/core/common_runtime/eager/BUILD index a049de9a188..91f60d6ebe2 100644 --- a/tensorflow/core/common_runtime/eager/BUILD +++ b/tensorflow/core/common_runtime/eager/BUILD @@ -451,7 +451,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:mkl_graph_util", + "//tensorflow/core/graph:mkl_graph_util", ], alwayslink = 1, ) diff --git a/tensorflow/core/common_runtime/gpu/BUILD b/tensorflow/core/common_runtime/gpu/BUILD index efbf30d4e65..d500944c3e5 100644 --- a/tensorflow/core/common_runtime/gpu/BUILD +++ b/tensorflow/core/common_runtime/gpu/BUILD @@ -58,7 +58,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ], ) @@ -153,7 +153,6 @@ tf_cuda_library( ":gpu_id_impl", ":gpu_init_impl", ":gpu_lib", - "//tensorflow/core:core_cpu_impl", "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:framework_internal", @@ -161,7 +160,8 @@ tf_cuda_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:stream_executor", + "//tensorflow/core/common_runtime:core_cpu_impl", + "//tensorflow/core/platform:stream_executor", "//tensorflow/core/platform:tensor_float_32_utils", "//tensorflow/core/profiler/lib:annotated_traceme", "//tensorflow/core/profiler/lib:scoped_annotation", @@ -181,7 +181,7 @@ tf_cuda_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", "//third_party/eigen3", ] + if_static([":gpu_runtime_impl"]), ) @@ -219,8 +219,8 @@ tf_cuda_library( deps = [ "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:stream_executor", "//tensorflow/core/framework:allocator", + "//tensorflow/core/platform:stream_executor", ], ) @@ -234,7 +234,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ] + if_static( [":gpu_init_impl"], ), @@ -255,7 +255,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ], alwayslink = 1, ) diff --git a/tensorflow/core/example/BUILD b/tensorflow/core/example/BUILD index 0c943d38707..19521c0ea82 100644 --- a/tensorflow/core/example/BUILD +++ b/tensorflow/core/example/BUILD @@ -68,7 +68,6 @@ tf_cc_test( "//tensorflow/cc:cc_ops", "//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu_internal", - "//tensorflow/core:direct_session_internal", "//tensorflow/core:example_parser_configuration", "//tensorflow/core:framework", "//tensorflow/core:framework_internal", @@ -79,6 +78,7 @@ tf_cc_test( "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", + "//tensorflow/core/common_runtime:direct_session_internal", "//tensorflow/core/kernels:example_parsing_ops", ], ) diff --git a/tensorflow/core/framework/BUILD b/tensorflow/core/framework/BUILD index 3f983634fd7..52974d5f5ba 100644 --- a/tensorflow/core/framework/BUILD +++ b/tensorflow/core/framework/BUILD @@ -1087,7 +1087,6 @@ tf_cc_tests( "//tensorflow/core", "//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu_internal", - "//tensorflow/core:direct_session_internal", "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", @@ -1097,6 +1096,7 @@ tf_cc_tests( "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", + "//tensorflow/core/common_runtime:direct_session_internal", "//tensorflow/core/kernels:ops_util", "//tensorflow/core/platform:regexp", "//tensorflow/core/util:protos_test_cc", diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD index 8a9b23ff96f..f3bea5c75a3 100644 --- a/tensorflow/core/grappler/BUILD +++ b/tensorflow/core/grappler/BUILD @@ -74,7 +74,7 @@ tf_cuda_library( hdrs = ["devices.h"], cuda_deps = [ "//tensorflow/core/common_runtime/gpu:gpu_init", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ], visibility = ["//visibility:public"], deps = [ diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD index 88d71a11846..91c7a0849b3 100644 --- a/tensorflow/core/kernels/BUILD +++ b/tensorflow/core/kernels/BUILD @@ -515,7 +515,7 @@ tf_cuda_library( deps = [ ":gpu_util_hdrs", "//tensorflow/core:lib", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", "//tensorflow/core/protobuf:autotuning_proto_cc", "//tensorflow/core/protobuf:conv_autotuning_proto_cc", "//tensorflow/core/util:env_var", @@ -559,11 +559,11 @@ tf_cc_test( deps = [ "//tensorflow/core:all_kernels", "//tensorflow/core:core_cpu", - "//tensorflow/core:direct_session_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:test", "//tensorflow/core:test_main", + "//tensorflow/core/common_runtime:direct_session_internal", ], ) @@ -1496,7 +1496,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", "//third_party/eigen3", ], ) @@ -3856,7 +3856,7 @@ tf_kernel_library( "//tensorflow/core/platform/default/build_config:cudnn_plugin", "//tensorflow/stream_executor:tf_allocator_adapter", "//tensorflow/stream_executor:stream_executor_headers", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ]) + if_cuda_or_rocm([ ":gpu_utils", "//tensorflow/stream_executor/gpu:redzone_allocator", @@ -3994,7 +3994,7 @@ tf_kernel_library( ":reduction_ops", ]) + if_cuda([ "@local_config_cuda//cuda:cub_headers", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", "//tensorflow/stream_executor/cuda:cuda_stream", ]) + if_rocm([ "@local_config_rocm//rocm:rocprim", @@ -4009,7 +4009,7 @@ tf_kernel_library( ":redux_functor", ":transpose_functor", ] + if_cuda([ - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ]), ) @@ -4229,7 +4229,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", "//third_party/eigen3", ], ) diff --git a/tensorflow/core/kernels/data/experimental/BUILD b/tensorflow/core/kernels/data/experimental/BUILD index 1e5af931cdd..c3ef8122ebb 100644 --- a/tensorflow/core/kernels/data/experimental/BUILD +++ b/tensorflow/core/kernels/data/experimental/BUILD @@ -132,12 +132,12 @@ tf_kernel_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", "//tensorflow/core/grappler:graph_view", "//tensorflow/core/grappler/optimizers/data:graph_utils", "//tensorflow/core/kernels/data:dataset_utils", "//tensorflow/core/kernels/data:name_utils", "//tensorflow/core/kernels/data:serialization_utils", + "//tensorflow/core/platform:regexp", ], ) @@ -307,7 +307,7 @@ tf_cc_test( name = "lmdb_dataset_op_test", size = "small", srcs = ["lmdb_dataset_op_test.cc"], - data = ["//tensorflow/core:lmdb_testdata"], + data = ["//tensorflow/core/lib/lmdb:lmdb_testdata"], deps = [ ":lmdb_dataset_op", "//tensorflow/core:experimental_dataset_ops_op_lib", diff --git a/tensorflow/core/kernels/image/BUILD b/tensorflow/core/kernels/image/BUILD index de76b5e5ec6..d60455df8fb 100644 --- a/tensorflow/core/kernels/image/BUILD +++ b/tensorflow/core/kernels/image/BUILD @@ -418,8 +418,8 @@ cc_library( linkopts = ["-ldl"], visibility = ["//visibility:public"], deps = [ - "//tensorflow/core:android_gif_internal", - "//tensorflow/core:android_jpeg_internal", + "//tensorflow/core:portable_gif_internal", + "//tensorflow/core:portable_jpeg_internal", "//tensorflow/core:portable_tensorflow_lib_lite", "//tensorflow/core/lib/png:png_io", ], diff --git a/tensorflow/core/kernels/linalg/BUILD b/tensorflow/core/kernels/linalg/BUILD index dabe8bd0b7d..0ceeb5f22ea 100644 --- a/tensorflow/core/kernels/linalg/BUILD +++ b/tensorflow/core/kernels/linalg/BUILD @@ -212,7 +212,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core/kernels:fill_functor", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ] + if_cuda([ "//tensorflow/core/platform/default/build_config:cublas_plugin", "//tensorflow/core/util:cuda_solvers", diff --git a/tensorflow/core/kernels/mkl/BUILD b/tensorflow/core/kernels/mkl/BUILD index 6cfe130431f..6689e0fb200 100644 --- a/tensorflow/core/kernels/mkl/BUILD +++ b/tensorflow/core/kernels/mkl/BUILD @@ -126,7 +126,7 @@ tf_mkl_kernel_library( srcs = ["mkl_quantize_op.cc"], deps = [ "//tensorflow/core/kernels:quantized_ops", - "//tensorflow/core:mkl_graph_util", + "//tensorflow/core/graph:mkl_graph_util", "@gemmlowp", ] + MKL_DEPS, ) @@ -255,7 +255,7 @@ tf_mkl_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:math_ops_op_lib", - "//tensorflow/core:mkl_graph_util", + "//tensorflow/core/graph:mkl_graph_util", "//tensorflow/core:nn_ops_op_lib", "//tensorflow/core/kernels:concat_lib_hdrs", "//tensorflow/core/kernels:conv_ops", diff --git a/tensorflow/core/kernels/mlir_generated/BUILD b/tensorflow/core/kernels/mlir_generated/BUILD index 9e6e6aa1ef1..3c9ecea8d88 100644 --- a/tensorflow/core/kernels/mlir_generated/BUILD +++ b/tensorflow/core/kernels/mlir_generated/BUILD @@ -84,7 +84,7 @@ tf_kernel_library( "//third_party/eigen3", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", ]), ) diff --git a/tensorflow/core/kernels/rnn/BUILD b/tensorflow/core/kernels/rnn/BUILD index 0ac9b08ed15..104cc1eba03 100644 --- a/tensorflow/core/kernels/rnn/BUILD +++ b/tensorflow/core/kernels/rnn/BUILD @@ -32,9 +32,9 @@ tf_gpu_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:stream_executor", "//tensorflow/core/kernels:eigen_contraction_kernel", "//tensorflow/core/kernels:eigen_helpers", + "//tensorflow/core/platform:stream_executor", "//third_party/eigen3", ], ) diff --git a/tensorflow/core/nccl/BUILD b/tensorflow/core/nccl/BUILD index 98278e3ae9d..9b1447f53c1 100644 --- a/tensorflow/core/nccl/BUILD +++ b/tensorflow/core/nccl/BUILD @@ -47,7 +47,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:gpu_headers_lib", "//tensorflow/core:lib", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", "//tensorflow/core/profiler/lib:traceme", "//tensorflow/core/profiler/lib:connected_traceme", "//tensorflow/core/profiler/lib:annotated_traceme", diff --git a/tensorflow/core/profiler/internal/BUILD b/tensorflow/core/profiler/internal/BUILD index 43fae35e9da..336375f7d22 100644 --- a/tensorflow/core/profiler/internal/BUILD +++ b/tensorflow/core/profiler/internal/BUILD @@ -22,7 +22,7 @@ cc_library( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings", @@ -53,7 +53,7 @@ cc_library( ":tfprof_utils", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings:str_format", @@ -75,7 +75,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings:str_format", @@ -95,7 +95,7 @@ cc_library( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings", @@ -119,7 +119,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings", @@ -140,7 +140,7 @@ cc_library( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings:str_format", @@ -176,7 +176,7 @@ cc_library( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings", @@ -200,7 +200,7 @@ cc_library( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:protos_all_cc", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings", @@ -255,7 +255,7 @@ cc_library( deps = [ "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "//tensorflow/core/profiler:tfprof_options", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", @@ -358,6 +358,6 @@ cc_library( deps = [ "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", ], ) diff --git a/tensorflow/core/profiler/internal/gpu/BUILD b/tensorflow/core/profiler/internal/gpu/BUILD index ec529b93fae..aa88db2b224 100644 --- a/tensorflow/core/profiler/internal/gpu/BUILD +++ b/tensorflow/core/profiler/internal/gpu/BUILD @@ -73,7 +73,6 @@ tf_cc_test_gpu( "//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:direct_session", - "//tensorflow/core:direct_session_internal", "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:gpu_runtime", @@ -83,6 +82,7 @@ tf_cc_test_gpu( "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", + "//tensorflow/core/common_runtime:direct_session_internal", "//tensorflow/core/kernels:ops_util", "//tensorflow/core/profiler/lib:profiler_interface", "//tensorflow/core/profiler/lib:profiler_session", diff --git a/tensorflow/core/profiler/utils/BUILD b/tensorflow/core/profiler/utils/BUILD index b38cd2a08cb..f7c6d5496d5 100644 --- a/tensorflow/core/profiler/utils/BUILD +++ b/tensorflow/core/profiler/utils/BUILD @@ -128,7 +128,7 @@ cc_library( copts = tf_profiler_copts(), deps = [ "//tensorflow/core:lib", - "//tensorflow/core:regexp_internal", + "//tensorflow/core/platform:regexp", "@com_google_absl//absl/strings", ], ) diff --git a/tensorflow/core/util/BUILD b/tensorflow/core/util/BUILD index a4d93c3686c..b9342638592 100644 --- a/tensorflow/core/util/BUILD +++ b/tensorflow/core/util/BUILD @@ -758,7 +758,6 @@ tf_cc_tests( "//tensorflow/core", "//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu_internal", - "//tensorflow/core:direct_session_internal", "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", @@ -768,6 +767,7 @@ tf_cc_tests( "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", + "//tensorflow/core/common_runtime:direct_session_internal", "//tensorflow/core/kernels:ops_util", "//tensorflow/core/platform:regexp", "//third_party/eigen3", diff --git a/tensorflow/lite/tools/evaluation/stages/BUILD b/tensorflow/lite/tools/evaluation/stages/BUILD index 17cb0f4ef9f..4363aff01a9 100644 --- a/tensorflow/lite/tools/evaluation/stages/BUILD +++ b/tensorflow/lite/tools/evaluation/stages/BUILD @@ -51,7 +51,7 @@ cc_library( "//tensorflow/lite/tools/evaluation/proto:preprocessing_steps_cc_proto", ] + select({ "//tensorflow:android": [ - "//tensorflow/core:android_jpeg_internal", + "//tensorflow/core:portable_jpeg_internal", ], "//conditions:default": [ "//tensorflow/core:jpeg_internal", diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index bb80b737876..e2b7d480498 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -5976,8 +5976,8 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:replay_log_proto_cc", "//tensorflow/core/protobuf:master_proto_cc", + "//tensorflow/core/protobuf:replay_log_proto_cc", ], ) diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD index 871dcf98bf8..b105d1f987a 100644 --- a/tensorflow/python/kernel_tests/BUILD +++ b/tensorflow/python/kernel_tests/BUILD @@ -1631,7 +1631,7 @@ tf_py_test( name = "reader_ops_test", size = "small", srcs = ["reader_ops_test.py"], - data = ["//tensorflow/core:lmdb_testdata"], + data = ["//tensorflow/core/lib/lmdb:lmdb_testdata"], tfrt_enabled = True, deps = [ "//tensorflow/core:protos_all_py", diff --git a/tensorflow/stream_executor/cuda/BUILD b/tensorflow/stream_executor/cuda/BUILD index 124e7f9d482..caab6223fda 100644 --- a/tensorflow/stream_executor/cuda/BUILD +++ b/tensorflow/stream_executor/cuda/BUILD @@ -636,9 +636,9 @@ tf_cuda_cc_test( deps = [ ":cuda_activation", ":cuda_gpu_executor", - "//tensorflow/core:stream_executor_no_cuda", "//tensorflow/core:test", "//tensorflow/core:test_main", + "//tensorflow/core/platform:stream_executor_no_cuda", "//tensorflow/core/platform/default/build_config:stream_executor_cuda", "//tensorflow/stream_executor:device_memory_allocator", "//tensorflow/stream_executor:event", diff --git a/tensorflow/stream_executor/gpu/BUILD b/tensorflow/stream_executor/gpu/BUILD index 863255d47a7..258142f5d83 100644 --- a/tensorflow/stream_executor/gpu/BUILD +++ b/tensorflow/stream_executor/gpu/BUILD @@ -240,8 +240,8 @@ cc_library( ":gpu_driver_header", ":gpu_helpers_header", "//tensorflow/core:lib", - "//tensorflow/core:regexp_internal", - "//tensorflow/core:cuda_libdevice_path", + "//tensorflow/core/platform:regexp", + "//tensorflow/core/platform:cuda_libdevice_path", "//tensorflow/stream_executor/lib", "//tensorflow/stream_executor/platform", "@com_google_absl//absl/strings:str_format", @@ -274,7 +274,7 @@ cc_library( "@com_google_absl//absl/types:optional", "//tensorflow/core/framework:allocator", "//tensorflow/core:lib", - "//tensorflow/core:stream_executor_no_cuda", + "//tensorflow/core/platform:stream_executor_no_cuda", "//tensorflow/stream_executor:device_memory", "//tensorflow/stream_executor:device_memory_allocator", "//tensorflow/stream_executor:stream_executor_headers", diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD index cace6af08c6..ad56e8155d3 100644 --- a/tensorflow/tools/pip_package/BUILD +++ b/tensorflow/tools/pip_package/BUILD @@ -32,7 +32,7 @@ transitive_hdrs( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:stream_executor", + "//tensorflow/core/platform:stream_executor", "//tensorflow/cc/saved_model:loader", "//tensorflow/cc/saved_model:reader", "//tensorflow/cc/saved_model:bundle_v2",