Skip to content

Handle DecodeError in tf_loader #1466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2021
Merged

Handle DecodeError in tf_loader #1466

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa5348f
handle DecodeError in tf_loader
calvinmccarter-at-lightmatter Apr 20, 2021
af0d4bf
Merge branch 'master' into master
guschmue Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tf2onnx/tf_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@

import tensorflow as tf
import numpy as np
from google.protobuf.message import DecodeError
from tensorflow.core.protobuf import saved_model_pb2
from tensorflow.python.ops import lookup_ops
from tensorflow.python.util import compat

from tf2onnx import utils
from tf2onnx.tf_utils import get_tf_version, tflist_to_onnx, get_hash_table_info, replace_placeholders_with_tables
Expand Down Expand Up @@ -194,6 +197,11 @@ def from_graphdef(model_path, input_names, output_names):
"Unable to load file '{}'.".format(model_path)) from e
try:
graph_def.ParseFromString(content)
except DecodeError:
content_as_bytes = compat.as_bytes(content)
saved_model = saved_model_pb2.SavedModel()
saved_model.ParseFromString(content_as_bytes)
graph_def = saved_model.meta_graphs[0].graph_def
except Exception as e:
raise RuntimeError(
"Unable to parse file '{}'.".format(model_path)) from e
Expand Down