Merge pull request #20 from microsoft/master

pull code

src/webui/src/static/interface.ts

@@ -109,7 +109,7 @@ interface FinalResult {
 }
 
 export {
-    TableObj, Parameters, Experiment, 
+    TableObj, Parameters, Experiment,
     AccurPoint, TrialNumber, TrialJob,
     DetailAccurPoint, TooltipForAccuracy,
     ParaObj, Dimobj, FinalResult, FinalType,

src/webui/src/static/style/openRow.scss

@@ -41,7 +41,7 @@ $bgColor: #f2f2f2;
         color: #212121;
         background-color: #fff;
         cursor: pointer;
-        border: none; 
+        border: none;
     }
     .logcontent{
         height: 100%;

src/webui/src/static/style/overview.scss

@@ -5,7 +5,7 @@
 }
 .overGraph{
     height: 362px;
-    
+
     .accuracy{
         width: 100%;
         height: 324px;

src/webui/src/static/style/overviewTitle.scss

@@ -53,7 +53,7 @@ $titleBgcolor: #b3b3b3;
     .minTitle{
         border-right: 2px solid #fff;
     }
-    
+
     .title:hover{
         cursor: pointer;
     }

src/webui/src/static/style/para.scss

 
 .parameter{
-    height: 100%;    
+    height: 100%;
 }
 
 .meline{
@@ -15,14 +15,14 @@
 .searcHyper{
     position: relative;
     margin: 0 19px;
-    
+
     .noneData{
         position: absolute;
         left: 49%;
         top: 2.5%;
         font-size: 13px;
         color: #999;
-    }    
+    }
 }
 
 /* Intermediate Result Style */

src/webui/src/static/style/progress.scss

@@ -26,7 +26,7 @@
             border-top-left-radius: 12px;
             border-bottom-left-radius: 12px;
         }
-        
+
         .showProgress{
             height: 30px;
         }

src/webui/src/static/style/slideBar.scss

 $barHeight: 56px;
+/* drowdown and select default bgcolor */
+$drowBgColor: #f2f2f2;
+/* drowdown and select hover bgcolor */
+$drowHoverBgColor: #e2e2e2;
 .nav{
     list-style: none;
-    width: 94%;
+    width: 95%;
     height: $barHeight;
     margin: 0 auto;
+    position: relative;
     .tab{
         font-family: 'Segoe';
         line-height: $barHeight;
@@ -14,7 +19,7 @@ $barHeight: 56px;
         }
     }
     .firstTab{
-        margin: 0 32px;
+        margin: 0 20px;
     }
     .logo{
         margin-top: 2px;
@@ -28,17 +33,26 @@ $barHeight: 56px;
 }
 
 .feedback{
-    text-align: right;
+    position: fixed;
+    right: 19%;
     line-height: $barHeight;
     font-size: 16px;
     color: #fff;
+    .fresh{
+        span{
+            margin: 0 10px 0 3px;
+        }
+    }
+    .fresh:hover{
+        cursor: pointer;
+    }
     a{
         color: #fff;
         text-decoration: none;
         margin-left: 10px;
     }
     img{
-        width: 24px;
+        width: 20px;
         margin-right: 8px;
     }
     .version{
@@ -51,4 +65,66 @@ $barHeight: 56px;
 }
 .dropdown{
     margin-right: 10px;
-}
+    /* make dropdown content box position in blue bar bottom */
\ No newline at end of file
+    padding-bottom: 14px;
+}
+.interval{
+    position: fixed;
+    right: 7%;
+    top: 12px;
+    .ant-select-selection{
+        background-color: transparent;
+        border: none;
+        color: #fff;
+        outline: none;
+        font-size: 16px;
+    }
+    .ant-select-arrow{
+        color: #fff;
+    }
+}
+/* set select bgcolor */
+.ant-select-dropdown-menu{
+    background-color: $drowBgColor;
+}
+.ant-select-dropdown-menu-item:hover{
+    background-color: $drowHoverBgColor;
+}
+.ant-select-dropdown-menu-item-active{
+    background-color: transparent;
+}
+/* set dropdown bgcolor */
+.ant-dropdown{
+    .ant-dropdown-menu{
+        padding: 0;
+        background-color: $drowBgColor;
+        border-radius: 0;
+        .ant-dropdown-menu-item:hover{
+            background-color: $drowHoverBgColor;
+        }
+    }
+}
+
+/* nav style*/
+.little{
+    width: 100%;
+    .menu{
+        .show{
+            display: block;
+        }
+        .hide{
+            display: none;
+        }
+        .more{
+            color: #fff;
+            font-size: 24px;
+            margin-top: 16px;
+        }
+        .more:hover{
+            cursor: pointer;
+        }
+    }
+    .logo{
+        text-align: center;
+    }
+}

src/webui/src/static/style/table.scss

@@ -27,7 +27,7 @@
 /* add the brother selector to increase the priority */
 #succeTable .commonTableStyle, #tableList .commonTableStyle {
 
-    tr{ 
+    tr{
         text-align: center;
         color:#212121;
         font-family: 'Segoe';
@@ -43,14 +43,14 @@
         border-bottom: 1px solid #d0d0d0;
         text-align: center;
     }
-    
+
 
     .ant-table-expanded-row{
         /* background-color: #f2f2f2 */
-        background-color: transparent; 
+        background-color: transparent;
     }
 
-    tr:hover{ 
+    tr:hover{
         /* cancel antd table default hover style */
         td{
             background-color: transparent;

test/async_sharing_test/config.yml

@@ -4,7 +4,7 @@ trialConcurrency: 3
 maxExecDuration: 1h
 maxTrialNum: 10
 #choice: local, remote, pai
-trainingServicePlatform: remote 
+trainingServicePlatform: remote
 #choice: true, false
 useAnnotation: false
 multiThread: true

test/config_test/examples/mnist-nas.test.yml

+authorName: nni
+experimentName: default_test
+maxExecDuration: 5m
+maxTrialNum: 4
+trialConcurrency: 2
+
+tuner:
+  codeDir: ../../../examples/tuners/random_nas_tuner
+  classFileName: random_nas_tuner.py
+  className: RandomNASTuner
+trial:
+  codeDir: ../../../examples/trials/mnist-nas
+  command: python3 mnist.py --batch_num 100
+  gpuNum: 0
+
+useAnnotation: true
+multiPhase: false
+multiThread: false
+
+trainingServicePlatform: local

test/config_test/multi_phase/search_space.json

@@ -3,5 +3,5 @@
     {
         "_type" : "choice",
         "_value" : [1, 100]
-    } 
+    }
 }
\ No newline at end of file

test/config_test/multi_thread/search_space.json

@@ -3,5 +3,5 @@
     {
         "_type" : "choice",
         "_value" : [1, 100]
-    } 
+    }
 }
\ No newline at end of file

test/config_test/tuners/search_space_batchtuner.json

@@ -5,8 +5,8 @@
         "_value" : [{"optimizer": "Adam", "learning_rate": 0.00001},
                     {"optimizer": "Adam", "learning_rate": 0.0001},
                     {"optimizer": "Adam", "learning_rate": 0.001},
-                    {"optimizer": "SGD", "learning_rate": 0.01}, 
-                    {"optimizer": "SGD", "learning_rate": 0.005}, 
+                    {"optimizer": "SGD", "learning_rate": 0.01},
+                    {"optimizer": "SGD", "learning_rate": 0.005},
                     {"optimizer": "SGD", "learning_rate": 0.0002}]
     }
 }
