Fix code that ignores tensorflow::Status.

Add a new tensorflow::Status::IgnoreError() method to mark call sites where a Status has been intentionally ignored.
Change: 147402405

6 files changed, 28 insertions, 27 deletions

diff --git a/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc b/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc
index 8faad4a442..c20521e41b 100644
--- a/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc
+++ b/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc
@@ -201,9 +201,8 @@ Status FreezeRequantizationRanges(const GraphDef& input_graph_def,
       new_node->CopyFrom(node);
     }
   }
-  RenameNodeInputs(frozen_graph_def, inputs_to_rename,
-                   std::unordered_set<string>(), output_graph_def);
-  return Status::OK();
+  return RenameNodeInputs(frozen_graph_def, inputs_to_rename,
+                          std::unordered_set<string>(), output_graph_def);
 }
 
 REGISTER_GRAPH_TRANSFORM("freeze_requantization_ranges",
diff --git a/tensorflow/tools/graph_transforms/insert_logging.cc b/tensorflow/tools/graph_transforms/insert_logging.cc
index c9d72f3d7d..39ead61b98 100644
--- a/tensorflow/tools/graph_transforms/insert_logging.cc
+++ b/tensorflow/tools/graph_transforms/insert_logging.cc
@@ -141,10 +141,8 @@ Status InsertLogging(const GraphDef& input_graph_def,
   }
 
   output_graph_def->Clear();
-  RenameNodeInputs(logged_graph_def, inputs_to_rename, ignore_when_renaming,
-                   output_graph_def);
-
-  return Status::OK();
+  return RenameNodeInputs(logged_graph_def, inputs_to_rename,
+                          ignore_when_renaming, output_graph_def);
 }
 
 REGISTER_GRAPH_TRANSFORM("insert_logging", InsertLogging);
diff --git a/tensorflow/tools/graph_transforms/quantize_nodes.cc b/tensorflow/tools/graph_transforms/quantize_nodes.cc
index 11cc91cd77..4533074268 100644
--- a/tensorflow/tools/graph_transforms/quantize_nodes.cc
+++ b/tensorflow/tools/graph_transforms/quantize_nodes.cc
@@ -243,8 +243,9 @@ Status MergeDuplicateNodes(const GraphDef& input_graph_def,
     }
     // Update the graph so that any nodes that referred to removed inputs now
     // pull from the remaining duplicate.
-    RenameNodeInputs(merged_graph_def, inputs_to_rename,
-                     std::unordered_set<string>(), &current_graph_def);
+    TF_RETURN_IF_ERROR(RenameNodeInputs(merged_graph_def, inputs_to_rename,
+                                        std::unordered_set<string>(),
+                                        &current_graph_def));
   } while (any_duplicates_found);
 
   *output_graph_def = current_graph_def;
@@ -303,10 +304,8 @@ Status RemoveRedundantQuantizations(const GraphDef& input_graph_def,
       },
       {true}, &replaced_graph_def));
 
-  RenameNodeInputs(replaced_graph_def, inputs_to_rename,
-                   std::unordered_set<string>(), output_graph_def);
-
-  return Status::OK();
+  return RenameNodeInputs(replaced_graph_def, inputs_to_rename,
+                          std::unordered_set<string>(), output_graph_def);
 }
 
 // If the user has passed in the input_min and input_max args, then we need to
@@ -380,10 +379,12 @@ Status QuantizePlaceholders(const GraphDef& input_graph_def,
   }
 
   GraphDef first_pass_graph_def;
-  RenameNodeInputs(placeholder_graph_def, inputs_to_rename_first_pass,
-                   std::unordered_set<string>(), &first_pass_graph_def);
-  RenameNodeInputs(first_pass_graph_def, inputs_to_rename_second_pass,
-                   std::unordered_set<string>(), output_graph_def);
+  TF_RETURN_IF_ERROR(
+      RenameNodeInputs(placeholder_graph_def, inputs_to_rename_first_pass,
+                       std::unordered_set<string>(), &first_pass_graph_def));
+  TF_RETURN_IF_ERROR(
+      RenameNodeInputs(first_pass_graph_def, inputs_to_rename_second_pass,
+                       std::unordered_set<string>(), output_graph_def));
 
   return Status::OK();
 }
diff --git a/tensorflow/tools/graph_transforms/remove_nodes.cc b/tensorflow/tools/graph_transforms/remove_nodes.cc
index 429dbdd0b1..20f40d0640 100644
--- a/tensorflow/tools/graph_transforms/remove_nodes.cc
+++ b/tensorflow/tools/graph_transforms/remove_nodes.cc
@@ -79,8 +79,9 @@ Status RemoveNodes(const GraphDef& input_graph_def,
           },
           {true}, &replaced_graph_def));
       // Make sure all references to removed nodes now point to their inputs.
