Skip to content

[tfjs-converter] Add some fixes to converter wizard #2799

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
Feb 27, 2020
Merged

[tfjs-converter] Add some fixes to converter wizard #2799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b812f8
Add some fixes to converter wizard
pvaneck Feb 26, 2020
cbca3ef
Merge branch 'master' into wizard-fixes
pyu10055 Feb 27, 2020
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
15 changes: 11 additions & 4 deletions tfjs-converter/python/tensorflowjs/converters/wizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,10 @@ def available_output_formats(answers):
'key': 's',
'name': 'Keras Saved Model',
'value': common.KERAS_SAVED_MODEL,
}, {
'key': 'l',
'name': 'TensoFlow.js Layers Model',
'value': common.TFJS_LAYERS_MODEL,
}]
return []

Expand Down Expand Up @@ -486,8 +490,11 @@ def run(dryrun):
'name': common.SPLIT_WEIGHTS_BY_LAYER,
'message': 'Do you want to split weights by layers?',
'default': False,
'when': lambda answers: value_in_list(answers, common.INPUT_FORMAT,
(common.TFJS_LAYERS_MODEL))
'when': lambda answers: (value_in_list(answers, common.OUTPUT_FORMAT,
(common.TFJS_LAYERS_MODEL)) and
value_in_list(answers, common.INPUT_FORMAT,
(common.KERAS_MODEL,
common.KERAS_SAVED_MODEL)))
},
{
'type': 'confirm',
Expand Down Expand Up @@ -577,10 +584,10 @@ def pip_main():


def main(argv):
if len(argv) > 2 or len(argv) == 2 and not argv[1] == '--dryrun':
if argv[0] and not argv[0] == '--dryrun':
print("Usage: tensorflowjs_wizard [--dryrun]")
sys.exit(1)
dry_run = len(argv) == 2 and argv[1] == '--dryrun'
dry_run = argv[0] == '--dryrun'
run(dry_run)

if __name__ == '__main__':
Expand Down