aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/common_runtime/placer_test.cc
diff options
context:
space:
mode:
authorGravatar Derek Murray <mrry@google.com>2018-02-07 13:44:30 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-02-07 13:48:12 -0800
commita271c36b5ead4686b72d972b193bf1f534a92ffd (patch)
tree0e1ed2e06e4e4e0bb4e13a13e681db69b7f80ae5 /tensorflow/core/common_runtime/placer_test.cc
parentd1eeceb562d6defc4b517ad83cea56a894ff4c98 (diff)
[tf.data] Move the C++ Dataset class implementations to the framework library.
This enables the use of the `DatasetOpKernel` subclasses in custom op library code. A subsequent change will move `tf.contrib.data` kernel implementations to a custom op library. Implementation note: This change moves some classes from "tensorflow/core/graph/..." into the framework library, which does not include any code in "tensorflow/core/common_runtime/...". To break the dependency from "tensorflow/core/framework/dataset.cc" to "tensorflow/core/common_runtime/...", the `GraphDefBuilderToGraph()` method has been split out from the `GraphDefBuilder` class (where it was previously exposed as the `GraphDefBuilder::ToGraph()` utility method) and added to a new "tensorflow/core/graph/graph_def_builder_util.h" module. This method depends on ".../graph/graph_constructor.cc", which depends directly on ".../common_runtime/shape_refiner.h" and indirectly on ".../common_runtime/graph_runner.h". Since this method was used only in tests, these have been updated to point to the new utility method. PiperOrigin-RevId: 184888903
Diffstat (limited to 'tensorflow/core/common_runtime/placer_test.cc')
-rw-r--r--tensorflow/core/common_runtime/placer_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/core/common_runtime/placer_test.cc b/tensorflow/core/common_runtime/placer_test.cc
index 02c9cd5313..098024d219 100644
--- a/tensorflow/core/common_runtime/placer_test.cc
+++ b/tensorflow/core/common_runtime/placer_test.cc
@@ -30,6 +30,7 @@ limitations under the License.
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/graph/graph.h"
#include "tensorflow/core/graph/graph_def_builder.h"
+#include "tensorflow/core/graph/graph_def_builder_util.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"
@@ -193,7 +194,7 @@ class PlacerTest : public ::testing::Test {
// Builds the given graph, and (if successful) indexes the node
// names for use in placement, and later lookup.
Status BuildGraph(const GraphDefBuilder& builder, Graph* out_graph) {
- TF_RETURN_IF_ERROR(builder.ToGraph(out_graph));
+ TF_RETURN_IF_ERROR(GraphDefBuilderToGraph(builder, out_graph));
nodes_by_name_.clear();
for (Node* node : out_graph->nodes()) {
nodes_by_name_[node->name()] = node->id();