Skip to content

GitLab

"ml/git@developer.sourcefind.cn:OpenDAS/ollama.git" did not exist on "4759ecae19fb8246826a8b87da9afbe1601895f9"
Unverified Commit 1c54b40c authored by SparkSnail's avatar SparkSnail Committed by GitHub
Browse files

Change validation order in machineList (#1966)

parent c55c5f46
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
tools/nni_cmd/config_schema.py
View file @ 1c54b40c
...@@ -407,15 +407,8 @@ frameworkcontroller_config_schema = { ...@@ -407,15 +407,8 @@ frameworkcontroller_config_schema = {
} }
machine_list_schema = { machine_list_schema = {
Optional('machineList'):[Or({ Optional('machineList'):[Or(
'ip': setType('ip', str), {
Optional('port'): setNumberRange('port', int, 1, 65535),
'username': setType('username', str),
'passwd': setType('passwd', str),
Optional('gpuIndices'): Or(int, And(str, lambda x: len([int(i) for i in x.split(',')]) > 0), error='gpuIndex format error!'),
Optional('maxTrialNumPerGpu'): setType('maxTrialNumPerGpu', int),
Optional('useActiveGpu'): setType('useActiveGpu', bool)
}, {
'ip': setType('ip', str), 'ip': setType('ip', str),
Optional('port'): setNumberRange('port', int, 1, 65535), Optional('port'): setNumberRange('port', int, 1, 65535),
'username': setType('username', str), 'username': setType('username', str),
...@@ -424,6 +417,15 @@ machine_list_schema = { ...@@ -424,6 +417,15 @@ machine_list_schema = {
Optional('gpuIndices'): Or(int, And(str, lambda x: len([int(i) for i in x.split(',')]) > 0), error='gpuIndex format error!'), Optional('gpuIndices'): Or(int, And(str, lambda x: len([int(i) for i in x.split(',')]) > 0), error='gpuIndex format error!'),
Optional('maxTrialNumPerGpu'): setType('maxTrialNumPerGpu', int), Optional('maxTrialNumPerGpu'): setType('maxTrialNumPerGpu', int),
Optional('useActiveGpu'): setType('useActiveGpu', bool) Optional('useActiveGpu'): setType('useActiveGpu', bool)
},
{
'ip': setType('ip', str),
Optional('port'): setNumberRange('port', int, 1, 65535),
'username': setType('username', str),
'passwd': setType('passwd', str),
Optional('gpuIndices'): Or(int, And(str, lambda x: len([int(i) for i in x.split(',')]) > 0), error='gpuIndex format error!'),
Optional('maxTrialNumPerGpu'): setType('maxTrialNumPerGpu', int),
Optional('useActiveGpu'): setType('useActiveGpu', bool)
})] })]
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment