Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Add description and trainingServicePlatform field in experiment profile #187

Merged
merged 4 commits into from
Oct 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/nni_manager/common/manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ type ProfileUpdateType = 'TRIAL_CONCURRENCY' | 'MAX_EXEC_DURATION' | 'SEARCH_SPA
interface ExperimentParams {
authorName: string;
experimentName: string;
description?: string;
trialConcurrency: number;
maxExecDuration: number; //seconds
maxTrialNum: number;
searchSpace: string;
trainingServicePlatform: string;
multiPhase?: boolean;
tuner: {
className: string;
Expand Down
1 change: 1 addition & 0 deletions src/nni_manager/core/nnimanager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ class NNIManager implements Manager {
trialConcurrency: 0,
maxExecDuration: 0, // unit: second
maxTrialNum: 0, // maxTrialNum includes all the submitted trial jobs
trainingServicePlatform: '',
searchSpace: '',
tuner: {
className: '',
Expand Down
1 change: 1 addition & 0 deletions src/nni_manager/core/test/dataStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('Unit test for dataStore', () => {
trialConcurrency: 2,
maxExecDuration: 10,
maxTrialNum: 5,
trainingServicePlatform: 'local',
searchSpace: `{
"dropout_rate": {
"_type": "uniform",
Expand Down
1 change: 1 addition & 0 deletions src/nni_manager/core/test/nnimanager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ describe('Unit test for nnimanager', function () {
trialConcurrency: 2,
maxExecDuration: 5,
maxTrialNum: 2,
trainingServicePlatform: 'local',
searchSpace: '{"x":1}',
tuner: {
className: 'EvolutionTuner',
Expand Down
2 changes: 2 additions & 0 deletions src/nni_manager/core/test/sqlDatabase.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const expParams1: ExperimentParams = {
trialConcurrency: 3,
maxExecDuration: 100,
maxTrialNum: 5,
trainingServicePlatform: 'local',
searchSpace: 'SS',
tuner: {
className: 'testTuner',
Expand All @@ -50,6 +51,7 @@ const expParams2: ExperimentParams = {
trialConcurrency: 5,
maxExecDuration: 1000,
maxTrialNum: 5,
trainingServicePlatform: 'local',
searchSpace: '',
tuner: {
className: 'testTuner',
Expand Down
2 changes: 2 additions & 0 deletions src/nni_manager/rest_server/restValidationSchemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ export namespace ValidationSchemas {
export const STARTEXPERIMENT = {
body: {
experimentName: joi.string().required(),
description: joi.string(),
authorName: joi.string(),
maxTrialNum: joi.number().min(0).required(),
trialConcurrency: joi.number().min(0).required(),
trainingServicePlatform: joi.string(),
searchSpace: joi.string().required(),
maxExecDuration: joi.number().min(0).required(),
multiPhase: joi.boolean(),
Expand Down
1 change: 1 addition & 0 deletions src/nni_manager/rest_server/test/mockedNNIManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export class MockedNNIManager extends Manager {
trialConcurrency: 2,
maxExecDuration: 30,
maxTrialNum: 3,
trainingServicePlatform: 'local',
searchSpace: '{lr: 0.01}',
tuner: {
className: 'testTuner',
Expand Down
1 change: 1 addition & 0 deletions tools/nnicmd/config_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
common_schema = {
'authorName': str,
'experimentName': str,
Optional('description'): str,
'trialConcurrency': And(int, lambda n: 1 <=n <= 999999),
Optional('maxExecDuration'): Regex(r'^[1-9][0-9]*[s|m|h|d]$'),
Optional('maxTrialNum'): And(int, lambda x: 1 <= x <= 99999),
Expand Down
4 changes: 4 additions & 0 deletions tools/nnicmd/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@ def set_experiment(experiment_config, mode, port):
request_data['maxExecDuration'] = experiment_config['maxExecDuration']
request_data['maxTrialNum'] = experiment_config['maxTrialNum']
request_data['searchSpace'] = experiment_config.get('searchSpace')
request_data['trainingServicePlatform'] = experiment_config.get('trainingServicePlatform')

if experiment_config.get('description'):
request_data['description'] = experiment_config['description']
if experiment_config.get('multiPhase'):
request_data['multiPhase'] = experiment_config.get('multiPhase')
request_data['tuner'] = experiment_config['tuner']
Expand Down