diff options
author | A. Unique TensorFlower <gardener@tensorflow.org> | 2018-01-30 12:36:51 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-01-30 13:24:57 -0800 |
commit | 5e9a946b0fbab8e36e4e2dd20480f0982f540890 (patch) | |
tree | a405e4c2f9b36f3b407657a3fe5227a74650bbb2 /tensorflow/cc | |
parent | 7115e52f599724dfe7ab12d15e0dc193600c880f (diff) |
Automated g4 rollback of changelist 183846994
PiperOrigin-RevId: 183874527
Diffstat (limited to 'tensorflow/cc')
-rw-r--r-- | tensorflow/cc/saved_model/loader.cc | 4 | ||||
-rw-r--r-- | tensorflow/cc/saved_model/loader_test.cc | 18 |
2 files changed, 1 insertions, 21 deletions
diff --git a/tensorflow/cc/saved_model/loader.cc b/tensorflow/cc/saved_model/loader.cc index faa1e378d0..acef098c7d 100644 --- 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 4c64d2cfe3..0ad6b33bba 100644 --- 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; |