[Build cleanup] Remove "tensorflow/core/graph/graph_constructor.h".

This forwarding header was moved to "tensorflow/core/common_runtime/graph_constructor.h" and all known uses have been rewritten to use the version in "common_runtime".

PiperOrigin-RevId: 309767804
Change-Id: I92cc94f95ff02615a142bf19532f8677b3be36bc
This commit is contained in:
Derek Murray 2020-05-04 10:12:41 -07:00 committed by TensorFlower Gardener
parent 1c81ed11a2
commit 52542b8472
5 changed files with 34 additions and 71 deletions

View File

@ -2400,10 +2400,6 @@ alias(
# Library containing all of the graph construction code that is
# independent of the runtime.
#
# TODO(mrry): Refactor graph_constructor.cc so that it does not depend on code
# in "common_runtime/", and then the entire "graph/" directory can be included
# in this library.
tf_cuda_library(
name = "graph",
srcs = ["//tensorflow/core/graph:graph_srcs"],
@ -2749,42 +2745,6 @@ tf_cc_tests(
],
)
tf_cc_tests(
name = "higher_level_tests_needing_kernels",
size = "small",
srcs = [
"//tensorflow/core/graph:higher_level_tests_needing_kernels",
],
linkopts = select({
"//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
linkstatic = tf_kernel_tests_linkstatic(),
deps = [
":all_kernels",
":core",
":core_cpu",
":core_cpu_internal",
":direct_session_internal",
":framework",
":framework_internal",
":lib",
":lib_internal",
":ops",
":protos_all_cc",
":test",
":test_main",
":testlib",
"//tensorflow/cc:cc_ops",
"//tensorflow/cc:cc_ops_internal",
"//tensorflow/cc:scope",
"//tensorflow/cc:sendrecv_ops",
"//tensorflow/core/kernels:ops_util",
"//tensorflow/core/util:protos_test_cc",
"//third_party/eigen3",
],
)
tf_cc_test(
name = "cudnn_rnn_ops_test_cc",
size = "small",

View File

@ -2606,3 +2606,37 @@ tf_cc_test(
"//tensorflow/core/util:protos_test_cc",
],
)
tf_cc_test(
name = "graph_constructor_test",
size = "small",
srcs = ["graph_constructor_test.cc"],
linkopts = select({
"//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
linkstatic = tf_kernel_tests_linkstatic(),
deps = [
":core",
":core_cpu",
":core_cpu_internal",
":direct_session_internal",
"//tensorflow/cc:cc_ops",
"//tensorflow/cc:cc_ops_internal",
"//tensorflow/cc:scope",
"//tensorflow/cc:sendrecv_ops",
"//tensorflow/core:all_kernels",
"//tensorflow/core:framework",
"//tensorflow/core:framework_internal",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:ops",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_util",
"//tensorflow/core/util:protos_test_cc",
"//third_party/eigen3",
],
)

View File

@ -45,7 +45,6 @@ filegroup(
"algorithm.h",
"default_device.h",
"graph.h",
"graph_constructor.h",
"graph_def_builder.h",
"graph_node_util.h",
"node_builder.h",
@ -95,7 +94,6 @@ filegroup(
"default_device.h",
"edgeset.h",
"graph.h",
"graph_constructor.h", # NOTE(mrry): Don't include the .cc since it depends on common_runtime.
"graph_def_builder.h",
"graph_node_util.h",
"graph_partition.h",
@ -147,13 +145,6 @@ filegroup(
],
)
filegroup(
name = "higher_level_tests_needing_kernels",
srcs = [
"graph_constructor_test.cc",
],
)
filegroup(
name = "mobile_srcs_only_runtime",
srcs = [
@ -173,7 +164,6 @@ filegroup(
"edgeset.h",
"graph.cc",
"graph.h",
"graph_constructor.h",
"graph_def_builder.cc",
"graph_def_builder.h",
"graph_node_util.cc",

View File

@ -1,21 +0,0 @@
/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
#ifndef TENSORFLOW_CORE_GRAPH_GRAPH_CONSTRUCTOR_H_
#define TENSORFLOW_CORE_GRAPH_GRAPH_CONSTRUCTOR_H_
#include "tensorflow/core/common_runtime/graph_constructor.h"
#endif // TENSORFLOW_CORE_GRAPH_GRAPH_CONSTRUCTOR_H_