Skip to content

GitLab

Commit 9d01d083 authored by chicm-ms's avatar chicm-ms Committed by Yan Ni
Browse files

Refactor dispatcher cmdline (#1862)

parent 2a81b08c
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 226 deletions
src/nni_manager/common/manager.ts
View file @ 9d01d083
......@@ -27,7 +27,7 @@ interface ExperimentParams {
versionCheck?: boolean;
logCollection?: string;
tuner?: {
className: string;
className?: string;
builtinTunerName?: string;
codeDir?: string;
classArgs?: any;
......@@ -37,7 +37,7 @@ interface ExperimentParams {
gpuIndices?: string;
};
assessor?: {
className: string;
className?: string;
builtinAssessorName?: string;
codeDir?: string;
classArgs?: any;
......@@ -45,7 +45,7 @@ interface ExperimentParams {
checkpointDir: string;
};
advisor?: {
className: string;
className?: string;
builtinAdvisorName?: string;
codeDir?: string;
classArgs?: any;
......
src/nni_manager/common/utils.ts
View file @ 9d01d083
......@@ -17,7 +17,7 @@ import * as util from 'util';
import { Database, DataStore } from './datastore';
import { ExperimentStartupInfo, getExperimentStartupInfo, setExperimentStartupInfo } from './experimentStartupInfo';
import { Manager } from './manager';
import { ExperimentParams, Manager } from './manager';
import { HyperParameters, TrainingService, TrialJobStatus } from './trainingService';
function getExperimentRootDir(): string {
......@@ -130,15 +130,6 @@ function parseArg(names: string[]): string {
return '';
}
function encodeCmdLineArgs(args: any): any {
if(process.platform === 'win32'){
return JSON.stringify(args);
}
else{
return JSON.stringify(JSON.stringify(args));
}
}
function getCmdPy(): string {
let cmd = 'python3';
if(process.platform === 'win32'){
......@@ -150,83 +141,14 @@ function getCmdPy(): string {
/**
* Generate command line to start automl algorithm(s),
* either start advisor or start a process which runs tuner and assessor
* @param tuner : For builtin tuner:
* {
* className: 'EvolutionTuner'
* classArgs: {
* optimize_mode: 'maximize',
* population_size: 3
* }
* }
* customized:
* {
* codeDir: '/tmp/mytuner'
* classFile: 'best_tuner.py'
* className: 'BestTuner'
* classArgs: {
* optimize_mode: 'maximize',
* population_size: 3
* }
* }
*
* @param assessor: similiar as tuner
* @param advisor: similar as tuner
* @param expParams: experiment startup parameters
*
*/
function getMsgDispatcherCommand(tuner: any, assessor: any, advisor: any, multiPhase: boolean = false, multiThread: boolean = false): string {
if ((tuner || assessor) && advisor) {
throw new Error('Error: specify both tuner/assessor and advisor is not allowed');
}
if (!tuner && !advisor) {
throw new Error('Error: specify neither tuner nor advisor is not allowed');
}
let command: string = `${getCmdPy()} -m nni`;
if (multiPhase) {
command += ' --multi_phase';
}
if (multiThread) {
command += ' --multi_thread';
}
if (advisor) {
command += ` --advisor_class_name ${advisor.className}`;
if (advisor.classArgs !== undefined) {
command += ` --advisor_args ${encodeCmdLineArgs(advisor.classArgs)}`;
}
if (advisor.codeDir !== undefined && advisor.codeDir.length > 1) {
command += ` --advisor_directory ${advisor.codeDir}`;
}
if (advisor.classFileName !== undefined && advisor.classFileName.length > 1) {
command += ` --advisor_class_filename ${advisor.classFileName}`;
}
} else {
command += ` --tuner_class_name ${tuner.className}`;
if (tuner.classArgs !== undefined) {
command += ` --tuner_args ${encodeCmdLineArgs(tuner.classArgs)}`;
}
if (tuner.codeDir !== undefined && tuner.codeDir.length > 1) {
command += ` --tuner_directory ${tuner.codeDir}`;
}
if (tuner.classFileName !== undefined && tuner.classFileName.length > 1) {
command += ` --tuner_class_filename ${tuner.classFileName}`;
}
if (assessor !== undefined && assessor.className !== undefined) {
command += ` --assessor_class_name ${assessor.className}`;
if (assessor.classArgs !== undefined) {
command += ` --assessor_args ${encodeCmdLineArgs(assessor.classArgs)}`;
}
if (assessor.codeDir !== undefined && assessor.codeDir.length > 1) {
command += ` --assessor_directory ${assessor.codeDir}`;
}
if (assessor.classFileName !== undefined && assessor.classFileName.length > 1) {
command += ` --assessor_class_filename ${assessor.classFileName}`;
}
}
}
return command;
function getMsgDispatcherCommand(expParams: ExperimentParams): string {
const clonedParams = Object.assign({}, expParams);
delete clonedParams.searchSpace;
return `${getCmdPy()} -m nni --exp_params ${Buffer.from(JSON.stringify(clonedParams)).toString('base64')}`;
}
/**
......
src/nni_manager/core/nnimanager.ts
View file @ 9d01d083
......@@ -170,8 +170,7 @@ class NNIManager implements Manager {
this.trainingService.setClusterMetadata('log_collection', expParams.logCollection.toString());
}
const dispatcherCommand: string = getMsgDispatcherCommand(expParams.tuner, expParams.assessor, expParams.advisor,
expParams.multiPhase, expParams.multiThread);
const dispatcherCommand: string = getMsgDispatcherCommand(expParams);
this.log.debug(`dispatcher command: ${dispatcherCommand}`);
const checkpointDir: string = await this.createCheckpointDir();
this.setupTuner(
......@@ -211,8 +210,7 @@ class NNIManager implements Manager {
this.trainingService.setClusterMetadata('version_check', expParams.versionCheck.toString());
}
const dispatcherCommand: string = getMsgDispatcherCommand(expParams.tuner, expParams.assessor, expParams.advisor,
expParams.multiPhase, expParams.multiThread);
const dispatcherCommand: string = getMsgDispatcherCommand(expParams);
this.log.debug(`dispatcher command: ${dispatcherCommand}`);
const checkpointDir: string = await this.createCheckpointDir();
this.setupTuner(
......
src/nni_manager/core/test/ipcInterfaceTerminate.test.ts
View file @ 9d01d083
......@@ -21,18 +21,26 @@ function startProcess(): void {
const dispatcherCmd: string = getMsgDispatcherCommand(
// Mock tuner config
{
className: 'DummyTuner',
codeDir: './',
classFileName: 'dummy_tuner.py'
},
// Mock assessor config
{
className: 'DummyAssessor',
codeDir: './',
classFileName: 'dummy_assessor.py'
},
// advisor
undefined
experimentName: 'exp1',
maxExecDuration: 3600,
searchSpace: '',
trainingServicePlatform: 'local',
authorName: '',
trialConcurrency: 1,
maxTrialNum: 5,
tuner: {
className: 'DummyTuner',
codeDir: './',
classFileName: 'dummy_tuner.py',
checkpointDir: './'
},
assessor: {
className: 'DummyAssessor',
codeDir: './',
classFileName: 'dummy_assessor.py',
checkpointDir: './'
}
}
);
const proc: ChildProcess = getTunerProc(dispatcherCmd, stdio, 'core/test', process.env);
proc.on('error', (error: Error): void => {
......
src/nni_manager/core/test/nnimanager.test.ts
View file @ 9d01d083
......@@ -42,9 +42,9 @@ describe('Unit test for nnimanager', function () {
maxExecDuration: 5,
maxTrialNum: 3,
trainingServicePlatform: 'local',
searchSpace: '{"x":1}',
searchSpace: '{"lr": {"_type": "choice", "_value": [0.01,0.001]}}',
tuner: {
className: 'TPE',
builtinTunerName: 'TPE',
classArgs: {
optimize_mode: 'maximize'
},
......@@ -52,7 +52,7 @@ describe('Unit test for nnimanager', function () {
gpuNum: 0
},
assessor: {
className: 'Medianstop',
builtinAssessorName: 'Medianstop',
checkpointDir: '',
gpuNum: 1
}
......@@ -65,9 +65,9 @@ describe('Unit test for nnimanager', function () {
maxExecDuration: 6,
maxTrialNum: 2,
trainingServicePlatform: 'local',
searchSpace: '{"y":2}',
searchSpace: '{"lr": {"_type": "choice", "_value": [0.01,0.001]}}',
tuner: {
className: 'TPE',
builtinTunerName: 'TPE',
classArgs: {
optimize_mode: 'maximize'
},
......@@ -75,7 +75,7 @@ describe('Unit test for nnimanager', function () {
gpuNum: 0
},
assessor: {
className: 'Medianstop',
builtinAssessorName: 'Medianstop',
checkpointDir: '',
gpuNum: 1
}
......@@ -198,7 +198,7 @@ describe('Unit test for nnimanager', function () {
it('test updateExperimentProfile SEARCH_SPACE', () => {
return nniManager.updateExperimentProfile(experimentProfile, 'SEARCH_SPACE').then(() => {
nniManager.getExperimentProfile().then((updateProfile) => {
expect(updateProfile.params.searchSpace).to.be.equal('{"y":2}');
expect(updateProfile.params.searchSpace).to.be.equal('{"lr": {"_type": "choice", "_value": [0.01,0.001]}}');
});
}).catch((error) => {
assert.fail(error);
......
src/sdk/pynni/nni/__main__.py
View file @ 9d01d083
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.
'''
__main__.py
'''
import os
import sys
import argparse
import logging
import json
import importlib
import base64
from .common import enable_multi_thread, enable_multi_phase
from .constants import ModuleName, ClassName, ClassArgs, AdvisorModuleName, AdvisorClassName
......@@ -29,99 +27,67 @@ def augment_classargs(input_class_args, classname):
input_class_args[key] = value
return input_class_args
def create_builtin_class_instance(classname, jsonstr_args, is_advisor=False):
if is_advisor:
if classname not in AdvisorModuleName or \
importlib.util.find_spec(AdvisorModuleName[classname]) is None:
raise RuntimeError('Advisor module is not found: {}'.format(classname))
class_module = importlib.import_module(AdvisorModuleName[classname])
class_constructor = getattr(class_module, AdvisorClassName[classname])
else:
if classname not in ModuleName or \
importlib.util.find_spec(ModuleName[classname]) is None:
raise RuntimeError('Tuner module is not found: {}'.format(classname))
class_module = importlib.import_module(ModuleName[classname])
class_constructor = getattr(class_module, ClassName[classname])
if jsonstr_args:
class_args = augment_classargs(json.loads(jsonstr_args), classname)
else:
class_args = augment_classargs({}, classname)
if class_args:
instance = class_constructor(**class_args)
else:
instance = class_constructor()
def create_builtin_class_instance(class_name, class_args, builtin_module_dict, builtin_class_dict):
if class_name not in builtin_module_dict or \
importlib.util.find_spec(builtin_module_dict[class_name]) is None:
raise RuntimeError('Builtin module is not found: {}'.format(class_name))
class_module = importlib.import_module(builtin_module_dict[class_name])
class_constructor = getattr(class_module, builtin_class_dict[class_name])
if class_args is None:
class_args = {}
class_args = augment_classargs(class_args, class_name)
instance = class_constructor(**class_args)
return instance
def create_customized_class_instance(class_dir, class_filename, classname, jsonstr_args):
if not os.path.isfile(os.path.join(class_dir, class_filename)):
def create_customized_class_instance(class_params):
code_dir = class_params.get('codeDir')
class_filename = class_params.get('classFileName')
class_name = class_params.get('className')
class_args = class_params.get('classArgs')
if not os.path.isfile(os.path.join(code_dir, class_filename)):
raise ValueError('Class file not found: {}'.format(
os.path.join(class_dir, class_filename)))
sys.path.append(class_dir)
os.path.join(code_dir, class_filename)))
sys.path.append(code_dir)
module_name = os.path.splitext(class_filename)[0]
class_module = importlib.import_module(module_name)
class_constructor = getattr(class_module, classname)
if jsonstr_args:
class_args = json.loads(jsonstr_args)
instance = class_constructor(**class_args)
else:
instance = class_constructor()
class_constructor = getattr(class_module, class_name)
if class_args is None:
class_args = {}
instance = class_constructor(**class_args)
return instance
def parse_args():
parser = argparse.ArgumentParser(description='parse command line parameters.')
parser.add_argument('--advisor_class_name', type=str, required=False,
help='Advisor class name, the class must be a subclass of nni.MsgDispatcherBase')
parser.add_argument('--advisor_class_filename', type=str, required=False,
help='Advisor class file path')
parser.add_argument('--advisor_args', type=str, required=False,
help='Parameters pass to advisor __init__ constructor')
parser.add_argument('--advisor_directory', type=str, required=False,
help='Advisor directory')
parser.add_argument('--tuner_class_name', type=str, required=False,
help='Tuner class name, the class must be a subclass of nni.Tuner')
parser.add_argument('--tuner_class_filename', type=str, required=False,
help='Tuner class file path')
parser.add_argument('--tuner_args', type=str, required=False,
help='Parameters pass to tuner __init__ constructor')
parser.add_argument('--tuner_directory', type=str, required=False,
help='Tuner directory')
parser.add_argument('--assessor_class_name', type=str, required=False,
help='Assessor class name, the class must be a subclass of nni.Assessor')
parser.add_argument('--assessor_args', type=str, required=False,
help='Parameters pass to assessor __init__ constructor')
parser.add_argument('--assessor_directory', type=str, required=False,
help='Assessor directory')
parser.add_argument('--assessor_class_filename', type=str, required=False,
help='Assessor class file path')
parser.add_argument('--multi_phase', action='store_true')
parser.add_argument('--multi_thread', action='store_true')
flags, _ = parser.parse_known_args()
return flags
def main():
'''
main function.
'''
parser = argparse.ArgumentParser(description='Dispatcher command line parser')
parser.add_argument('--exp_params', type=str, required=True)
args, _ = parser.parse_known_args()
exp_params_decode = base64.b64decode(args.exp_params).decode('utf-8')
logger.debug('decoded exp_params: [%s]', exp_params_decode)
exp_params = json.loads(exp_params_decode)
logger.debug('exp_params json obj: [%s]', json.dumps(exp_params, indent=4))
args = parse_args()
if args.multi_thread:
if exp_params.get('multiThread'):
enable_multi_thread()
if args.multi_phase:
if exp_params.get('multiPhase'):
enable_multi_phase()
if args.advisor_class_name:
if exp_params.get('advisor') is not None:
# advisor is enabled and starts to run
_run_advisor(args)
_run_advisor(exp_params)
else:
# tuner (and assessor) is enabled and starts to run
tuner = _create_tuner(args)
if args.assessor_class_name:
assessor = _create_assessor(args)
assert exp_params.get('tuner') is not None
tuner = _create_tuner(exp_params)
if exp_params.get('assessor') is not None:
assessor = _create_assessor(exp_params)
else:
assessor = None
dispatcher = MsgDispatcher(tuner, assessor)
......@@ -139,17 +105,14 @@ def main():
raise
def _run_advisor(args):
if args.advisor_class_name in AdvisorModuleName:
def _run_advisor(exp_params):
if exp_params.get('advisor').get('builtinAdvisorName') in AdvisorModuleName:
dispatcher = create_builtin_class_instance(
args.advisor_class_name,
args.advisor_args, True)
exp_params.get('advisor').get('builtinAdvisorName'),
exp_params.get('advisor').get('classArgs'),
AdvisorModuleName, AdvisorClassName)
else:
dispatcher = create_customized_class_instance(
args.advisor_directory,
args.advisor_class_filename,
args.advisor_class_name,
args.advisor_args)
dispatcher = create_customized_class_instance(exp_params.get('advisor'))
if dispatcher is None:
raise AssertionError('Failed to create Advisor instance')
try:
......@@ -159,33 +122,27 @@ def _run_advisor(args):
raise
def _create_tuner(args):
if args.tuner_class_name in ModuleName:
def _create_tuner(exp_params):
if exp_params.get('tuner').get('builtinTunerName') in ModuleName:
tuner = create_builtin_class_instance(
args.tuner_class_name,
args.tuner_args)
exp_params.get('tuner').get('builtinTunerName'),
exp_params.get('tuner').get('classArgs'),
ModuleName, ClassName)
else:
tuner = create_customized_class_instance(
args.tuner_directory,
args.tuner_class_filename,
args.tuner_class_name,
args.tuner_args)
tuner = create_customized_class_instance(exp_params.get('tuner'))
if tuner is None:
raise AssertionError('Failed to create Tuner instance')
return tuner
def _create_assessor(args):
if args.assessor_class_name in ModuleName:
def _create_assessor(exp_params):
if exp_params.get('assessor').get('builtinAssessorName') in ModuleName:
assessor = create_builtin_class_instance(
args.assessor_class_name,
args.assessor_args)
exp_params.get('assessor').get('builtinAssessorName'),
exp_params.get('assessor').get('classArgs'),
ModuleName, ClassName)
else:
assessor = create_customized_class_instance(
args.assessor_directory,
args.assessor_class_filename,
args.assessor_class_name,
args.assessor_args)
assessor = create_customized_class_instance(exp_params.get('assessor'))
if assessor is None:
raise AssertionError('Failed to create Assessor instance')
return assessor
......
tools/nni_cmd/launcher_utils.py
View file @ 9d01d083
......@@ -213,24 +213,18 @@ def validate_customized_file(experiment_config, spec_key):
def parse_tuner_content(experiment_config):
'''Validate whether tuner in experiment_config is valid'''
if experiment_config['tuner'].get('builtinTunerName'):
experiment_config['tuner']['className'] = experiment_config['tuner']['builtinTunerName']
else:
if not experiment_config['tuner'].get('builtinTunerName'):
validate_customized_file(experiment_config, 'tuner')
def parse_assessor_content(experiment_config):
'''Validate whether assessor in experiment_config is valid'''
if experiment_config.get('assessor'):
if experiment_config['assessor'].get('builtinAssessorName'):
experiment_config['assessor']['className'] = experiment_config['assessor']['builtinAssessorName']
else:
if not experiment_config['assessor'].get('builtinAssessorName'):
validate_customized_file(experiment_config, 'assessor')
def parse_advisor_content(experiment_config):
'''Validate whether advisor in experiment_config is valid'''
if experiment_config['advisor'].get('builtinAdvisorName'):
experiment_config['advisor']['className'] = experiment_config['advisor']['builtinAdvisorName']
else:
if not experiment_config['advisor'].get('builtinAdvisorName'):
validate_customized_file(experiment_config, 'advisor')
def validate_annotation_content(experiment_config, spec_key, builtin_name):
......
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