Merge pull request #222 from microsoft/master

merge master

src/webui/src/static/model/experiment.ts

@@ -41,6 +41,7 @@ class Experiment {
         if (!this.profileField) {
             throw Error('Experiment profile not initialized');
         }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return this.profileField!;
     }
 
@@ -73,6 +74,7 @@ class Experiment {
         if (!this.statusField) {
             throw Error('Experiment status not initialized');
         }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return this.statusField!.status;
     }
 
@@ -80,6 +82,7 @@ class Experiment {
         if (!this.statusField) {
             throw Error('Experiment status not initialized');
         }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return this.statusField!.errors[0] || '';
     }
 }

test/generate_ts_config.py

@@ -14,11 +14,11 @@ def update_training_service_config(args):
         config[args.ts]['nniManagerIp'] = args.nni_manager_ip
     if args.ts == 'pai':
         if args.pai_user is not None:
-            config[args.ts]['paiConfig']['userName'] = args.pai_user
+            config[args.ts]['paiYarnConfig']['userName'] = args.pai_user
         if args.pai_pwd is not None:
-            config[args.ts]['paiConfig']['passWord'] = args.pai_pwd
+            config[args.ts]['paiYarnConfig']['passWord'] = args.pai_pwd
         if args.pai_host is not None:
-            config[args.ts]['paiConfig']['host'] = args.pai_host
+            config[args.ts]['paiYarnConfig']['host'] = args.pai_host
         if args.nni_docker_image is not None:
             config[args.ts]['trial']['image'] = args.nni_docker_image
         if args.data_dir is not None:

test/training_service.yml

@@ -29,11 +29,11 @@ local:
 pai:
   nniManagerIp:
   maxExecDuration: 15m
-  paiConfig:
+  paiYarnConfig:
     host:
     passWord:
     userName:
-  trainingServicePlatform: pai
+  trainingServicePlatform: paiYarn
   trial:
     gpuNum: 1
     cpuNum: 1