cfg init removal

anthonytec2 · Jul 18, 2020 · 06f57ad · 06f57ad
1 parent 50232e0
commit 06f57ad
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/pl_examples/hydra_examples/pl_template.py b/pl_examples/hydra_examples/pl_template.py
@@ -3,8 +3,8 @@
 """
 
 import hydra
-from omegaconf import DictConfig
-from pl_examples.hydra_examples.user_config import conf_init
+import pl_examples.hydra_examples.user_config
+from omegaconf import DictConfig, OmegaConf
 
 from pl_examples.models.hydra_config_model import LightningTemplateModel
 from pytorch_lightning import Callback, seed_everything, Trainer
@@ -20,21 +20,24 @@ def main(cfg: DictConfig):
     # ------------------------
     # 1 INIT LIGHTNING MODEL
     # ------------------------
-    model = LightningTemplateModel(cfg)
+    model = LightningTemplateModel(OmegaConf.masked_copy(cfg, ["data", "model", "scheduler", "opt"]))
     # ------------------------
     # 2 INIT TRAINER
     # ------------------------
-
-    callbacks = (
-        [hydra.utils.instantiate(c) for c in cfg.callbacks.callbacks_list] if "callbacks_list" in cfg.callbacks else []
-    )
+    callbacks = None
+    if cfg.callbacks:
+        callbacks = (
+            [hydra.utils.instantiate(c) for c in cfg.callbacks.callbacks_list]
+            if "callbacks_list" in cfg.callbacks
+            else []
+        )
 
     trainer = Trainer(
         **cfg.trainer,
-        logger=conf_init(cfg, "logger"),
-        profiler=conf_init(cfg, "profiler"),
-        checkpoint_callback=conf_init(cfg, "checkpoint"),
-        early_stop_callback=conf_init(cfg, "early_stopping"),
+        logger=hydra.utils.instantiate(getattr(cfg, "logger")),
+        profiler=hydra.utils.instantiate(getattr(cfg, "profiler")),
+        checkpoint_callback=hydra.utils.instantiate(getattr(cfg, "checkpoint")),
+        early_stop_callback=hydra.utils.instantiate(getattr(cfg, "early_stopping")),
         callbacks=callbacks,
     )
 

diff --git a/pl_examples/hydra_examples/user_config.py b/pl_examples/hydra_examples/user_config.py
@@ -49,16 +49,8 @@ class UserConfig(PLConfig):
     model: Any = MISSING
     scheduler: ObjectConf = MISSING
     opt: ObjectConf = MISSING
-    callbacks: Any = MISSING
+    callbacks: Any = None
 
 
 # Stored as config node, for top level config used for type checking.
 cs.store(name="config", node=UserConfig)
-
-
-def conf_init(cfg, key):
-    # Function to be removed after https://github.com/facebookresearch/hydra/issues/785 fixed
-    try:
-        return hydra.utils.instantiate(getattr(cfg, key))
-    except:
-        return None
diff --git a/pl_examples/models/hydra_config_model.py b/pl_examples/models/hydra_config_model.py
@@ -18,7 +18,7 @@ class LightningTemplateModel(LightningModule):
     def __init__(self, cfg) -> "LightningTemplateModel":
         # init superclass
         super().__init__()
-        self.save_hyperparameters()
+        # self.save_hyperparameters()
         self.model = cfg.model
         self.data = cfg.data
         self.opt = cfg.opt

diff --git a/pytorch_lightning/trainer/trainer_conf.py b/pytorch_lightning/trainer/trainer_conf.py
@@ -229,9 +229,9 @@ class WandbConf:
 # Bug cant merge config when set to None
 @dataclass
 class PLConfig(DictConfig):
-    logger: Optional[ObjectConf]
-    profiler: Optional[ObjectConf]
-    checkpoint: Optional[ObjectConf]
-    early_stopping: Optional[ObjectConf]
+    logger: Optional[ObjectConf] = None
+    profiler: Optional[ObjectConf] = None
+    checkpoint: Optional[ObjectConf] = None
+    early_stopping: Optional[ObjectConf] = None
     trainer: LightningTrainerConf = MISSING