Improvements to the C++ graph building API.

TESTED:
- passed opensource_build: http://ci.tensorflow.org/job/tensorflow-cl-presubmit-multijob/2780/
Change: 127585603

1 files changed, 4 insertions, 5 deletions

diff --git a/tensorflow/contrib/util/convert_graphdef_memmapped_format_test.cc b/tensorflow/contrib/util/convert_graphdef_memmapped_format_test.cc
index 7cc9d636ba..d64dca7b63 100644
--- a/tensorflow/contrib/util/convert_graphdef_memmapped_format_test.cc
+++ b/tensorflow/contrib/util/convert_graphdef_memmapped_format_test.cc
@@ -42,13 +42,12 @@ TEST(ConvertGraphdefMemmappedFormatTest, ConvertModel) {
   Tensor test_tensor2(DT_FLOAT, kTestTensorShapeT);
   test::FillFn<float>(&test_tensor2, [](int) -> float { return 3.0; });
 
-  GraphDefBuilder b(GraphDefBuilder::kFailImmediately);
-  Node* node1 = ops::Const(test_tensor1, b.opts());
-  Node* node2 = ops::Const(test_tensor2, b.opts());
-  const string result_name = ops::MatMul(node1, node2, b.opts())->name();
+  auto root = Scope::NewRootScope().ExitOnError();
+  ops::Output m = ops::MatMul(root, test_tensor1, test_tensor2);
+  const string result_name = m.node()->name();
 
   GraphDef graph_def;
-  TF_ASSERT_OK(b.ToGraphDef(&graph_def));
+  TF_ASSERT_OK(root.ToGraphDef(&graph_def));
   string graph_def_serialized;
   graph_def.SerializeToString(&graph_def_serialized);
   TF_ASSERT_OK(