diff --git a/docs/en_US/AdvancedFeature/GeneralNasInterfaces.md b/docs/en_US/AdvancedFeature/GeneralNasInterfaces.md index 1c53205d1f..81ff43535c 100644 --- a/docs/en_US/AdvancedFeature/GeneralNasInterfaces.md +++ b/docs/en_US/AdvancedFeature/GeneralNasInterfaces.md @@ -120,7 +120,7 @@ Here, `nni.training_update` is to do some update on the full graph. In enas_mode **\*oneshot_mode\***: following the training approach in [this paper][6]. Different from enas_mode which trains the full graph by training large numbers of subgraphs, in oneshot_mode the full graph is built and dropout is added to candidate inputs and also added to candidate ops' outputs. Then this full graph is trained like other DL models. [Detailed Description](#OneshotMode). (currently only supported on tensorflow). -To use oneshot_mode, you should add one more field in the `trial` config as shown below. In this mode, no need to specify tuner in the config file as it does not need tuner. (Note that you still need to specify a tuner (any tuner) in the config file for now.) Also, no need to add `nni.training_update` in this mode, because no special processing (or update) is needed during training. +To use oneshot_mode, you should add one more field in the `trial` config as shown below. In this mode, though there is no need to use tuner, you still need to specify a tuner (any tuner) in the config file for now. Also, no need to add `nni.training_update` in this mode, because no special processing (or update) is needed during training. ```diff trial: command: your command to run the trial @@ -132,7 +132,7 @@ trial: **\*darts_mode\***: following the training approach in [this paper][3]. It is similar to oneshot_mode. There are two differences, one is that darts_mode only add architecture weights to the outputs of candidate ops, the other is that it trains model weights and architecture weights in an interleaved manner. [Detailed Description](#DartsMode). -To use darts_mode, you should add one more field in the `trial` config as shown below. In this mode, also no need to specify tuner in the config file as it does not need tuner. (Note that you still need to specify a tuner (any tuner) in the config file for now.) +To use darts_mode, you should add one more field in the `trial` config as shown below. In this mode, though there is no need to use tuner, you still need to specify a tuner (any tuner) in the config file for now. ```diff trial: command: your command to run the trial @@ -156,9 +156,9 @@ for _ in range(num): ### enas_mode -In enas_mode, the compiled trial code builds the full graph (rather than subgraph), it receives a chosen architecture and training this architecture on the full graph for a mini-batch, then request another chosen architecture. It is supported by [NNI multi-phase](./multiPhase.md). +In enas_mode, the compiled trial code builds the full graph (rather than subgraph), it receives a chosen architecture and training this architecture on the full graph for a mini-batch, then request another chosen architecture. It is supported by [NNI multi-phase](./MultiPhase.md). -Specifically, for trials using tensorflow, we create and use tensorflow variable as signals, and tensorflow conditional functions to control the search space (full-graph) to be more flexible, which means it can be changed into different sub-graphs (multiple times) depending on these signals. [Here]() is an example for enas_mode. +Specifically, for trials using tensorflow, we create and use tensorflow variable as signals, and tensorflow conditional functions to control the search space (full-graph) to be more flexible, which means it can be changed into different sub-graphs (multiple times) depending on these signals. [Here](https://github.com/microsoft/nni/tree/master/examples/trials/mnist-nas/enas_mode) is an example for enas_mode. @@ -168,7 +168,7 @@ Below is the figure to show where dropout is added to the full graph for one lay ![](../../img/oneshot_mode.png) -As suggested in the [paper][6], a dropout method is implemented to the inputs for every layer. The dropout rate is set to r^(1/k), where 0 < r < 1 is a hyper-parameter of the model (default to be 0.01) and k is number of optional inputs for a specific layer. The higher the fan-in, the more likely each possible input is to be dropped out. However, the probability of dropping out all optional_inputs of a layer is kept constant regardless of its fan-in. Suppose r = 0.05. If a layer has k = 2 optional_inputs then each one will independently be dropped out with probability 0.051/2 ≈ 0.22 and will be retained with probability 0.78. If a layer has k = 7 optional_inputs then each one will independently be dropped out with probability 0.051/7 ≈ 0.65 and will be retained with probability 0.35. In both cases, the probability of dropping out all of the layer's optional_inputs is 5%. The outputs of candidate ops are dropped out through the same way. [Here]() is an example for oneshot_mode. +As suggested in the [paper][6], a dropout method is implemented to the inputs for every layer. The dropout rate is set to r^(1/k), where 0 < r < 1 is a hyper-parameter of the model (default to be 0.01) and k is number of optional inputs for a specific layer. The higher the fan-in, the more likely each possible input is to be dropped out. However, the probability of dropping out all optional_inputs of a layer is kept constant regardless of its fan-in. Suppose r = 0.05. If a layer has k = 2 optional_inputs then each one will independently be dropped out with probability 0.051/2 ≈ 0.22 and will be retained with probability 0.78. If a layer has k = 7 optional_inputs then each one will independently be dropped out with probability 0.051/7 ≈ 0.65 and will be retained with probability 0.35. In both cases, the probability of dropping out all of the layer's optional_inputs is 5%. The outputs of candidate ops are dropped out through the same way. [Here](https://github.com/microsoft/nni/tree/master/examples/trials/mnist-nas/oneshot_mode) is an example for oneshot_mode. @@ -178,7 +178,7 @@ Below is the figure to show where architecture weights are added to the full gra ![](../../img/darts_mode.png) -In `nni.training_update`, tensorflow MomentumOptimizer is used to train the architecture weights based on the pass `loss` and `feed_dict`. [Here]() is an example for darts_mode. +In `nni.training_update`, tensorflow MomentumOptimizer is used to train the architecture weights based on the pass `loss` and `feed_dict`. [Here](https://github.com/microsoft/nni/tree/master/examples/trials/mnist-nas/darts_mode) is an example for darts_mode. ### [__TODO__] Multiple trial jobs for One-Shot NAS diff --git a/docs/en_US/TrainingService/PaiMode.md b/docs/en_US/TrainingService/PaiMode.md index 4a3543236d..78e7aa7984 100644 --- a/docs/en_US/TrainingService/PaiMode.md +++ b/docs/en_US/TrainingService/PaiMode.md @@ -54,7 +54,7 @@ Compared with [LocalMode](LocalMode.md) and [RemoteMachineMode](RemoteMachineMod * shmMB * Optional key. Set the shmMB configuration of OpenPAI, it set the shared memory for one task in the task role. * authFile - * Optional key, Set the auth file path for private registry while using PAI mode, [Refer](https://github.com/microsoft/pai/blob/2ea69b45faa018662bc164ed7733f6fdbb4c42b3/docs/faq.md#q-how-to-use-private-docker-registry-job-image-when-submitting-an-openpai-job). + * Optional key, Set the auth file path for private registry while using PAI mode, [Refer](https://github.com/microsoft/pai/blob/2ea69b45faa018662bc164ed7733f6fdbb4c42b3/docs/faq.md#q-how-to-use-private-docker-registry-job-image-when-submitting-an-openpai-job), you can prepare the authFile and simply provide the local path of this file, NNI will upload this file to HDFS for you. Once complete to fill NNI experiment config file and save (for example, save as exp_pai.yml), then run the following command ``` diff --git a/docs/en_US/Tutorial/WebUI.md b/docs/en_US/Tutorial/WebUI.md index 00bcf36dcf..438f779182 100644 --- a/docs/en_US/Tutorial/WebUI.md +++ b/docs/en_US/Tutorial/WebUI.md @@ -11,7 +11,7 @@ Click the tab "Overview". * If your experiment have many trials, you can change the refresh interval on here. ![](../../img/webui-img/refresh-interval.png) -* Support to review and download the experiment result and nni-manager/dispatcher log file from the download. +* Support to review and download the experiment result and nni-manager/dispatcher log file from the "View" button. ![](../../img/webui-img/download.png) * You can click the learn about in the error box to track experiment log message if the experiment's status is error. diff --git a/docs/img/webui-img/download.png b/docs/img/webui-img/download.png index fc93949ebc..0c6c13eb92 100644 Binary files a/docs/img/webui-img/download.png and b/docs/img/webui-img/download.png differ diff --git a/docs/img/webui-img/over1.png b/docs/img/webui-img/over1.png index 28bd1efbd5..e2c69720fb 100644 Binary files a/docs/img/webui-img/over1.png and b/docs/img/webui-img/over1.png differ diff --git a/docs/img/webui-img/over2.png b/docs/img/webui-img/over2.png index ae8fd66249..3ba7e3c6f4 100644 Binary files a/docs/img/webui-img/over2.png and b/docs/img/webui-img/over2.png differ diff --git a/docs/img/webui-img/refresh-interval.png b/docs/img/webui-img/refresh-interval.png index 7a65de58fa..1e5d759823 100644 Binary files a/docs/img/webui-img/refresh-interval.png and b/docs/img/webui-img/refresh-interval.png differ diff --git a/src/nni_manager/training_service/local/localTrainingService.ts b/src/nni_manager/training_service/local/localTrainingService.ts index 6fcd913a70..88e006a3f9 100644 --- a/src/nni_manager/training_service/local/localTrainingService.ts +++ b/src/nni_manager/training_service/local/localTrainingService.ts @@ -521,9 +521,14 @@ class LocalTrainingService implements TrainingService { `$NOW_DATE = "$NOW_DATE" + (Get-Date -Format fff).ToString()`, `Write $LASTEXITCODE " " $NOW_DATE | Out-File ${path.join(workingDirectory, '.nni', 'state')} -NoNewline -encoding utf8`); } else { - script.push( - `eval ${localTrialConfig.command} 2>${path.join(workingDirectory, 'stderr')}`, - `echo $? \`date +%s%3N\` >${path.join(workingDirectory, '.nni', 'state')}`); + script.push(`eval ${localTrialConfig.command} 2>${path.join(workingDirectory, 'stderr')}`); + if (process.platform === 'darwin') { + // https://superuser.com/questions/599072/how-to-get-bash-execution-time-in-milliseconds-under-mac-os-x + // Considering the worst case, write 999 to avoid negative duration + script.push(`echo $? \`date +%s999\` >${path.join(workingDirectory, '.nni', 'state')}`); + } else { + script.push(`echo $? \`date +%s%3N\` >${path.join(workingDirectory, '.nni', 'state')}`); + } } return script; diff --git a/src/nni_manager/training_service/pai/hdfsClientUtility.ts b/src/nni_manager/training_service/pai/hdfsClientUtility.ts index f7603afb0c..7c140f8b2f 100644 --- a/src/nni_manager/training_service/pai/hdfsClientUtility.ts +++ b/src/nni_manager/training_service/pai/hdfsClientUtility.ts @@ -32,7 +32,7 @@ export namespace HDFSClientUtility { * Get NNI experiment root directory * @param hdfsUserName HDFS user name */ - function hdfsExpRootDir(hdfsUserName: string): string { + export function hdfsExpRootDir(hdfsUserName: string): string { // tslint:disable-next-line:prefer-template return '/' + unixPathJoin(hdfsUserName, 'nni', 'experiments', getExperimentId()); } diff --git a/src/nni_manager/training_service/pai/paiTrainingService.ts b/src/nni_manager/training_service/pai/paiTrainingService.ts index 09e2a42675..91865d906f 100644 --- a/src/nni_manager/training_service/pai/paiTrainingService.ts +++ b/src/nni_manager/training_service/pai/paiTrainingService.ts @@ -74,9 +74,11 @@ class PAITrainingService implements TrainingService { private paiRestServerPort?: number; private nniManagerIpConfig?: NNIManagerIpConfig; private copyExpCodeDirPromise?: Promise; + private copyAuthFilePromise?: Promise; private versionCheck: boolean = true; private logCollection: string; private isMultiPhase: boolean = false; + private authFileHdfsPath: string | undefined = undefined; constructor() { this.log = getLogger(); @@ -292,6 +294,12 @@ class PAITrainingService implements TrainingService { HDFSClientUtility.getHdfsExpCodeDir(this.paiClusterConfig.userName), this.hdfsClient ); + + // Upload authFile to hdfs + if (this.paiTrialConfig.authFile) { + this.authFileHdfsPath = unixPathJoin(HDFSClientUtility.hdfsExpRootDir(this.paiClusterConfig.userName), 'authFile'); + this.copyAuthFilePromise = HDFSClientUtility.copyFileToHdfs(this.paiTrialConfig.authFile, this.authFileHdfsPath, this.hdfsClient); + } deferred.resolve(); break; @@ -373,6 +381,10 @@ class PAITrainingService implements TrainingService { await this.copyExpCodeDirPromise; } + //Make sure authFile is copied from local to HDFS + if (this.paiTrialConfig.authFile) { + await this.copyAuthFilePromise; + } // Step 1. Prepare PAI job configuration const trialLocalTempFolder: string = path.join(getExperimentRootDir(), 'trials-local', trialJobId); @@ -449,7 +461,7 @@ class PAITrainingService implements TrainingService { // Add Virutal Cluster this.paiTrialConfig.virtualCluster === undefined ? 'default' : this.paiTrialConfig.virtualCluster.toString(), //Task auth File - this.paiTrialConfig.authFile + this.authFileHdfsPath ); // Step 2. Upload code files in codeDir onto HDFS diff --git a/src/sdk/pynni/nni/hyperopt_tuner/hyperopt_tuner.py b/src/sdk/pynni/nni/hyperopt_tuner/hyperopt_tuner.py index f66425d869..a1c078bdd7 100644 --- a/src/sdk/pynni/nni/hyperopt_tuner/hyperopt_tuner.py +++ b/src/sdk/pynni/nni/hyperopt_tuner/hyperopt_tuner.py @@ -315,6 +315,10 @@ def receive_trial_result(self, parameter_id, parameters, value, **kwargs): rval = self.CL_rval else: rval = self.rval + # ignore duplicated reported final result (due to aware of intermedate result) + if parameter_id not in self.running_data: + logger.info("Received duplicated final result with parameter id: %s", parameter_id) + return self.running_data.remove(parameter_id) # update the reward of optimal_y diff --git a/src/webui/src/App.tsx b/src/webui/src/App.tsx index 9839542853..c3b31d422a 100644 --- a/src/webui/src/App.tsx +++ b/src/webui/src/App.tsx @@ -1,11 +1,15 @@ import * as React from 'react'; import { Row, Col } from 'antd'; +import axios from 'axios'; +import { COLUMN, MANAGER_IP } from './static/const'; import './App.css'; import SlideBar from './components/SlideBar'; interface AppState { interval: number; whichPageToFresh: string; + columnList: Array; + concurrency: number; } class App extends React.Component<{}, AppState> { @@ -14,7 +18,9 @@ class App extends React.Component<{}, AppState> { super(props); this.state = { interval: 10, // sendons - whichPageToFresh: '' + whichPageToFresh: '', + columnList: COLUMN, + concurrency: 1 }; } @@ -31,25 +37,57 @@ class App extends React.Component<{}, AppState> { } } + changeColumn = (columnList: Array) => { + if (this._isMounted === true) { + this.setState(() => ({ columnList: columnList })); + } + } + + changeConcurrency = (val: number) => { + if (this._isMounted === true) { + this.setState(() => ({ concurrency: val })); + } + } + + getConcurrency = () => { + axios(`${MANAGER_IP}/experiment`, { + method: 'GET' + }) + .then(res => { + if (res.status === 200) { + const params = res.data.params; + if (this._isMounted) { + this.setState(() => ({ concurrency: params.trialConcurrency })); + } + } + }); + } + componentDidMount() { this._isMounted = true; + this.getConcurrency(); } componentWillUnmount() { this._isMounted = false; } render() { - const { interval, whichPageToFresh } = this.state; + const { interval, whichPageToFresh, columnList, concurrency } = this.state; const reactPropsChildren = React.Children.map(this.props.children, child => - // tslint:disable-next-line:no-any - React.cloneElement(child as React.ReactElement, { interval, whichPageToFresh }) + React.cloneElement( + // tslint:disable-next-line:no-any + child as React.ReactElement, { + interval, whichPageToFresh, + columnList, changeColumn: this.changeColumn, + concurrency, changeConcurrency: this.changeConcurrency + }) ); return ( - + diff --git a/src/webui/src/components/Modal/ExperimentDrawer.tsx b/src/webui/src/components/Modal/ExperimentDrawer.tsx index 2fbc4e7f31..2433eec439 100644 --- a/src/webui/src/components/Modal/ExperimentDrawer.tsx +++ b/src/webui/src/components/Modal/ExperimentDrawer.tsx @@ -42,8 +42,7 @@ class ExperimentDrawer extends React.Component { let trialMessagesArr = res1.data; const interResultList = res2.data; Object.keys(trialMessagesArr).map(item => { - // transform hyperparameters as object to show elegantly - trialMessagesArr[item].hyperParameters = JSON.parse(trialMessagesArr[item].hyperParameters); + // not deal with trial's hyperParameters const trialId = trialMessagesArr[item].id; // add intermediate result message trialMessagesArr[item].intermediate = []; diff --git a/src/webui/src/components/Overview.tsx b/src/webui/src/components/Overview.tsx index dc51dac3d9..7366b45511 100644 --- a/src/webui/src/components/Overview.tsx +++ b/src/webui/src/components/Overview.tsx @@ -42,6 +42,8 @@ interface OverviewState { interface OverviewProps { interval: number; // user select whichPageToFresh: string; + concurrency: number; + changeConcurrency: (val: number) => void; } class Overview extends React.Component { @@ -61,7 +63,7 @@ class Overview extends React.Component { id: '', author: '', experName: '', - runConcurren: 0, + runConcurren: 1, maxDuration: 0, execDuration: 0, MaxTrialNum: 0, @@ -264,7 +266,8 @@ class Overview extends React.Component { profile.succTrial += 1; const desJobDetail: Parameters = { parameters: {}, - intermediate: [] + intermediate: [], + multiProgress: 1 }; const duration = (tableData[item].endTime - tableData[item].startTime) / 1000; const acc = getFinal(tableData[item].finalMetricData); @@ -273,6 +276,7 @@ class Overview extends React.Component { if (tempara !== undefined) { const tempLength = tempara.length; const parameters = JSON.parse(tempara[tempLength - 1]).parameters; + desJobDetail.multiProgress = tempara.length; if (typeof parameters === 'string') { desJobDetail.parameters = JSON.parse(parameters); } else { @@ -462,6 +466,18 @@ class Overview extends React.Component { accNodata, status, errorStr, trialNumber, bestAccuracy, isMultiPhase, titleMaxbgcolor, titleMinbgcolor, isLogCollection, experimentAPI } = this.state; + const { concurrency } = this.props; + trialProfile.runConcurren = concurrency; + Object.keys(experimentAPI).map(item => { + if (item === 'params') { + const temp = experimentAPI[item]; + Object.keys(temp).map(index => { + if (index === 'trialConcurrency') { + temp[index] = concurrency; + } + }); + } + }); return (
@@ -480,7 +496,8 @@ class Overview extends React.Component { bestAccuracy={bestAccuracy} status={status} errors={errorStr} - updateFile={this.showSessionPro} + concurrency={concurrency} + changeConcurrency={this.props.changeConcurrency} /> {/* experiment parameters search space tuner assessor... */} diff --git a/src/webui/src/components/SlideBar.tsx b/src/webui/src/components/SlideBar.tsx index 71a7f1fb29..5e2e0edb5f 100644 --- a/src/webui/src/components/SlideBar.tsx +++ b/src/webui/src/components/SlideBar.tsx @@ -136,7 +136,7 @@ class SlideBar extends React.Component { onChange={this.handleVisibleChange} title={ - Download + View } > @@ -234,7 +234,7 @@ class SlideBar extends React.Component { > - Download + View { menuVisible ? diff --git a/src/webui/src/components/TrialsDetail.tsx b/src/webui/src/components/TrialsDetail.tsx index 6c18f1c0ec..c5ee9024ab 100644 --- a/src/webui/src/components/TrialsDetail.tsx +++ b/src/webui/src/components/TrialsDetail.tsx @@ -38,6 +38,8 @@ interface TrialDetailState { interface TrialsDetailProps { interval: number; whichPageToFresh: string; + columnList: Array; + changeColumn: (val: Array) => void; } class TrialsDetail extends React.Component { @@ -112,7 +114,7 @@ class TrialsDetail extends React.Component let desc: Parameters = { parameters: {}, intermediate: [], - progress: 1 + multiProgress: 1 }; let duration = 0; const id = trialJobs[item].id !== undefined @@ -133,7 +135,7 @@ class TrialsDetail extends React.Component const tempHyper = trialJobs[item].hyperParameters; if (tempHyper !== undefined) { const getPara = JSON.parse(tempHyper[tempHyper.length - 1]).parameters; - desc.progress = tempHyper.length; + desc.multiProgress = tempHyper.length; if (typeof getPara === 'string') { desc.parameters = JSON.parse(getPara); } else { @@ -397,6 +399,7 @@ class TrialsDetail extends React.Component whichGraph, searchPlaceHolder } = this.state; const source = isHasSearch ? searchResultSource : tableListSource; + const { columnList, changeColumn } = this.props; return (
@@ -482,6 +485,8 @@ class TrialsDetail extends React.Component platform={experimentInfo.platform} updateList={this.getDetailSource} logCollection={experimentLogCollection} + columnList={columnList} + changeColumn={changeColumn} ref={(tabList) => this.tableList = tabList} />
diff --git a/src/webui/src/components/overview/Progress.tsx b/src/webui/src/components/overview/Progress.tsx index fe764e1a03..39d6ee3322 100644 --- a/src/webui/src/components/overview/Progress.tsx +++ b/src/webui/src/components/overview/Progress.tsx @@ -11,11 +11,12 @@ import '../../static/style/probar.scss'; interface ProgressProps { trialProfile: Experiment; + concurrency: number; trialNumber: TrialNumber; bestAccuracy: number; status: string; errors: string; - updateFile: Function; + changeConcurrency: (val: number) => void; } interface ProgressState { @@ -45,12 +46,14 @@ class Progressed extends React.Component { const { btnName } = this.state; if (this._isMounted) { if (btnName === 'Edit') { + // user click edit this.setState(() => ({ isEnable: false, btnName: 'Save', cancelSty: 'inline-block' })); } else { + // user click save button axios(`${MANAGER_IP}/experiment`, { method: 'GET' }) @@ -81,9 +84,7 @@ class Progressed extends React.Component { message.destroy(); message.success(`Update ${CONTROLTYPE[1].toLocaleLowerCase()} successfully`); - // rerender trial profile message - const { updateFile } = this.props; - updateFile(); + this.props.changeConcurrency(parseInt(userInputVal, 10)); } }) .catch(error => { diff --git a/src/webui/src/components/public-child/OpenRow.tsx b/src/webui/src/components/public-child/OpenRow.tsx index 502ecb68d1..dcaf22a6d8 100644 --- a/src/webui/src/components/public-child/OpenRow.tsx +++ b/src/webui/src/components/public-child/OpenRow.tsx @@ -98,7 +98,7 @@ class OpenRow extends React.Component { For the entire parameter set, please refer to the following " {trialink}".
- Current Phase: {record.description.progress}. + Current Phase: {record.description.multiProgress}. :
diff --git a/src/webui/src/components/trial-detail/DefaultMetricPoint.tsx b/src/webui/src/components/trial-detail/DefaultMetricPoint.tsx index 650ba913c3..24131da030 100644 --- a/src/webui/src/components/trial-detail/DefaultMetricPoint.tsx +++ b/src/webui/src/components/trial-detail/DefaultMetricPoint.tsx @@ -275,7 +275,7 @@ class DefaultPoint extends React.Component
- optimization curve + Optimization curve
diff --git a/src/webui/src/components/trial-detail/TableList.tsx b/src/webui/src/components/trial-detail/TableList.tsx index 98222914dd..a1af9be602 100644 --- a/src/webui/src/components/trial-detail/TableList.tsx +++ b/src/webui/src/components/trial-detail/TableList.tsx @@ -4,7 +4,7 @@ import ReactEcharts from 'echarts-for-react'; import { Row, Table, Button, Popconfirm, Modal, Checkbox, Select, Icon } from 'antd'; const Option = Select.Option; const CheckboxGroup = Checkbox.Group; -import { MANAGER_IP, trialJobStatus, COLUMN, COLUMN_INDEX, COLUMNPro } from '../../static/const'; +import { MANAGER_IP, trialJobStatus, COLUMN_INDEX, COLUMNPro } from '../../static/const'; import { convertDuration, intermediateGraphOption, killJob, filterByStatus } from '../../static/function'; import { TableObj, TrialJob } from '../../static/interface'; import OpenRow from '../public-child/OpenRow'; @@ -32,6 +32,8 @@ interface TableListProps { platform: string; logCollection: boolean; isMultiPhase: boolean; + columnList: Array; // user select columnKeys + changeColumn: (val: Array) => void; } interface TableListState { @@ -39,7 +41,6 @@ interface TableListState { modalVisible: boolean; isObjFinal: boolean; isShowColumn: boolean; - columnSelected: Array; // user select columnKeys selectRows: Array; isShowCompareModal: boolean; selectedRowKeys: string[] | number[]; @@ -69,7 +70,6 @@ class TableList extends React.Component { isObjFinal: false, isShowColumn: false, isShowCompareModal: false, - columnSelected: COLUMN, selectRows: [], selectedRowKeys: [], // close selected trial message after modal closed intermediateData: [], @@ -120,6 +120,8 @@ class TableList extends React.Component { } } + // intermediate button click -> intermediate graph for each trial + // support intermediate is dict selectOtherKeys = (value: string) => { const isShowDefault: boolean = value === 'default' ? true : false; @@ -226,7 +228,7 @@ class TableList extends React.Component { }); if (this._isMounted) { - this.setState(() => ({ columnSelected: wantResult })); + this.props.changeColumn(wantResult); } } @@ -277,8 +279,8 @@ class TableList extends React.Component { render() { - const { entries, tableSource, updateList } = this.props; - const { intermediateOption, modalVisible, isShowColumn, columnSelected, + const { entries, tableSource, updateList, columnList } = this.props; + const { intermediateOption, modalVisible, isShowColumn, selectRows, isShowCompareModal, selectedRowKeys, intermediateOtherKeys } = this.state; const rowSelection = { selectedRowKeys: selectedRowKeys, @@ -316,8 +318,8 @@ class TableList extends React.Component { value: item }); }); - Object.keys(columnSelected).map(key => { - const item = columnSelected[key]; + Object.keys(columnList).map(key => { + const item = columnList[key]; switch (item) { case 'Trial No.': showColumn.push({ @@ -413,13 +415,12 @@ class TableList extends React.Component { key: 'acc', width: 120, sorter: (a: TableObj, b: TableObj) => { - const aa = a.description.intermediate; - const bb = b.description.intermediate; - if (aa !== undefined && bb !== undefined) { - return aa[aa.length - 1] - bb[bb.length - 1]; - } else { - return NaN; - } + const oneArr = a.description.intermediate; + const otherArr = b.description.intermediate; + const one = (oneArr[oneArr.length - 1] !== undefined) ? oneArr[oneArr.length - 1] : 0; + const other = (otherArr[otherArr.length - 1] !== undefined) + ? otherArr[otherArr.length - 1] : 0; + return one - other; }, render: (text: string, record: TableObj) => { return ( @@ -581,7 +582,8 @@ class TableList extends React.Component { > diff --git a/src/webui/src/static/interface.ts b/src/webui/src/static/interface.ts index 3d004eddfd..15349e23ab 100644 --- a/src/webui/src/static/interface.ts +++ b/src/webui/src/static/interface.ts @@ -27,7 +27,7 @@ interface Parameters { parameters: ErrorParameter; logPath?: string; intermediate: Array; - progress?: number; + multiProgress?: number; } interface Experiment { diff --git a/tools/nni_cmd/config_schema.py b/tools/nni_cmd/config_schema.py index 5118c793b7..f09786664b 100644 --- a/tools/nni_cmd/config_schema.py +++ b/tools/nni_cmd/config_schema.py @@ -233,8 +233,7 @@ def setPathCheck(key): 'cpuNum': setNumberRange('cpuNum', int, 0, 99999), 'memoryMB': setType('memoryMB', int), 'image': setType('image', str), - Optional('authFile'): And(Regex(r'hdfs://(([0-9]{1,3}.){3}[0-9]{1,3})(:[0-9]{2,5})?(/.*)?'),\ - error='ERROR: authFile format error, authFile format is hdfs://xxx.xxx.xxx.xxx:xxx'), + Optional('authFile'): And(os.path.exists, error=SCHEMA_PATH_ERROR % 'authFile'), Optional('shmMB'): setType('shmMB', int), Optional('dataDir'): And(Regex(r'hdfs://(([0-9]{1,3}.){3}[0-9]{1,3})(:[0-9]{2,5})?(/.*)?'),\ error='ERROR: dataDir format error, dataDir format is hdfs://xxx.xxx.xxx.xxx:xxx'),