Merge pull request #2959 from microsoft/v1.9

Merge v1.9 back to master

src/webui/src/static/interface.ts

@@ -33,6 +33,7 @@ interface TableObj {
     color?: string;
     startTime?: number;
     endTime?: number;
+    intermediates: (MetricDataRecord | undefined)[];
     parameters(axes: MultipleAxes): Map<SingleAxis, any>;
     metrics(axes: MultipleAxes): Map<SingleAxis, any>;
 }

src/webui/src/static/model/trial.ts

@@ -60,7 +60,7 @@ function inferTrialParameters(
 class Trial implements TableObj {
     private metricsInitialized: boolean = false;
     private infoField: TrialJobInfo | undefined;
-    private intermediates: (MetricDataRecord | undefined)[] = [];
+    public intermediates: (MetricDataRecord | undefined)[] = [];
     public final: MetricDataRecord | undefined;
     private finalAcc: number | undefined;
 
@@ -224,24 +224,29 @@ class Trial implements TableObj {
     }
 
     public parameters(axes: MultipleAxes): Map<SingleAxis, any> {
+        const ret = new Map<SingleAxis, any>(Array.from(axes.axes.values()).map(k => [k, null]));
         if (this.info === undefined || this.info.hyperParameters === undefined) {
-            throw new Map();
+            throw ret;
         } else {
             const tempHyper = this.info.hyperParameters;
             let params = JSON.parse(tempHyper[tempHyper.length - 1]).parameters;
             if (typeof params === 'string') {
                 params = JSON.parse(params);
             }
-            const [result, unexpectedEntries] = inferTrialParameters(params, axes);
+            const [updated, unexpectedEntries] = inferTrialParameters(params, axes);
             if (unexpectedEntries.size) {
                 throw unexpectedEntries;
             }
-            return result;
+            for (const [k, v] of updated) {
+                ret.set(k, v);
+            }
+            return ret;
         }
     }
 
     public metrics(space: MultipleAxes): Map<SingleAxis, any> {
-        const ret = new Map<SingleAxis, any>();
+        // set default value: null
+        const ret = new Map<SingleAxis, any>(Array.from(space.axes.values()).map(k => [k, null]));
         const unexpectedEntries = new Map<string, any>();
         if (this.acc === undefined) {
             return ret;

src/webui/src/static/style/loading.scss

+.loading {
+    width: 80%;
+    height: 100%;
+    margin: 0 auto;
+
+    img {
+        width: 40%;
+        position: fixed;
+        top: 30%;
+        left: 30%;
+    }
+}

src/webui/src/static/style/logDrawer.scss

@@ -28,3 +28,7 @@
         text-align: right;
     }
 }
+
+.configClose {
+    margin: 45px 0 25px 0;
+}

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

-
-/* new style */
-.overMessage {
-    height: 446px;
-}
-
-.blockPadding {
-    padding: 10px 20px;
-}
-
-.commonTableStyle {
-    padding: 15px 20px;
-    height: 100%;
-    min-width: 500px;
-    overflow-y: auto;
-}
-
-.padItem {
-    padding: 10px 20px 0 20px;
-}
-
-.searchSpace {
-    line-height: 22px;
-    font-size: 14px;
-    padding: 15px 0;
-    color: #212121;
-    width: 95%;
-}
-
-.nowrap {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
-.main {
-    margin: 9px 0;
-}
-
-.profile {
-    pre {
-        overflow: inherit;
-    }
-}
-
-.link {
-    margin-bottom: 10px;
-}
-
-.info {
-    position: relative;
-    top: 15px;
-    left: 10px;
-
-    span {
-        color: #333;
-        font-size: 14px;
-    }
-}
-
-/* overview-succeed-graph */
-.showMess {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}

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

+.command {
+    width: 100%;
+
+    >div {
+        display: inline-block;
+    }
+
+    .command1 {
+        width: 46%;
+
+        p {
+            margin-top: 0;
+        }
+    }
+
+    .command2 {
+        width: 54%;
+
+        p {
+            margin-top: 0;
+        }
+    }
+
+    .command1,
+    .command2 {
+        .lineMargin {
+            margin-top: 20px;
+        }
+    }
+}

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

+.config {
+    position: fixed;
+    right: 0;
+    z-index: 1000;
+
+    .ms-Button--default {
+        padding: 0;
+        margin: 0 0 15px 0;
+        border-radius: 18px 0 0 18px;
+        border: 1px solid #ccc;
+        color: #0573bc;
+    }
+
+    .ms-Button--default:hover {
+        background-color: orangered;
+        color: #fff;
+    }
+}
+
+.ms-Fabric {
+    .ms-Panel-commands {
+        margin: 0;
+    }
+}

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

+$seriesIconMargin: 13px;
+
+.ExpDuration {
+    margin-top: 28px;
+
+    span:hover {
+        cursor: pointer;
+    }
+}
+
+.durationInput {
+    width: 42px;
+    height: 32px;
+    padding-right: 5px;
+    text-align: right;
+    outline: none;
+    border: none;
+    border-bottom: 1px solid #ccc;
+}
+
+.maxExecDuration {
+    width: 74px;
+}
+
+.series {
+    i {
+        font-size: 20px;
+        font-weight: 700;
+    }
+
+    .confirm {
+        margin: 0 $seriesIconMargin;
+
+        i {
+            color: green;
+        }
+    }
+}
+
+.cancel i {
+    color: red;
+}
+
+.edit i {
+    margin-left: 4px;
+}
+
+.overview input:disabled {
+    background: transparent;
+    border: none;
+}
+
+.info {
+    position: absolute;
+    z-index: 999;
+    left: 0;
+}

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

+$boxPadding: 20px 42px;
+
+.wrapper {
+    display: grid;
+    grid-template-columns: repeat(8, 1fr);
+    grid-auto-rows: 82px;
+    grid-gap: 18px;
+
+    >div {
+        background: #fff;
+        padding: $boxPadding;
+        border-radius: 20px;
+        box-sizing: border-box;
+    }
+
+    .overviewProgress {
+        grid-column: 2 / 5;
+        grid-row: 1 / 5;
+        display: grid;
+        grid-auto-rows: 70px;
+        padding: 0;
+        background: transparent;
+
+        .duration,
+        .trialCount {
+            background: #fff;
+            padding: $boxPadding;
+            border-radius: 20px;
+            box-sizing: border-box;
+
+            /* for alert message tooltip position */
+            position: relative;
+        }
+
+        .duration {
+            // grid-row: 1 / 3;
+            height: 136px;
+        }
+
+        .trialCount {
+            margin-top: 14px;
+            height: 228px;
+        }
+    }
+}
+
+.overviewBasicInfo {
+    grid-column-start: 1;
+    grid-row: 1 / 5;
+    z-index: 2;
+}
+
+.basic {
+    line-height: 21px;
+    font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+
+    p {
+        font-size: 14px;
+        color: #8f8f8f;
+        margin-top: 20px;
+    }
+
+    div {
+        font-size: 16px;
+        color: #484848;
+    }
+
+    .nowrap {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+}
+
+.overviewTable {
+    grid-column: 5 / 9;
+    grid-row: 1 / 10;
+    overflow: hidden;
+
+    .topTrialTitle {
+        width: 72%;
+    }
+
+    .active {
+        background: #f3f2f1;
+    }
+
+    .max {
+        margin-left: 7px;
+    }
+
+    .mincenter {
+        margin: 0 13px 0 10px;
+    }
+
+    .chooseEntry {
+        margin-right: 10px;
+        line-height: 30px;
+    }
+}
+
+.overviewCommand,
+.overviewChart {
+    grid-column: 1 / 5;
+}
+
+.overviewCommand {
+    height: 144px;
+    overflow: hidden;
+}
+$circle: 10px;
+$bgblue: #0071bc;
+
+.overviewChart {
+    grid-row: 7 / 11;
+    margin-top: -38px;
+
+    .circle {
+        width: $circle;
+        height: $circle;
+        border-radius: 50%;
+        background-color: $bgblue;
+        margin-top: 6px;
+        margin-right: 18px;
+    }
+}

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

-$iconPaddingVal: 14px;
+$iconPaddingVal: 20px;
 
 .panelTitle {
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    width: 100%;
-    height: 38px;
-    padding: 4px $iconPaddingVal;
-    box-sizing: border-box;
-
     img {
-        height: 22px;
+        height: 23px;
 
         /* (38 - 22 ) / 2 */
         margin-top: 8px;
@@ -21,11 +15,11 @@ $iconPaddingVal: 14px;
         font-size: 18px;
         font-weight: 600;
         color: #333;
-        line-height: 38px;
     }
 
     i {
         font-size: 24px;
+        margin-right: 20px;
         color: #545454;
     }
 }
@@ -45,7 +39,7 @@ $iconPaddingVal: 14px;
     }
 
     .minTitle {
-        margin-right: $iconPaddingVal;
+        // margin-right: $iconPaddingVal;
         border-right: 2px solid #fff;
     }
 

src/webui/src/static/style/probar.scss

-#barBack {
-    /* status: 'INITIALIZED' | 'RUNNING' | 'ERROR' | 'STOPPING' | 'STOPPED' | 'DONE' */
-
-    /* status: 'TUNER_NO_MORE_TRIAL' | 'NO_MORE_TRIAL' */
-    .RUNNING,
-    .STOPPING,
-    .INITIALIZED,
-    .NO_MORE_TRIAL,
-    .TUNER_NO_MORE_TRIAL {
-        /* specific status color */
-        color: #0071bc;
-
-        /* progress- duration & trial numbers span */
-        .ms-ProgressIndicator-progressBar {
-            background-color: #0071bc;
-        }
-    }
-
-    .DONE,
-    .STOPPED {
-        color: #009245;
-
-        .ms-ProgressIndicator-progressBar {
-            background-color: #009245;
-        }
-    }
-
-    .ERROR {
-        color: #eb0716;
-
-        .ms-ProgressIndicator-progressBar {
-            background-color: #eb0716;
-        }
-    }
-}
-
-.errorBtn {
-    margin-left: 15px;
-    display: inline-block;
-    width: 18px;
-    height: 18px;
-    line-height: 18px;
-    text-align: center;
-    font-size: 14px;
-    border: 1px solid #4d4d4d;
-    border-radius: 50%;
-    background-color: #4d4d4d;
-    color: #fff;
-}
-
-.errorBtn:hover {
-    cursor: pointer;
-}
-
-.errors {
-    width: 240px;
-    font-size: 14px;
-    color: #212121;
-    word-wrap: break-word;
-    word-break: normal;
-}

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

-.progress {
-    margin: 15px 17px;
-
-    .status {
-        color: #0573bc;
-        font-size: 20px;
-        font-weight: 600;
-        margin-top: 5px;
-
-        .status-text {
-            display: inline-block;
-            line-height: 30px;
-        }
-    }
-
-    .probar {
-        width: 100%;
-        height: 34px;
-        margin-top: 15px;
-
-        .showProgress {
-            width: 300px;
-            height: 30px;
-        }
-
-        .name {
-            width: 178px;
-            box-sizing: border-box;
-            line-height: 30px;
-            text-align: center;
-            color: #fff;
-            background-color: #999;
-            border: 2px solid #e6e6e6;
-            border-top-left-radius: 12px;
-            border-bottom-left-radius: 12px;
-        }
-
-        .boundary {
-            width: 100%;
-            line-height: 24px;
-            font-size: 12px;
-            color: #212121;
-
-            .right {
-                text-align: right;
-            }
-        }
-
-        .description {
-            line-height: 34px;
-            margin-left: 6px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
-
-    &-info {
-        margin-left: 4px;
-        position: relative;
-        top: 2px;
-    }
-}
-
-/* basic experiment message style */
-.basic {
-    line-height: 24px;
-    font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
-
-    p {
-        font-size: 14px;
-        color: #212121;
-    }
-
-    div {
-        font-size: 16px;
-        color: #0573bc;
-    }
-}
-
-.colorOfbasic {
-    div {
-        color: #0573bc;
-    }
-
-    .time {
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
-}
-
-.mess {
-    margin: 10px 0;
-}
-
-.inputBox {
-    height: 32px;
-    margin-top: 5px;
-
-    .concurrencyInput {
-        width: 40px;
-        padding-left: 8px;
-        outline: none;
-        border: 1px solid #ccc;
-    }
-}
-
-.lineBasic {
-    padding-bottom: 14px;
-    border-bottom: 1px solid #ccc;
-}
-
-/* office-fabric-ui progressIndicator */
-.ms-ProgressIndicator-itemProgress {
-    padding: 0;
-    border: 2px solid #e6e6e6;
-    border-radius: 0 12px 12px 0 !important;
-}
-
-.cursor,
-.cursor:hover {
-    cursor: pointer;
-}

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

+/* status: 'INITIALIZED' | 'RUNNING' | 'ERROR' | 'STOPPING' | 'STOPPED' | 'DONE' */
+
+/* status: 'TUNER_NO_MORE_TRIAL' | 'NO_MORE_TRIAL' */
+.RUNNING,
+.STOPPING,
+.INITIALIZED,
+.NO_MORE_TRIAL,
+.TUNER_NO_MORE_TRIAL {
+    /* specific status color */
+    color: #0071bc;
+
+    /* progress- duration & trial numbers span */
+    .ms-ProgressIndicator-progressBar {
+        background-color: #0071bc;
+    }
+}
+
+.DONE,
+.STOPPED {
+    color: #009245;
+
+    .ms-ProgressIndicator-progressBar {
+        background-color: #009245;
+    }
+}
+
+.ERROR {
+    color: #eb0716;
+
+    .ms-ProgressIndicator-progressBar {
+        background-color: #eb0716;
+    }
+}

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

+
+.status {
+    color: #0573bc;
+    font-size: 20px;
+    font-weight: 600;
+    margin-top: 5px;
+
+    .status-text {
+        display: inline-block;
+        line-height: 30px;
+    }
+}
+
+.probar {
+    width: 100%;
+    height: 34px;
+    margin-top: 15px;
+
+    .showProgress {
+        width: 300px;
+        height: 30px;
+    }
+
+    .name {
+        width: 178px;
+        box-sizing: border-box;
+        line-height: 30px;
+        text-align: center;
+        color: #fff;
+        background-color: #999;
+        border: 2px solid #e6e6e6;
+        border-top-left-radius: 12px;
+        border-bottom-left-radius: 12px;
+    }
+
+    .boundary {
+        width: 100%;
+        line-height: 24px;
+        font-size: 12px;
+        color: #212121;
+
+        .right {
+            text-align: right;
+        }
+    }
+
+    .description {
+        line-height: 34px;
+        margin-left: 6px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+}
+
+.inputBox {
+    height: 32px;
+    margin-top: 5px;
+}
+
+/* office-fabric-ui progressIndicator */
+.ms-ProgressIndicator-itemProgress {
+    padding: 0;
+    border: 2px solid #e6e6e6;
+}
+
+.cursor,
+.cursor:hover {
+    cursor: pointer;
+}

src/webui/src/static/style/succTable.scss

 #succTable {
-    height: 404px;
-    overflow: auto;
+    min-height: 400px;
+    max-height: 1000px;
+    overflow-y: auto;
     position: relative;
 
     .succTable-tooltip {
         position: absolute;
         top: 40%;
-        left: 17%;
+        left: 5%;
 
         .link {
             margin-left: 15px;

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

@@ -58,7 +58,7 @@
 }
 
 .detail-table {
-    padding: 5px 0 0 0;
+    padding-top: 5px;
 }
 
 .columns-height {

src/webui/src/static/style/trialsDetail.scss

@@ -57,6 +57,14 @@
 }
 
 /* table list all */
+.bulletedList {
+    background: #fff;
+
+    .title {
+        margin-top: 18px;
+        margin-left: 14px;
+    }
+}
 
 #tableList {
     width: 96%;

test/pipelines/pipelines-it-installation.yml

@@ -14,13 +14,9 @@ jobs:
       python3 -m pip install --upgrade nni --user
     displayName: 'Install nni'
 
-- job: 'pip_install_macOS_python36'
+- job: 'pip_install_macOS_python3'
   pool:
-    vmImage: 'macOS-10.13'
-  strategy:
-    matrix:
-      Python36:
-        PYTHON_VERSION: '3.6'
+    vmImage: 'macOS-latest'
 
   steps:
   - script: |

tools/nni_cmd/launcher.py

@@ -138,7 +138,10 @@ def set_remote_config(experiment_config, port, config_file_name):
     '''Call setClusterMetadata to pass trial'''
     #set machine_list
     request_data = dict()
-    request_data['remote_config'] = experiment_config['remoteConfig']
+    if experiment_config.get('remoteConfig'):
+        request_data['remote_config'] = experiment_config['remoteConfig']
+    else:
+        request_data['remote_config'] = {'reuse': False}
     request_data['machine_list'] = experiment_config['machineList']
     if request_data['machine_list']:
         for i in range(len(request_data['machine_list'])):