\ No newline at end of file

test/metrics_test.py

@@ -69,7 +69,7 @@ def get_metric_results(metrics):
         elif metric['type'] == 'FINAL':
             final_result.append(metric['data'])
     print(intermediate_result, final_result)
-    
+
     return [round(float(x),6) for x in intermediate_result], [round(float(x), 6) for x in final_result]
 
 def get_max_values(config_file):

test/metrics_test/search_space.json

@@ -3,5 +3,5 @@
     {
         "_type" : "choice",
         "_value" : [1, 100]
-    } 
+    }
 }
\ No newline at end of file

test/metrics_test/trial.py

@@ -4,7 +4,7 @@ import nni
 if __name__ == '__main__':
     hyper_params = nni.get_next_parameter()
 
-    for i in range(10):    
+    for i in range(10):
         nni.report_intermediate_result(0.1*(i+1))
         time.sleep(2)
     nni.report_final_result(1.0)

test/naive_test/README.md

@@ -15,6 +15,6 @@
 * When the experiment is done, meaning it is successfully done in this case, `Experiment done` can be detected in the nni_manager.log file.
 
 ## Issues
-* Private APIs are used to detect whether tuner and assessor have terminated successfully. 
+* Private APIs are used to detect whether tuner and assessor have terminated successfully.
 * The output of REST server is not tested.
 * Remote machine training service is not tested.
\ No newline at end of file

test/pipelines-it-pai-windows.yml

@@ -55,6 +55,10 @@ jobs:
       python --version
       powershell.exe -file install.ps1
     displayName: 'Install nni toolkit via source code'
+  - script: |
+      set PATH=$(ENV_PATH)
+      python -m pip install scikit-learn==0.21.0 --user
+    displayName: 'Install dependencies for integration tests'
   - script: |
       cd test
       set PATH=$(ENV_PATH)

test/pipelines-it-remote-windows.yml

@@ -47,3 +47,9 @@ jobs:
       runOptions: commands
       commands: python3 /tmp/nnitest/$(Build.BuildId)/nni-remote/test/remote_docker.py --mode stop --name $(Build.BuildId) --os windows
     displayName: 'Stop docker'
+  - task: SSH@0
+    inputs:
+      sshEndpoint: $(end_point)
+      runOptions: commands
+      commands: sudo rm -rf /tmp/nnitest/$(Build.BuildId)
+    displayName: 'Clean the remote files'  

test/remote_docker.py

@@ -62,7 +62,7 @@ def start_container(image, name, nnimanager_os):
         file.write(str(port))
 
 def stop_container(name):
-    '''Stop docker container''' 
+    '''Stop docker container'''
     stop_cmds = ['docker', 'container', 'stop', name]
     check_call(stop_cmds)
     rm_cmds = ['docker', 'container', 'rm', name]