fix hparam

utils/hparams.py

@@ -21,30 +21,35 @@ def override_config(old_config: dict, new_config: dict):
 
 
 def set_hparams(config='', exp_name='', hparams_str='', print_hparams=True, global_hparams=True):
-    if config == '':
-        parser = argparse.ArgumentParser(description='neural music')
+    if config == '' and exp_name == '':
+        parser = argparse.ArgumentParser(description='')
         parser.add_argument('--config', type=str, default='',
                             help='location of the data corpus')
         parser.add_argument('--exp_name', type=str, default='', help='exp_name')
-        parser.add_argument('--hparams', type=str, default='',
+        parser.add_argument('-hp', '--hparams', type=str, default='',
                             help='location of the data corpus')
         parser.add_argument('--infer', action='store_true', help='infer')
         parser.add_argument('--validate', action='store_true', help='validate')
         parser.add_argument('--reset', action='store_true', help='reset hparams')
+        parser.add_argument('--remove', action='store_true', help='remove old ckpt')
         parser.add_argument('--debug', action='store_true', help='debug')
         args, unknown = parser.parse_known_args()
+        print("| Unknow hparams: ", unknown)
     else:
         args = Args(config=config, exp_name=exp_name, hparams=hparams_str,
-                    infer=False, validate=False, reset=False, debug=False)
-    args_work_dir = ''
-    if args.exp_name != '':
-        args.work_dir = args.exp_name
-        args_work_dir = f'checkpoints/{args.work_dir}'
+                    infer=False, validate=False, reset=False, debug=False, remove=False)
+    global hparams
+    assert args.config != '' or args.exp_name != ''
+    if args.config != '':
+        assert os.path.exists(args.config)
 
     config_chains = []
     loaded_config = set()
 
-    def load_config(config_fn):  # deep first
+    def load_config(config_fn):
+        # deep first inheritance and avoid the second visit of one node
+        if not os.path.exists(config_fn):
+            return {}
         with open(config_fn) as f:
             hparams_ = yaml.safe_load(f)
         loaded_config.add(config_fn)
@@ -53,10 +58,10 @@ def set_hparams(config='', exp_name='', hparams_str='', print_hparams=True, glob
             if not isinstance(hparams_['base_config'], list):
                 hparams_['base_config'] = [hparams_['base_config']]
             for c in hparams_['base_config']:
+                if c.startswith('.'):
+                    c = f'{os.path.dirname(config_fn)}/{c}'
+                    c = os.path.normpath(c)
                 if c not in loaded_config:
-                    if c.startswith('.'):
-                        c = f'{os.path.dirname(config_fn)}/{c}'
-                        c = os.path.normpath(c)
                     override_config(ret_hparams, load_config(c))
             override_config(ret_hparams, hparams_)
         else:
@@ -64,36 +69,43 @@ def set_hparams(config='', exp_name='', hparams_str='', print_hparams=True, glob
         config_chains.append(config_fn)
         return ret_hparams
 
-    global hparams
-    assert args.config != '' or args_work_dir != ''
     saved_hparams = {}
-    if args_work_dir != 'checkpoints/':
+    args_work_dir = ''
+    if args.exp_name != '':
+        args_work_dir = f'checkpoints/{args.exp_name}'
         ckpt_config_path = f'{args_work_dir}/config.yaml'
         if os.path.exists(ckpt_config_path):
-            try:
-                with open(ckpt_config_path) as f:
-                    saved_hparams.update(yaml.safe_load(f))
-            except:
-                pass
-        if args.config == '':
-            args.config = ckpt_config_path
-
+            with open(ckpt_config_path) as f:
+                saved_hparams_ = yaml.safe_load(f)
+                if saved_hparams_ is not None:
+                    saved_hparams.update(saved_hparams_)
     hparams_ = {}
-
-    hparams_.update(load_config(args.config))
-    
+    if args.config != '':
+        hparams_.update(load_config(args.config))
     if not args.reset:
         hparams_.update(saved_hparams)
     hparams_['work_dir'] = args_work_dir
 
+    # Support config overriding in command line. Support list type config overriding.
+    # Examples: --hparams="a=1,b.c=2,d=[1 1 1]"
     if args.hparams != "":
         for new_hparam in args.hparams.split(","):
             k, v = new_hparam.split("=")
-            if v in ['True', 'False'] or type(hparams_[k]) == bool:
-                hparams_[k] = eval(v)
+            v = v.strip("\'\" ")
+            config_node = hparams_
+            for k_ in k.split(".")[:-1]:
+                config_node = config_node[k_]
+            k = k.split(".")[-1]
+            if v in ['True', 'False'] or type(config_node[k]) in [bool, list, dict]:
+                if type(config_node[k]) == list:
+                    v = v.replace(" ", ",")
+                config_node[k] = eval(v)
             else:
-                hparams_[k] = type(hparams_[k])(v)
-
+                config_node[k] = type(config_node[k])(v)
+    if args_work_dir != '' and args.remove:
+        answer = input("REMOVE old checkpoint? Y/N [Default: N]: ")
+        if answer.lower() == "y":
+            remove_file(args_work_dir)
     if args_work_dir != '' and (not os.path.exists(ckpt_config_path) or args.reset) and not args.infer:
         os.makedirs(hparams_['work_dir'], exist_ok=True)
         with open(ckpt_config_path, 'w') as f:
@@ -102,11 +114,11 @@ def set_hparams(config='', exp_name='', hparams_str='', print_hparams=True, glob
     hparams_['infer'] = args.infer
     hparams_['debug'] = args.debug
     hparams_['validate'] = args.validate
+    hparams_['exp_name'] = args.exp_name
     global global_print_hparams
     if global_hparams:
         hparams.clear()
         hparams.update(hparams_)
-
     if print_hparams and global_print_hparams and global_hparams:
         print('| Hparams chains: ', config_chains)
         print('| Hparams: ')
@@ -114,9 +126,4 @@ def set_hparams(config='', exp_name='', hparams_str='', print_hparams=True, glob
             print(f"\033[;33;m{k}\033[0m: {v}, ", end="\n" if i % 5 == 4 else "")
         print("")
         global_print_hparams = False
-    # print(hparams_.keys())
-    if hparams.get('exp_name') is None:
-        hparams['exp_name'] = args.exp_name
-    if hparams_.get('exp_name') is None:
-        hparams_['exp_name'] = args.exp_name
-    return hparams_
+    return hparams_