Skip to content
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

Jump to bottom

Clean up Argparse interface with trainer #1606

Merged
merged 15 commits into from
Apr 26, 2020
Merged

Clean up Argparse interface with trainer #1606

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dbbeb96
fixed distutil parsing
williamFalcon Apr 26, 2020
3c09f31
fixed distutil parsing
williamFalcon Apr 26, 2020
1db9884
Apply suggestions from code review
Borda Apr 26, 2020
3690e32
log
Borda Apr 26, 2020
e70b03c
fixed distutil parsing
williamFalcon Apr 26, 2020
916a54e
fixed distutil parsing
williamFalcon Apr 26, 2020
fe68a3b
fixed distutil parsing
williamFalcon Apr 26, 2020
8928d47
fixed distutil parsing
williamFalcon Apr 26, 2020
cfac4d2
fixed distutil parsing
williamFalcon Apr 26, 2020
9bb44f0
doctest
Borda Apr 26, 2020
2301a04
fixed hparams section
williamFalcon Apr 26, 2020
463d016
Merge branch 'utils' of https://github.com/williamFalcon/pytorch-ligh…
williamFalcon Apr 26, 2020
3bf3144
fixed hparams section
williamFalcon Apr 26, 2020
68f5c3f
fixed hparams section
williamFalcon Apr 26, 2020
ab73fa3
formatting
Borda Apr 26, 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
12 changes: 9 additions & 3 deletions pytorch_lightning/trainer/trainer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import distutils
import inspect
import os
from argparse import ArgumentParser
Expand Down Expand Up @@ -599,7 +598,8 @@ def add_argparse_args(cls, parent_parser: ArgumentParser) -> ArgumentParser:
"""
parser = ArgumentParser(parents=[parent_parser], add_help=False, )

depr_arg_names = cls.get_deprecated_arg_names()
blacklist = ['kwargs']
depr_arg_names = cls.get_deprecated_arg_names() + blacklist

allowed_types = (str, float, int, bool)
# TODO: get "help" from docstring :)
Expand All @@ -609,7 +609,13 @@ def add_argparse_args(cls, parent_parser: ArgumentParser) -> ArgumentParser:
for allowed_type in (at for at in allowed_types if at in arg_types):
if allowed_type is bool:
def allowed_type(x):
return bool(distutils.util.strtobool(x))
# distutils.util.strtobool() has issues
if x.lower() == 'true':
return True
elif x.lower() == 'false':
return False
else:
Borda marked this conversation as resolved.
Show resolved Hide resolved
raise Exception('bool not specified')

if arg == 'gpus':
def allowed_type(x):
Expand Down