Skip to content

add output format auto fill for frozen model and required param check #2434

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
Nov 26, 2019
Merged

add output format auto fill for frozen model and required param check #2434

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0832e1
add output format auto fill for frozen model and required param check
pyu10055 Nov 25, 2019
43ba336
fix typo
pyu10055 Nov 25, 2019
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
7 changes: 6 additions & 1 deletion tfjs-converter/python/tensorflowjs/converters/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,8 @@ def _standardize_input_output_formats(input_format, output_format):
input_format_is_keras = (
input_format in [common.KERAS_MODEL, common.KERAS_SAVED_MODEL])
input_format_is_tf = (
input_format in [common.TF_SAVED_MODEL, common.TF_HUB_MODEL])
input_format in [common.TF_SAVED_MODEL,
common.TF_FROZEN_MODEL, common.TF_HUB_MODEL])
if output_format is None:
# If no explicit output_format is provided, infer it from input format.
if input_format_is_keras:
Expand Down Expand Up @@ -552,6 +553,10 @@ def convert(arguments):
quantization.QUANTIZATION_BYTES_TO_DTYPES[args.quantization_bytes]
if args.quantization_bytes else None)

if (not args.output_node_names and input_format == common.TF_FROZEN_MODEL):
raise ValueError(
'The --output_node_names flag is required for "tf_frozen_model"')

if (args.signature_name and input_format not in
(common.TF_SAVED_MODEL, common.TF_HUB_MODEL)):
raise ValueError(
Expand Down