From 9090a5ccf30c74ae74c2b4113e7ce92e62ee8313 Mon Sep 17 00:00:00 2001 From: Gunhan Gulsoy Date: Sat, 21 Sep 2019 00:02:03 -0700 Subject: [PATCH] Move error_codes.proto part 2. Move the usages to protobuf/error_codes.proto PiperOrigin-RevId: 270416806 --- tensorflow/core/grappler/clusters/single_machine_test.cc | 3 ++- tensorflow/core/grappler/clusters/virtual_cluster_test.cc | 3 ++- tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc | 2 +- .../core/grappler/verifiers/structure_verifier_test.cc | 5 +++-- tensorflow/python/grappler/item.i | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tensorflow/core/grappler/clusters/single_machine_test.cc b/tensorflow/core/grappler/clusters/single_machine_test.cc index 80e0798482c..def80263dab 100644 --- a/tensorflow/core/grappler/clusters/single_machine_test.cc +++ b/tensorflow/core/grappler/clusters/single_machine_test.cc @@ -14,6 +14,7 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/core/grappler/clusters/single_machine.h" + #include "tensorflow/cc/framework/scope.h" #include "tensorflow/cc/ops/resource_variable_ops.h" #include "tensorflow/cc/ops/standard_ops.h" @@ -24,9 +25,9 @@ limitations under the License. #include "tensorflow/core/grappler/grappler_item.h" #include "tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h" #include "tensorflow/core/grappler/utils.h" -#include "tensorflow/core/lib/core/error_codes.pb.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/test.h" +#include "tensorflow/core/protobuf/error_codes.pb.h" #include "tensorflow/core/protobuf/queue_runner.pb.h" namespace tensorflow { diff --git a/tensorflow/core/grappler/clusters/virtual_cluster_test.cc b/tensorflow/core/grappler/clusters/virtual_cluster_test.cc index 357b306b93b..43d99fd4478 100644 --- a/tensorflow/core/grappler/clusters/virtual_cluster_test.cc +++ b/tensorflow/core/grappler/clusters/virtual_cluster_test.cc @@ -14,6 +14,7 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/core/grappler/clusters/virtual_cluster.h" + #include "tensorflow/cc/framework/scope.h" #include "tensorflow/cc/ops/standard_ops.h" #include "tensorflow/core/framework/cost_graph.pb.h" @@ -21,8 +22,8 @@ limitations under the License. #include "tensorflow/core/framework/tensor_shape.pb.h" #include "tensorflow/core/grappler/grappler_item.h" #include "tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h" -#include "tensorflow/core/lib/core/error_codes.pb.h" #include "tensorflow/core/platform/test.h" +#include "tensorflow/core/protobuf/error_codes.pb.h" namespace tensorflow { namespace grappler { diff --git a/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc b/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc index f56568e1e67..d6250427fc4 100644 --- a/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc +++ b/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc @@ -24,9 +24,9 @@ limitations under the License. #include "tensorflow/core/grappler/utils/symbolic_shapes.h" #include "tensorflow/core/grappler/utils/topological_sort.h" #include "tensorflow/core/grappler/utils/tpu.h" -#include "tensorflow/core/lib/core/error_codes.pb.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/strings/str_util.h" +#include "tensorflow/core/protobuf/error_codes.pb.h" namespace tensorflow { namespace grappler { diff --git a/tensorflow/core/grappler/verifiers/structure_verifier_test.cc b/tensorflow/core/grappler/verifiers/structure_verifier_test.cc index d3b1d0646d9..dbfd578e7e2 100644 --- a/tensorflow/core/grappler/verifiers/structure_verifier_test.cc +++ b/tensorflow/core/grappler/verifiers/structure_verifier_test.cc @@ -13,6 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include "tensorflow/core/grappler/verifiers/structure_verifier.h" + #include #include "absl/strings/match.h" @@ -20,12 +22,11 @@ limitations under the License. #include "tensorflow/cc/ops/standard_ops.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/shape_inference.h" -#include "tensorflow/core/grappler/verifiers/structure_verifier.h" -#include "tensorflow/core/lib/core/error_codes.pb.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/test.h" +#include "tensorflow/core/protobuf/error_codes.pb.h" namespace tensorflow { namespace grappler { diff --git a/tensorflow/python/grappler/item.i b/tensorflow/python/grappler/item.i index 93a9c934c66..93228784b7b 100644 --- a/tensorflow/python/grappler/item.i +++ b/tensorflow/python/grappler/item.i @@ -48,7 +48,7 @@ struct GItem { #include "tensorflow/core/grappler/grappler_item_builder.h" #include "tensorflow/core/grappler/costs/graph_properties.h" #include "tensorflow/core/grappler/utils/topological_sort.h" -#include "tensorflow/core/lib/core/error_codes.pb.h" +#include "tensorflow/core/protobuf/error_codes.pb.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/protobuf/meta_graph.pb.h" #include "tensorflow/core/lib/strings/strcat.h"