From 1b29cd8f30b5b93c78d2682438e51ff6d1221fb1 Mon Sep 17 00:00:00 2001
From: QuanluZhang <z.quanluzhang@gmail.com>
Date: Wed, 3 Oct 2018 13:47:51 +0800
Subject: [PATCH 1/5] fix antd (#159)

---
 src/webui/package.json                | 2 +-
 src/webui/src/components/SlideBar.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/webui/package.json b/src/webui/package.json
index 0178ccfa98..f4c258ee46 100644
--- a/src/webui/package.json
+++ b/src/webui/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "antd": "^3.9.3",
+    "antd": "^3.8.1",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.1.0",
diff --git a/src/webui/src/components/SlideBar.tsx b/src/webui/src/components/SlideBar.tsx
index adce8a51b4..2219491971 100644
--- a/src/webui/src/components/SlideBar.tsx
+++ b/src/webui/src/components/SlideBar.tsx
@@ -11,7 +11,7 @@ class SlideBar extends React.Component<{}, {}> {
         <ul className="nav">
           <li>
             <IndexLink to={'/oview'} activeClassName="high">
-              <Icon className="icon" type="experiment" theme="outlined" />Overview
+              <Icon className="icon" type="rocket" />Overview
               <Icon className="floicon" type="right" />
             </IndexLink>
           </li>
@@ -41,7 +41,7 @@ class SlideBar extends React.Component<{}, {}> {
           </li>
           <li>
             <a href="https://github.com/Microsoft/nni/issues" target="_blank">
-              <Icon className="icon" type="smile" theme="outlined" />Feedback
+              <Icon className="icon" type="smile" />Feedback
             </a>
           </li>
         </ul>

From 35c37c79fcd74d5e393d751e574e43c680bc151b Mon Sep 17 00:00:00 2001
From: SparkSnail <shinaiyang@pku.edu.cn>
Date: Mon, 8 Oct 2018 14:21:59 +0800
Subject: [PATCH 2/5] quick fix config_pai.yml in examples (#171)

* fix nnictl bug

* add hdfs host validation

* fix bugs

* fix dockerfile

* fix install.sh

* update install.sh

* fix dockerfile

* Set timeout for HDFSUtility exists function

* remove unused TODO

* fix sdk

* add optional for outputDir and dataDir

* refactor dockerfile.base

* Remove unused import in hdfsclientUtility

* add config_pai.yml

* refactor nnictl create logic and add colorful print

* fix nnictl stop logic

* add annotation for config_pai.yml

* add document for start experiment

* fix config.yml

* fix document

* fix dataDir and outputDir in config_pai.yml

* fix config_pai.yml
---
 examples/trials/auto-gbdt/config_pai.yml              | 4 ++--
 examples/trials/ga_squad/config_pai.yml               | 4 ++--
 examples/trials/mnist-annotation/config_pai.yml       | 4 ++--
 examples/trials/mnist-batch-tune-keras/config_pai.yml | 4 ++--
 examples/trials/mnist-keras/config_pai.yml            | 4 ++--
 examples/trials/mnist-smartparam/config_pai.yml       | 4 ++--
 examples/trials/mnist/config_pai.yml                  | 4 ++--
 examples/trials/pytorch_cifar10/config_pai.yml        | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/examples/trials/auto-gbdt/config_pai.yml b/examples/trials/auto-gbdt/config_pai.yml
index 26577cf83a..feaa881923 100644
--- a/examples/trials/auto-gbdt/config_pai.yml
+++ b/examples/trials/auto-gbdt/config_pai.yml
@@ -24,9 +24,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username
diff --git a/examples/trials/ga_squad/config_pai.yml b/examples/trials/ga_squad/config_pai.yml
index 56c2d33069..d4435e5657 100644
--- a/examples/trials/ga_squad/config_pai.yml
+++ b/examples/trials/ga_squad/config_pai.yml
@@ -22,9 +22,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username
diff --git a/examples/trials/mnist-annotation/config_pai.yml b/examples/trials/mnist-annotation/config_pai.yml
index edb9e62384..abc86a908e 100644
--- a/examples/trials/mnist-annotation/config_pai.yml
+++ b/examples/trials/mnist-annotation/config_pai.yml
@@ -23,9 +23,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username
diff --git a/examples/trials/mnist-batch-tune-keras/config_pai.yml b/examples/trials/mnist-batch-tune-keras/config_pai.yml
index 183c220e2d..c7c0de7a14 100644
--- a/examples/trials/mnist-batch-tune-keras/config_pai.yml
+++ b/examples/trials/mnist-batch-tune-keras/config_pai.yml
@@ -24,9 +24,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username
diff --git a/examples/trials/mnist-keras/config_pai.yml b/examples/trials/mnist-keras/config_pai.yml
index bbf8136144..cbea797ef3 100644
--- a/examples/trials/mnist-keras/config_pai.yml
+++ b/examples/trials/mnist-keras/config_pai.yml
@@ -24,9 +24,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username
diff --git a/examples/trials/mnist-smartparam/config_pai.yml b/examples/trials/mnist-smartparam/config_pai.yml
index 4b5a088d11..92e489a30e 100644
--- a/examples/trials/mnist-smartparam/config_pai.yml
+++ b/examples/trials/mnist-smartparam/config_pai.yml
@@ -23,9 +23,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username
diff --git a/examples/trials/mnist/config_pai.yml b/examples/trials/mnist/config_pai.yml
index a20fdce40b..52ed313ac8 100644
--- a/examples/trials/mnist/config_pai.yml
+++ b/examples/trials/mnist/config_pai.yml
@@ -24,9 +24,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username
diff --git a/examples/trials/pytorch_cifar10/config_pai.yml b/examples/trials/pytorch_cifar10/config_pai.yml
index 783285f815..fbb3f037a3 100644
--- a/examples/trials/pytorch_cifar10/config_pai.yml
+++ b/examples/trials/pytorch_cifar10/config_pai.yml
@@ -24,9 +24,9 @@ trial:
   #The docker image to run nni job on pai
   image: openpai/pai.example.tensorflow
   #The hdfs directory to store data on pai, format 'hdfs://host:port/directory'
-  hdfsDataDir: hdfs://10.10.10.10:9000/username/nni
+  dataDir: hdfs://10.10.10.10:9000/username/nni
   #The hdfs directory to store output data generated by nni, format 'hdfs://host:port/directory'
-  hdfsOutputDir: hdfs://10.10.10.10:9000/username/nni
+  outputDir: hdfs://10.10.10.10:9000/username/nni
 paiConfig:
   #The username to login pai
   userName: username

From 01e6b29ca243b545e99d5b06999ed26e0e54ccec Mon Sep 17 00:00:00 2001
From: Lijiao <35484733+lvybriage@users.noreply.github.com>
Date: Mon, 8 Oct 2018 16:08:55 +0800
Subject: [PATCH 3/5] Update slidebar icon (#173)

---
 src/webui/src/components/SlideBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webui/src/components/SlideBar.tsx b/src/webui/src/components/SlideBar.tsx
index 2219491971..fa44885123 100644
--- a/src/webui/src/components/SlideBar.tsx
+++ b/src/webui/src/components/SlideBar.tsx
@@ -11,7 +11,7 @@ class SlideBar extends React.Component<{}, {}> {
         <ul className="nav">
           <li>
             <IndexLink to={'/oview'} activeClassName="high">
-              <Icon className="icon" type="rocket" />Overview
+              <Icon className="icon" type="home" />Overview
               <Icon className="floicon" type="right" />
             </IndexLink>
           </li>

From 09eb1cddca53bfc37bccb437151df1c434279711 Mon Sep 17 00:00:00 2001
From: SparkSnail <shinaiyang@pku.edu.cn>
Date: Thu, 11 Oct 2018 11:25:09 +0800
Subject: [PATCH 4/5] quick fix bug: assessor validation in nnictl (#200)

* fix nnictl bug

* add hdfs host validation

* fix bugs

* fix dockerfile

* fix install.sh

* update install.sh

* fix dockerfile

* Set timeout for HDFSUtility exists function

* remove unused TODO

* fix sdk

* add optional for outputDir and dataDir

* refactor dockerfile.base

* Remove unused import in hdfsclientUtility

* add config_pai.yml

* refactor nnictl create logic and add colorful print

* fix nnictl stop logic

* add annotation for config_pai.yml

* add document for start experiment

* fix config.yml

* fix document

* fix dataDir and outputDir in config_pai.yml

* fix config_pai.yml

* fix assessor launcher
---
 tools/nnicmd/config_schema.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nnicmd/config_schema.py b/tools/nnicmd/config_schema.py
index d6299256bd..5407e284e0 100644
--- a/tools/nnicmd/config_schema.py
+++ b/tools/nnicmd/config_schema.py
@@ -48,7 +48,7 @@
     'builtinAssessorName': lambda x: x in ['Medianstop'],
     'classArgs': {
         'optimize_mode': lambda x: x in ['maximize', 'minimize']},
-    'gpuNum': And(int, lambda x: 0 <= x <= 99999)
+    Optional('gpuNum'): And(int, lambda x: 0 <= x <= 99999)
 },{
     'codeDir': os.path.exists,
     'classFileName': str,

From d2dcb38351943433d1b2dc8366f2b891585729e3 Mon Sep 17 00:00:00 2001
From: Lijiao <35484733+lvybriage@users.noreply.github.com>
Date: Fri, 12 Oct 2018 12:00:10 +0800
Subject: [PATCH 5/5] Disable the tensorboard button about pai experiment
 (#192)

---
 src/webui/src/components/TrialStatus.tsx | 31 +++++++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/webui/src/components/TrialStatus.tsx b/src/webui/src/components/TrialStatus.tsx
index d0e0980ee2..125386cdc5 100644
--- a/src/webui/src/components/TrialStatus.tsx
+++ b/src/webui/src/components/TrialStatus.tsx
@@ -51,6 +51,7 @@ interface TabState {
     trialJobs: object;
     intermediateOption: object;
     modalVisible: boolean;
+    disTensorButton: boolean;
 }
 
 class TrialStatus extends React.Component<{}, TabState> {
@@ -79,7 +80,8 @@ class TrialStatus extends React.Component<{}, TabState> {
             option: {},
             intermediateOption: {},
             trialJobs: {},
-            modalVisible: false
+            modalVisible: false,
+            disTensorButton: false
         };
     }
 
@@ -346,6 +348,26 @@ class TrialStatus extends React.Component<{}, TabState> {
         };
     }
 
+    // experiment mode is pai, display tensorboard button
+    disTensorBoard = () => {
+        axios(`${MANAGER_IP}/experiment`, {
+            method: 'GET'
+        })
+            .then(res => {
+                if (res.status === 200) {
+                    const experimentObj = res.data;
+                    const trainPlatform = experimentObj.params.trainingServicePlatform;
+                    if (trainPlatform && trainPlatform === 'pai') {
+                        if (this._isMounted) {
+                            this.setState(() => ({
+                                disTensorButton: true
+                            }));
+                        }
+                    }
+                }
+            });
+    }
+
     componentDidMount() {
 
         this._isMounted = true;
@@ -353,6 +375,7 @@ class TrialStatus extends React.Component<{}, TabState> {
         this.drawRunGraph();
         // the init of trials status in the table
         this.drawTable();
+        this.disTensorBoard();
         this.intervalID = window.setInterval(this.drawRunGraph, 10000);
         this.intervalIDS = window.setInterval(this.drawTable, 10000);
     }
@@ -365,7 +388,7 @@ class TrialStatus extends React.Component<{}, TabState> {
     }
 
     render() {
-        const { intermediateOption, modalVisible, option, tableData } = this.state;
+        const { intermediateOption, modalVisible, option, tableData, disTensorButton } = this.state;
         let bgColor = '';
         const trialJob: Array<TrialJob> = [];
         trialJobStatus.map(item => {
@@ -457,7 +480,7 @@ class TrialStatus extends React.Component<{}, TabState> {
                             </Button>
                         )
                 );
-            },
+            }
         }, {
             title: 'Tensor',
             dataIndex: 'tensor',
@@ -468,6 +491,7 @@ class TrialStatus extends React.Component<{}, TabState> {
                     <Button
                         type="primary"
                         className="tableButton"
+                        disabled={disTensorButton}
                         onClick={this.getTensorpage.bind(this, record.id)}
                     >
                         TensorBoard
@@ -476,7 +500,6 @@ class TrialStatus extends React.Component<{}, TabState> {
             },
         }
         ];
-
         const openRow = (record: TableObj) => {
             const parametersRow = {
                 parameters: record.description.parameters