Merge pull request #196 from microsoft/master

merge master

tools/nni_cmd/launcher_utils.py

@@ -253,6 +253,14 @@ def validate_pai_trial_conifg(experiment_config):
         experiment_config['trial']['shmMB'] > experiment_config['trial']['memoryMB']:
             print_error('shmMB should be no more than memoryMB!')
             exit(1)
+        #backward compatibility
+        warning_information = '{0} is not supported in NNI anymore, please remove the field in config file!\
+        please refer https://github.com/microsoft/nni/blob/master/docs/en_US/TrainingService/PaiMode.md#run-an-experiment\
+        for the practices of how to get data and output model in trial code'
+        if experiment_config.get('trial').get('dataDir'):
+            print_warning(warning_information.format('dataDir'))
+        if experiment_config.get('trial').get('outputDir'):
+            print_warning(warning_information.format('outputDir'))
 
 def validate_all_content(experiment_config, config_path):
     '''Validate whether experiment_config is valid'''

tools/nni_cmd/nnictl_utils.py

@@ -520,9 +520,9 @@ def platform_clean(args):
     if platform not in ['remote', 'pai']:
         print_normal('platform {0} not supported.'.format(platform))
         exit(0)
+    update_experiment()
     experiment_config = Experiments()
     experiment_dict = experiment_config.get_all_experiments()
-    update_experiment()
     id_list = list(experiment_dict.keys())
     dir_list = get_platform_dir(config_content)
     if not dir_list:
@@ -553,12 +553,12 @@ def platform_clean(args):
 
 def experiment_list(args):
     '''get the information of all experiments'''
+    update_experiment()
     experiment_config = Experiments()
     experiment_dict = experiment_config.get_all_experiments()
     if not experiment_dict:
         print_normal('Cannot find experiments.')
         exit(1)
-    update_experiment()
     experiment_id_list = []
     if args.all:
         for key in experiment_dict.keys():
@@ -595,12 +595,12 @@ def get_time_interval(time1, time2):
 
 def show_experiment_info():
     '''show experiment information in monitor'''
+    update_experiment()
     experiment_config = Experiments()
     experiment_dict = experiment_config.get_all_experiments()
     if not experiment_dict:
         print('There is no experiment running...')
         exit(1)
-    update_experiment()
     experiment_id_list = []
     for key in experiment_dict.keys():
         if experiment_dict[key]['status'] != 'STOPPED':