-      RenameNodeInputs(replaced_graph_def, inputs_to_rename,
-                       std::unordered_set<string>(), &current_graph_def);
+      TF_RETURN_IF_ERROR(RenameNodeInputs(replaced_graph_def, inputs_to_rename,
+                                          std::unordered_set<string>(),
+                                          &current_graph_def));
     } while (any_nodes_removed);
   }
 
diff --git a/tensorflow/tools/graph_transforms/transform_graph_test.cc b/tensorflow/tools/graph_transforms/transform_graph_test.cc
index 6ea42fdad6..d9e2ccbd64 100644
--- a/tensorflow/tools/graph_transforms/transform_graph_test.cc
+++ b/tensorflow/tools/graph_transforms/transform_graph_test.cc
@@ -145,33 +145,34 @@ class TransformGraphTest : public ::testing::Test {
   void TestParseTransformParameters() {
     TransformParameters params_list;
 
-    ParseTransformParameters("foo", &params_list);
+    TF_EXPECT_OK(ParseTransformParameters("foo", &params_list));
     EXPECT_EQ(1, params_list.size());
     EXPECT_EQ("foo", params_list[0].first);
     EXPECT_TRUE(params_list[0].second.empty());
 
-    ParseTransformParameters("foo bar", &params_list);
+    TF_EXPECT_OK(ParseTransformParameters("foo bar", &params_list));
     EXPECT_EQ(2, params_list.size());
     EXPECT_EQ("foo", params_list[0].first);
     EXPECT_TRUE(params_list[0].second.empty());
     EXPECT_EQ("bar", params_list[1].first);
     EXPECT_TRUE(params_list[1].second.empty());
 
-    ParseTransformParameters("foo() bar()", &params_list);
+    TF_EXPECT_OK(ParseTransformParameters("foo() bar()", &params_list));
     EXPECT_EQ(2, params_list.size());
     EXPECT_EQ("foo", params_list[0].first);
     EXPECT_TRUE(params_list[0].second.empty());
     EXPECT_EQ("bar", params_list[1].first);
     EXPECT_TRUE(params_list[1].second.empty());
 
-    ParseTransformParameters("foo(bob_something=sue)", &params_list);
+    TF_EXPECT_OK(
+        ParseTransformParameters("foo(bob_something=sue)", &params_list));
     EXPECT_EQ(1, params_list.size());
     EXPECT_EQ("foo", params_list[0].first);
     EXPECT_EQ(1, params_list[0].second.count("bob_something"));
     EXPECT_EQ(1, params_list[0].second["bob_something"].size());
     EXPECT_EQ("sue", params_list[0].second["bob_something"][0]);
 
-    ParseTransformParameters("bar(a=1, b=2, a=3)", &params_list);
+    TF_EXPECT_OK(ParseTransformParameters("bar(a=1, b=2, a=3)", &params_list));
     EXPECT_EQ(1, params_list.size());
     EXPECT_EQ("bar", params_list[0].first);
     EXPECT_EQ(1, params_list[0].second.count("a"));
@@ -182,7 +183,8 @@ class TransformGraphTest : public ::testing::Test {
     EXPECT_EQ(1, params_list[0].second["b"].size());
     EXPECT_EQ("2", params_list[0].second["b"][0]);
 
-    ParseTransformParameters("bar(a=\"1\", b=\"1,2,3\", a=3)", &params_list);
+    TF_EXPECT_OK(ParseTransformParameters("bar(a=\"1\", b=\"1,2,3\", a=3)",
+                                          &params_list));
     EXPECT_EQ(1, params_list.size());
     EXPECT_EQ("bar", params_list[0].first);
     EXPECT_EQ(1, params_list[0].second.count("a"));
diff --git a/tensorflow/tools/graph_transforms/transform_utils.cc b/tensorflow/tools/graph_transforms/transform_utils.cc
index 310c331e8f..2c639202b5 100644
--- a/tensorflow/tools/graph_transforms/transform_utils.cc
+++ b/tensorflow/tools/graph_transforms/transform_utils.cc
@@ -277,7 +277,7 @@ string NodeMatch::DebugString() const {
 }
 
 GraphMatcher::GraphMatcher(const GraphDef& graph_def) {
-  SortByExecutionOrder(graph_def, &graph_def_);
+  SortByExecutionOrder(graph_def, &graph_def_).IgnoreError();
   MapNamesToNodes(graph_def_, &node_map_);
 }
 
@@ -362,7 +362,7 @@ Status ReplaceMatchingOpTypes(
   // Start off by retrieving all the matching subgraphs.
   GraphMatcher matcher(input_graph_def);
   std::vector<NodeMatch> matches;
-  matcher.GetOpTypeMatches(pattern, &matches);
+  TF_RETURN_IF_ERROR(matcher.GetOpTypeMatches(pattern, &matches));
 
   // Do some housekeeping so we can easily look up the resulting matches given
   // a node name.