ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-02-07 21:33:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix argparse nargs support broken

Browse Source
This commit is contained in:
allegroai 2021-01-12 18:56:45 +02:00
parent e862a6de60
commit a35d172e5b
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clearml/backend_interface/task/args.py
View File

@ -271,18 +271,24 @@ class _Arguments(object):
try: try:
v = yaml.load(v.strip(), Loader=yaml.SafeLoader) v = yaml.load(v.strip(), Loader=yaml.SafeLoader)
if not isinstance(v, (list, tuple)): if not isinstance(v, (list, tuple)):
# do nothing, we have no idea what happened # we have no idea what happened, just put into a list.
pass v = [v] if v else None
elif current_action.type: # casting
v = [current_action.type(a) for a in v] if v:
elif current_action.default: if current_action.type:
v_type = type(current_action.default[0]) v = [current_action.type(a) for a in v]
v = [v_type(a) for a in v] elif current_action.default:
v_type = type(current_action.default[0])
v = [v_type(a) for a in v]
if current_action.default is not None or v not in (None, ''): if current_action.default is not None or v not in (None, ''):
arg_parser_arguments[k] = v arg_parser_arguments[k] = v
except Exception: except Exception:
pass if self._task and self._task.log:
self._task.log.warning(
'Failed parsing task parameter {}="{}" keeping default {}={}'.format(
k, v, k, current_action.default))
elif current_action and not current_action.type: elif current_action and not current_action.type:
# cast manually if there is no type # cast manually if there is no type
var_type = type(current_action.default) var_type = type(current_action.default)

16
clearml/utilities/args.py
View File

@ -146,10 +146,15 @@ class PatchArgumentParser:
else: else:
parsed_args = parsed_args_namespace = copy(parsed_args) parsed_args = parsed_args_namespace = copy(parsed_args)
# cast arguments in parsed_args_namespace entries to str
if parsed_args_namespace and isinstance(parsed_args_namespace, Namespace): if parsed_args_namespace and isinstance(parsed_args_namespace, Namespace):
for k, v in parser._parsed_arg_string_lookup.items(): # noqa for k, v in parser._parsed_arg_string_lookup.items(): # noqa
if hasattr(parsed_args_namespace, k): if hasattr(parsed_args_namespace, k):
setattr(parsed_args_namespace, k, v) setattr(
parsed_args_namespace, k,
str([v] if (isinstance(getattr(parsed_args_namespace, k, None), list) and
not isinstance(v, list)) else v)
)
PatchArgumentParser._last_parsed_args = (PatchArgumentParser._last_parsed_args or []) + [parsed_args] PatchArgumentParser._last_parsed_args = (PatchArgumentParser._last_parsed_args or []) + [parsed_args]
return parsed_args return parsed_args
@ -162,7 +167,14 @@ class PatchArgumentParser:
def _get_value(self, action, arg_string): def _get_value(self, action, arg_string):
if not hasattr(self, '_parsed_arg_string_lookup'): if not hasattr(self, '_parsed_arg_string_lookup'):
setattr(self, '_parsed_arg_string_lookup', dict()) setattr(self, '_parsed_arg_string_lookup', dict())
self._parsed_arg_string_lookup[str(action.dest)] = str(arg_string) k = str(action.dest)
if k not in self._parsed_arg_string_lookup:
self._parsed_arg_string_lookup[k] = arg_string
else:
self._parsed_arg_string_lookup[k] = \
(self._parsed_arg_string_lookup[k]
if isinstance(self._parsed_arg_string_lookup[k], list)
else [self._parsed_arg_string_lookup[k]]) + [arg_string]
return PatchArgumentParser._original_get_value(self, action, arg_string) return PatchArgumentParser._original_get_value(self, action, arg_string)