Automated g4 rollback of changelist 183846994

PiperOrigin-RevId: 183874527

diff --git a/tensorflow/cc/saved_model/loader.cc b/tensorflow/cc/saved_model/loader.cc
index faa1e378d07ea94ad08ee084d18bf6a113f054af..acef098c7d07f45d171679bff7c41e13ef0424f1 100644 (file)
--- a/tensorflow/cc/saved_model/loader.cc
+++ b/tensorflow/cc/saved_model/loader.cc
@@ -96,9 +96,7 @@ Status FindMetaGraphDefToLoad(const SavedModel& saved_model_proto,
 Status LoadMetaGraphIntoSession(const MetaGraphDef& meta_graph_def,
                                 const SessionOptions& session_options,
                                 std::unique_ptr<Session>* session) {
-  Session* session_p = nullptr;
-  TF_RETURN_IF_ERROR(NewSession(session_options, &session_p));
-  session->reset(session_p);
+  session->reset(NewSession(session_options));
   return (*session)->Create(meta_graph_def.graph_def());
 }
 

diff --git a/tensorflow/cc/saved_model/loader_test.cc b/tensorflow/cc/saved_model/loader_test.cc
index 4c64d2cfe3c10e6c7ed82a2d72460a0b34283bb2..0ad6b33bba5fcceaca68e2f179cef2232c689a80 100644 (file)
--- a/tensorflow/cc/saved_model/loader_test.cc
+++ b/tensorflow/cc/saved_model/loader_test.cc
@@ -155,24 +155,6 @@ TEST_F(LoaderTest, NoTagMatchMultiple) {
       << st.error_message();
 }
 
-TEST_F(LoaderTest, SessionCreationFailure) {
-  SavedModelBundle bundle;
-  // Use invalid SessionOptions to cause session creation to fail.  Default
-  // options work, so provide an invalid value for the target field.
-  SessionOptions session_options;
-  constexpr char kInvalidTarget[] = "invalid target";
-  session_options.target = kInvalidTarget;
-  RunOptions run_options;
-
-  const string export_dir =
-      io::JoinPath(testing::TensorFlowSrcRoot(), kTestDataSharded);
-  Status st = LoadSavedModel(session_options, run_options, export_dir,
-                             {kSavedModelTagServe}, &bundle);
-  EXPECT_FALSE(st.ok());
-  EXPECT_TRUE(StringPiece(st.error_message()).contains(kInvalidTarget))
-      << st.error_message();
-}
-
 TEST_F(LoaderTest, PbtxtFormat) {
   SavedModelBundle bundle;
   SessionOptions session_options;