diff options
| author |  Michael Case <mikecase@google.com> | 2018-02-07 14:36:00 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-02-07 14:39:49 -0800 |
| commit | d90054e7c0f41f4bab81df0548577a73b939a87a (patch) | |
| tree | a15aea686a9d3f305e316d2a6ada0859ad8170d1 /tensorflow/python/saved_model/loader_impl.py | |
| parent | 8461760f9f6cde8ed97507484d2a879140141032 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 184897758
Diffstat (limited to 'tensorflow/python/saved_model/loader_impl.py')
| -rw-r--r-- | tensorflow/python/saved_model/loader_impl.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tensorflow/python/saved_model/loader_impl.py b/tensorflow/python/saved_model/loader_impl.py index ddfd6be6da..bebf1d5e0d 100644 --- a/tensorflow/python/saved_model/loader_impl.py +++ b/tensorflow/python/saved_model/loader_impl.py @@ -235,13 +235,10 @@ def load(sess, tags, export_dir, **saver_kwargs): asset_tensors_dictionary = _get_asset_tensors(export_dir, meta_graph_def_to_load) - main_op_tensor = _get_main_op_tensor(meta_graph_def_to_load) + main_op_tensor = ( + _get_main_op_tensor(meta_graph_def_to_load) or + (_get_legacy_init_op_tensor(meta_graph_def_to_load))) if main_op_tensor is not None: sess.run(fetches=[main_op_tensor], feed_dict=asset_tensors_dictionary) - else: - legacy_init_op_tensor = _get_legacy_init_op_tensor(meta_graph_def_to_load) - if legacy_init_op_tensor is not None: - sess.run( - fetches=[legacy_init_op_tensor], feed_dict=asset_tensors_dictionary) return meta_graph_def_to_load |