add hierarchical configuration via runcon

Author: David Josef Emmerichs

pcdet/config.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+from typing import List
 
 import yaml
 from easydict import EasyDict
@@ -123,6 +124,31 @@ def rc_to_ed(rc_cfg: Config) -> EasyDict:
     return ed_cfg
 
 
+def modify_rc_cfg(cfg: Config, modify_cfgs: List[Path]) -> Config:
+    from copy import deepcopy
+    cfg = deepcopy(cfg)
+    for m in modify_cfgs:
+        cfg.rupdate(Config.from_file(m))
+        cfg = cfg.resolve_transforms()
+    return cfg
+
+
+def create_cfg_from_sets(
+        cfg_file: Path,
+        modify_cfgs: List[Path],
+        set_cfgs: List[str],
+        cfg: EasyDict = None,
+) -> EasyDict:
+    if cfg is None:
+        cfg = EasyDict()
+    cfg_from_yaml_file(cfg_file, cfg)
+    cfg = ed_to_rc(cfg)
+    cfg = modify_rc_cfg(cfg, modify_cfgs)
+    cfg = rc_to_ed(cfg)
+    cfg_from_list(set_cfgs, cfg)
+    return cfg
+
+
 cfg = EasyDict()
 cfg.ROOT_DIR = (Path(__file__).resolve().parent / '../').resolve()
 cfg.LOCAL_RANK = 0

tools/train.py

@@ -10,7 +10,7 @@
 import torch.nn as nn
 from tensorboardX import SummaryWriter
 
-from pcdet.config import cfg, cfg_from_list, cfg_from_yaml_file, log_config_to_file
+from pcdet.config import cfg, log_config_to_file, create_cfg_from_sets
 from pcdet.datasets import build_dataloader
 from pcdet.models import build_network, model_fn_decorator
 from pcdet.utils import common_utils
@@ -19,6 +19,8 @@
 
 
 def parse_config():
+    global cfg
+
     parser = argparse.ArgumentParser(description='arg parser')
     parser.add_argument('--cfg_file', type=str, default=None, help='specify the config for training')
 
@@ -38,6 +40,8 @@ def parse_config():
     parser.add_argument('--merge_all_iters_to_one_epoch', action='store_true', default=False, help='')
     parser.add_argument('--set', dest='set_cfgs', default=None, nargs=argparse.REMAINDER,
                         help='set extra config keys if needed')
+    parser.add_argument('--modify', type=str, dest='modify_cfgs', default=None, nargs='*',
+                        help='specify extra modifier configs')
 
     parser.add_argument('--max_waiting_mins', type=int, default=0, help='max waiting minutes')
     parser.add_argument('--start_epoch', type=int, default=0, help='')
@@ -52,16 +56,18 @@ def parse_config():
 
 
     args = parser.parse_args()
+    if args.set_cfgs is None:
+        args.set_cfgs = []
+    if args.modify_cfgs is None:
+        args.modify_cfgs = []
+
+    cfg = create_cfg_from_sets(args.cfg_file, args.modify_cfgs, args.set_cfgs, cfg)
 
-    cfg_from_yaml_file(args.cfg_file, cfg)
     cfg.TAG = Path(args.cfg_file).stem
     cfg.EXP_GROUP_PATH = '/'.join(args.cfg_file.split('/')[1:-1])  # remove 'cfgs' and 'xxxx.yaml'
 
     args.use_amp = args.use_amp or cfg.OPTIMIZATION.get('USE_AMP', False)
 
-    if args.set_cfgs is not None:
-        cfg_from_list(args.set_cfgs, cfg)
-
     return args, cfg