From c22174d2dc06c6bcee4dc15c8329de83ea7cdddb Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Sat, 13 Jul 2024 21:22:55 -0700 Subject: [PATCH] Automated Code Change PiperOrigin-RevId: 652164801 --- tensorflow/cc/BUILD | 17 ++++++++++------- tensorflow/cc/training/coordinator.cc | 6 ++++++ tensorflow/cc/training/coordinator.h | 3 +++ tensorflow/cc/training/coordinator_test.cc | 8 +++++--- tensorflow/cc/training/queue_runner.cc | 16 +++++++++++++++- tensorflow/cc/training/queue_runner.h | 2 ++ tensorflow/cc/training/queue_runner_test.cc | 15 +++++++++++++-- 7 files changed, 54 insertions(+), 13 deletions(-) diff --git a/tensorflow/cc/BUILD b/tensorflow/cc/BUILD index 43f63b2ba0cb81..de384d01460b0a 100644 --- a/tensorflow/cc/BUILD +++ b/tensorflow/cc/BUILD @@ -911,10 +911,13 @@ cc_library( deps = [ ":coordinator", "//tensorflow/core:core_cpu", + "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", - "//tensorflow/core/kernels:ops_util", + "@com_google_absl//absl/log", + "@com_google_absl//absl/status", + "@local_tsl//tsl/protobuf:error_codes_proto_impl_cc", ], ) @@ -924,6 +927,7 @@ tf_cc_test( deps = [ "coordinator", ":cc_ops", + ":ops", ":queue_runner", ":scope", "//tensorflow/core:core_cpu", @@ -934,7 +938,7 @@ tf_cc_test( "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", - "//tensorflow/core:testlib", + "@local_tsl//tsl/protobuf:error_codes_proto_impl_cc", ], ) @@ -946,6 +950,8 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", + "@com_google_absl//absl/status", + "@local_tsl//tsl/protobuf:error_codes_proto_impl_cc", ], ) @@ -955,17 +961,14 @@ tf_cc_test( deps = [ ":cc_ops", ":coordinator", - ":queue_runner", - ":scope", - "//tensorflow/core:core_cpu", - "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:protos_all_cc", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", - "//tensorflow/core:testlib", + "@com_google_absl//absl/status", + "@local_tsl//tsl/protobuf:error_codes_proto_impl_cc", ], ) diff --git a/tensorflow/cc/training/coordinator.cc b/tensorflow/cc/training/coordinator.cc index fdbce41c8ca1ef..8fccfc48c91376 100644 --- a/tensorflow/cc/training/coordinator.cc +++ b/tensorflow/cc/training/coordinator.cc @@ -15,6 +15,12 @@ limitations under the License. #include "tensorflow/cc/training/coordinator.h" +#include "absl/status/status.h" +#include "tensorflow/core/framework/cost_graph.pb.h" +#include "tensorflow/core/platform/mutex.h" +#include "tensorflow/core/platform/status.h" +#include "tsl/protobuf/error_codes.pb.h" + namespace tensorflow { Coordinator::Coordinator() : Coordinator(std::vector()) {} diff --git a/tensorflow/cc/training/coordinator.h b/tensorflow/cc/training/coordinator.h index e9c97e2f71c798..e96b3d049eed73 100644 --- a/tensorflow/cc/training/coordinator.h +++ b/tensorflow/cc/training/coordinator.h @@ -21,12 +21,15 @@ limitations under the License. #include #include +#include "absl/status/status.h" #include "tensorflow/core/framework/cost_graph.pb.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/protobuf/config.pb.h" #include "tensorflow/core/protobuf/error_codes.pb.h" +#include "tsl/platform/thread_annotations.h" +#include "tsl/protobuf/error_codes.pb.h" namespace tensorflow { diff --git a/tensorflow/cc/training/coordinator_test.cc b/tensorflow/cc/training/coordinator_test.cc index 75793297ddd009..e3f9f78988f01d 100644 --- a/tensorflow/cc/training/coordinator_test.cc +++ b/tensorflow/cc/training/coordinator_test.cc @@ -15,14 +15,16 @@ limitations under the License. #include "tensorflow/cc/training/coordinator.h" -#include "tensorflow/cc/training/queue_runner.h" +#include "absl/status/status.h" #include "tensorflow/core/lib/core/notification.h" -#include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/platform/blocking_counter.h" #include "tensorflow/core/platform/env.h" +#include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/test.h" +#include "tensorflow/core/platform/threadpool.h" #include "tensorflow/core/protobuf/error_codes.pb.h" -#include "tensorflow/core/public/session.h" +#include "tsl/lib/core/status_test_util.h" +#include "tsl/protobuf/error_codes.pb.h" namespace tensorflow { namespace { diff --git a/tensorflow/cc/training/queue_runner.cc b/tensorflow/cc/training/queue_runner.cc index e480ea29a8061b..508be19fd50a0f 100644 --- a/tensorflow/cc/training/queue_runner.cc +++ b/tensorflow/cc/training/queue_runner.cc @@ -14,8 +14,22 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/cc/training/queue_runner.h" -#include "tensorflow/core/kernels/ops_util.h" + +#include "absl/log/log.h" +#include "absl/status/status.h" +#include "tensorflow/cc/training/coordinator.h" +#include "tensorflow/core/framework/cost_graph.pb.h" +#include "tensorflow/core/framework/ops_util.h" +#include "tensorflow/core/platform/blocking_counter.h" #include "tensorflow/core/platform/env.h" +#include "tensorflow/core/platform/mutex.h" +#include "tensorflow/core/platform/status.h" +#include "tensorflow/core/platform/threadpool.h" +#include "tensorflow/core/platform/types.h" +#include "tensorflow/core/protobuf/config.pb.h" +#include "tensorflow/core/protobuf/queue_runner.pb.h" +#include "tensorflow/core/public/session.h" +#include "tsl/protobuf/error_codes.pb.h" namespace tensorflow { diff --git a/tensorflow/cc/training/queue_runner.h b/tensorflow/cc/training/queue_runner.h index 65cf27f4316416..9d3eed6c484777 100644 --- a/tensorflow/cc/training/queue_runner.h +++ b/tensorflow/cc/training/queue_runner.h @@ -26,10 +26,12 @@ limitations under the License. #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/platform/blocking_counter.h" #include "tensorflow/core/platform/mutex.h" +#include "tensorflow/core/platform/types.h" #include "tensorflow/core/protobuf/config.pb.h" #include "tensorflow/core/protobuf/error_codes.pb.h" #include "tensorflow/core/protobuf/queue_runner.pb.h" #include "tensorflow/core/public/session.h" +#include "tsl/platform/thread_annotations.h" namespace tensorflow { diff --git a/tensorflow/cc/training/queue_runner_test.cc b/tensorflow/cc/training/queue_runner_test.cc index b9cdc46ef9d3ce..9a5f612b81ff81 100644 --- a/tensorflow/cc/training/queue_runner_test.cc +++ b/tensorflow/cc/training/queue_runner_test.cc @@ -18,20 +18,31 @@ limitations under the License. #include #include +#include "tensorflow/cc/framework/ops.h" #include "tensorflow/cc/framework/scope.h" -#include "tensorflow/cc/ops/standard_ops.h" +#include "tensorflow/cc/ops/const_op.h" +#include "tensorflow/cc/ops/data_flow_ops.h" +#include "tensorflow/cc/ops/math_ops.h" +#include "tensorflow/cc/ops/random_ops.h" +#include "tensorflow/cc/ops/state_ops.h" #include "tensorflow/cc/training/coordinator.h" +#include "tensorflow/core/framework/cost_graph.pb.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/lib/core/notification.h" -#include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/platform/env.h" +#include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/test.h" +#include "tensorflow/core/protobuf/config.pb.h" #include "tensorflow/core/protobuf/error_codes.pb.h" #include "tensorflow/core/protobuf/queue_runner.pb.h" #include "tensorflow/core/public/session.h" +#include "tensorflow/core/public/session_options.h" +#include "tsl/lib/core/status_test_util.h" +#include "tsl/platform/status.h" +#include "tsl/protobuf/error_codes.pb.h" namespace tensorflow { namespace {