Move equal_graph_def.h/cc from core/graph to core/util

This fixes build dependencies for a future patch (specifically allows
referencing equal_graph_def.h from core/framework)
Change: 151668115

6 files changed, 6 insertions, 5 deletions

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 62f30b813b..ad660e0100 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1381,6 +1381,7 @@ tf_cuda_library(
         "framework/unique_tensor_references.h",
         "util/command_line_flags.h",
         "util/env_var.h",
+        "util/equal_graph_def.h",
         "util/presized_cuckoo_map.h",
         "util/tensor_slice_set.h",
         "util/tensor_slice_util.h",
@@ -1952,7 +1953,6 @@ tf_cc_tests(
         "framework/unique_tensor_references_test.cc",
         "graph/algorithm_test.cc",
         "graph/edgeset_test.cc",
-        "graph/equal_graph_def_test.cc",
         "graph/graph_def_builder_test.cc",
         "graph/graph_partition_test.cc",
         "graph/graph_test.cc",
@@ -1964,6 +1964,7 @@ tf_cc_tests(
         "util/bcast_test.cc",
         "util/command_line_flags_test.cc",
         "util/device_name_utils_test.cc",
+        "util/equal_graph_def_test.cc",
         "util/events_writer_test.cc",
         "util/example_proto_fast_parsing_test.cc",
         "util/example_proto_helper_test.cc",
diff --git a/tensorflow/core/framework/graph_def_util_test.cc b/tensorflow/core/framework/graph_def_util_test.cc
index 1b12323e9a..8c76a74a4a 100644
--- a/tensorflow/core/framework/graph_def_util_test.cc
+++ b/tensorflow/core/framework/graph_def_util_test.cc
@@ -21,9 +21,9 @@ limitations under the License.
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/op_def.pb.h"
 #include "tensorflow/core/framework/op_def_builder.h"
-#include "tensorflow/core/graph/equal_graph_def.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
 #include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
 namespace {
diff --git a/tensorflow/core/graph/graph_partition_test.cc b/tensorflow/core/graph/graph_partition_test.cc
index 02d368ddb5..aa732f1fc9 100644
--- a/tensorflow/core/graph/graph_partition_test.cc
+++ b/tensorflow/core/graph/graph_partition_test.cc
@@ -24,7 +24,6 @@ limitations under the License.
 #include "tensorflow/cc/ops/random_ops.h"
 #include "tensorflow/cc/ops/sendrecv_ops.h"
 #include "tensorflow/core/framework/op.h"
-#include "tensorflow/core/graph/equal_graph_def.h"
 #include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/graph/graph_def_builder.h"
@@ -34,6 +33,7 @@ limitations under the License.
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/public/version.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
 namespace {
diff --git a/tensorflow/core/graph/equal_graph_def.cc b/tensorflow/core/util/equal_graph_def.cc
index 21b6d55ca8..7e7a3f5223 100644
--- a/tensorflow/core/graph/equal_graph_def.cc
+++ b/tensorflow/core/util/equal_graph_def.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/core/graph/equal_graph_def.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 #include <unordered_map>
 #include <unordered_set>
diff --git a/tensorflow/core/graph/equal_graph_def.h b/tensorflow/core/util/equal_graph_def.h
index 82f8bd0713..82f8bd0713 100644
--- a/tensorflow/core/graph/equal_graph_def.h
+++ b/tensorflow/core/util/equal_graph_def.h
diff --git a/tensorflow/core/graph/equal_graph_def_test.cc b/tensorflow/core/util/equal_graph_def_test.cc
index b10446cf8b..9ce951e6ef 100644
--- a/tensorflow/core/graph/equal_graph_def_test.cc
+++ b/tensorflow/core/util/equal_graph_def_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/core/graph/equal_graph_def.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op.h"