Rooba
/
lightning
mirror of https://github.com/Lightning-AI/lightning.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add forgotten test in #7240 (#7283) 

^
This commit is contained in:
Adrian Wälchli 2021-05-04 01:56:30 +02:00 committed by GitHub
parent c6a171b776
commit 3e8db4142b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pytorch_lightning/utilities/argparse.py
View File

@ -17,7 +17,7 @@ from argparse import _ArgumentGroup, ArgumentParser, Namespace
from contextlib import suppress from contextlib import suppress
from typing import Any, Dict, List, Tuple, Union from typing import Any, Dict, List, Tuple, Union
from pytorch_lightning.utilities.parsing import str_to_bool, str_to_bool_or_str, str_to_bool_or_int from pytorch_lightning.utilities.parsing import str_to_bool, str_to_bool_or_int, str_to_bool_or_str
def from_argparse_args(cls, args: Union[Namespace, ArgumentParser], **kwargs): def from_argparse_args(cls, args: Union[Namespace, ArgumentParser], **kwargs):

14
tests/trainer/test_trainer_cli.py
View File

@ -176,12 +176,14 @@ def test_argparse_args_parsing(cli_args, expected):
@RunIf(min_python="3.7.0") @RunIf(min_python="3.7.0")
@pytest.mark.parametrize('cli_args,expected', [ @pytest.mark.parametrize(
('', False), 'cli_args,expected', [
('--fast_dev_run=0', False), ('', False),
('--fast_dev_run=True', True), ('--fast_dev_run=0', False),
('--fast_dev_run 2', 2), ('--fast_dev_run=True', True),
]) ('--fast_dev_run 2', 2),
]
)
def test_argparse_args_parsing_fast_dev_run(cli_args, expected): def test_argparse_args_parsing_fast_dev_run(cli_args, expected):
"""Test multi type argument with bool.""" """Test multi type argument with bool."""
cli_args = cli_args.split(' ') if cli_args else [] cli_args = cli_args.split(' ') if cli_args else []

13
tests/utilities/test_parsing.py
View File

@ -28,6 +28,7 @@ from pytorch_lightning.utilities.parsing import (
lightning_setattr, lightning_setattr,
parse_class_init_keys, parse_class_init_keys,
str_to_bool, str_to_bool,
str_to_bool_or_int,
str_to_bool_or_str, str_to_bool_or_str,
) )
@ -165,7 +166,7 @@ def test_lightning_setattr(tmpdir, model_cases):
lightning_setattr(m, "this_attr_not_exist", None) lightning_setattr(m, "this_attr_not_exist", None)
def test_str_to_bool_or_str(tmpdir): def test_str_to_bool_or_str():
true_cases = ['y', 'yes', 't', 'true', 'on', '1'] true_cases = ['y', 'yes', 't', 'true', 'on', '1']
false_cases = ['n', 'no', 'f', 'false', 'off', '0'] false_cases = ['n', 'no', 'f', 'false', 'off', '0']
other_cases = ['yyeess', 'noooo', 'lightning'] other_cases = ['yyeess', 'noooo', 'lightning']
@ -180,7 +181,7 @@ def test_str_to_bool_or_str(tmpdir):
assert str_to_bool_or_str(case) == case assert str_to_bool_or_str(case) == case
def test_str_to_bool(tmpdir): def test_str_to_bool():
true_cases = ['y', 'yes', 't', 'true', 'on', '1'] true_cases = ['y', 'yes', 't', 'true', 'on', '1']
false_cases = ['n', 'no', 'f', 'false', 'off', '0'] false_cases = ['n', 'no', 'f', 'false', 'off', '0']
other_cases = ['yyeess', 'noooo', 'lightning'] other_cases = ['yyeess', 'noooo', 'lightning']
@ -196,6 +197,14 @@ def test_str_to_bool(tmpdir):
str_to_bool(case) str_to_bool(case)
def test_str_to_bool_or_int():
assert str_to_bool_or_int("0") is False
assert str_to_bool_or_int("1") is True
assert str_to_bool_or_int("true") is True
assert str_to_bool_or_int("2") == 2
assert str_to_bool_or_int("abc") == "abc"
def test_is_picklable(tmpdir): def test_is_picklable(tmpdir):
# See the full list of picklable types at # See the full list of picklable types at
# https://docs.python.org/3/library/pickle.html#pickle-picklable # https://docs.python.org/3/library/pickle.html#pickle-picklable