Merge pull request #22 from microsoft/master

pull code
SparkSnail · Jun 25, 2019 · 256f27a · 256f27a
2 parents 1c56fea + eb0df3d
commit 256f27a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/webui/src/components/trial-detail/Para.tsx b/src/webui/src/components/trial-detail/Para.tsx
@@ -145,7 +145,8 @@ class Para extends React.Component<ParaProps, ParaState> {
 
         const parallelAxis: Array<Dimobj> = [];
         // search space range and specific value [only number]
-        for (let i = 0; i < dimName.length; i++) {
+        let i = 0;
+        for (i; i < dimName.length; i++) {
             const searchKey = searchRange[dimName[i]];
             switch (searchKey._type) {
                 case 'uniform':
@@ -213,6 +214,13 @@ class Para extends React.Component<ParaProps, ParaState> {
 
             }
         }
+        parallelAxis.push({
+            dim: i,
+            name: 'default metric',
+            nameTextStyle: {
+                fontWeight: 700
+            }
+        });
         if (lenOfDataSource === 0) {
             const optionOfNull = {
                 parallelAxis,
@@ -229,8 +237,8 @@ class Para extends React.Component<ParaProps, ParaState> {
                                 const length = value.length;
                                 if (length > 16) {
                                     const temp = value.split('');
-                                    for (let i = 16; i < temp.length; i += 17) {
-                                        temp[i] += '\n';
+                                    for (let m = 16; m < temp.length; m += 17) {
+                                        temp[m] += '\n';
                                     }
                                     return temp.join('');
                                 } else {

diff --git a/src/webui/src/static/interface.ts b/src/webui/src/static/interface.ts
@@ -97,6 +97,7 @@ interface Dimobj {
     axisTick?: object;
     axisLabel?: object;
     axisLine?: object;
+    nameTextStyle?: object;
 }
 
 interface ParaObj {

diff --git a/tools/nni_trial_tool/trial_keeper.py b/tools/nni_trial_tool/trial_keeper.py
@@ -51,7 +51,7 @@ def get_hdfs_client(args):
         return _hdfs_client
     # backward compatibility
     hdfs_host = None
-    hdfs_output_dir = None
+
     if args.hdfs_host:
         hdfs_host = args.hdfs_host
     elif args.pai_hdfs_host:
@@ -83,6 +83,8 @@ def main_loop(args):
     # redirect trial keeper's stdout and stderr to syslog
     trial_syslogger_stdout = RemoteLogger(args.nnimanager_ip, args.nnimanager_port, 'trial', StdOutputType.Stdout, args.log_collection)
     sys.stdout = sys.stderr = trial_keeper_syslogger
+    hdfs_output_dir = None
+
     if args.hdfs_output_dir:
         hdfs_output_dir = args.hdfs_output_dir
     elif args.pai_hdfs_output_dir: