remove disent.util.config

experiment/run.py

@@ -29,7 +29,6 @@
 import pytorch_lightning as pl
 import torch
 import torch.utils.data
-from disent.util.config import instantiate_recursive
 from omegaconf import DictConfig
 from omegaconf import OmegaConf
 from pytorch_lightning.loggers import CometLogger
@@ -49,6 +48,7 @@
 from experiment.util.hydra_data import HydraDataModule
 from experiment.util.hydra_utils import make_non_strict
 from experiment.util.hydra_utils import merge_specializations
+from experiment.util.hydra_utils import instantiate_recursive
 from experiment.util.run_utils import log_error_and_exit
 from experiment.util.run_utils import set_debug_logger
 from experiment.util.run_utils import set_debug_trainer

experiment/util/hydra_data.py

@@ -29,7 +29,7 @@
 
 from disent.dataset import DisentDataset
 from disent.nn.transform import DisentDatasetTransform
-from disent.util.config import instantiate_recursive
+from experiment.util.hydra_utils import instantiate_recursive
 
 
 # ========================================================================= #

experiment/util/hydra_utils.py

@@ -24,14 +24,43 @@
 
 import logging
 
+import hydra
 from deprecated import deprecated
 from omegaconf import DictConfig
+from omegaconf import ListConfig
 from omegaconf import OmegaConf
 
 
 log = logging.getLogger(__name__)
 
 
+# ========================================================================= #
+# Recursive Hydra Instantiation                                             #
+# TODO: use https://github.com/facebookresearch/hydra/pull/989              #
+#       I think this is quicker? Just doesn't perform checks...             #
+# ========================================================================= #
+
+
+@deprecated('replace with hydra 1.1')
+def call_recursive(config):
+    # recurse
+    def _call_recursive(config):
+        if isinstance(config, (dict, DictConfig)):
+            c = {k: _call_recursive(v) for k, v in config.items() if k != '_target_'}
+            if '_target_' in config:
+                config = hydra.utils.instantiate({'_target_': config['_target_']}, **c)
+        elif isinstance(config, (tuple, list, ListConfig)):
+            config = [_call_recursive(v) for v in config]
+        return config
+    return _call_recursive(config)
+
+
+# alias
+@deprecated('replace with hydra 1.1')
+def instantiate_recursive(config):
+    return call_recursive(config)
+
+
 # ========================================================================= #
 # Better Specializations                                                    #
 # TODO: this might be replaced by recursive instantiation                   #