Move get_obj_from_str() and instantiate_from_config() into package. I am copying commit opened in issue CompVis#173 of the original repo which was waiting to be merged

Author: yGifoom

main.py

@@ -11,17 +11,10 @@
 from pytorch_lightning.callbacks import ModelCheckpoint, Callback, LearningRateMonitor
 from pytorch_lightning.utilities import rank_zero_only
 
+from taming import get_obj_from_str, instantiate_from_config
 from taming.data.utils import custom_collate
 
 
-def get_obj_from_str(string, reload=False):
-    module, cls = string.rsplit(".", 1)
-    if reload:
-        module_imp = importlib.import_module(module)
-        importlib.reload(module_imp)
-    return getattr(importlib.import_module(module, package=None), cls)
-
-
 def get_parser(**parser_kwargs):
     def str2bool(v):
         if isinstance(v, bool):

taming/__init__.py

@@ -0,0 +1,13 @@
+import importlib
+
+def get_obj_from_str(string, reload=False):
+    module, cls = string.rsplit(".", 1)
+    if reload:
+        module_imp = importlib.import_module(module)
+        importlib.reload(module_imp)
+    return getattr(importlib.import_module(module, package=None), cls)
+
+def instantiate_from_config(config):
+    if not "target" in config:
+        raise KeyError("Expected key `target` to instantiate.")
+    return get_obj_from_str(config["target"])(**config.get("params", dict()))

taming/models/cond_transformer.py

@@ -3,7 +3,7 @@
 import torch.nn.functional as F
 import pytorch_lightning as pl
 
-from main import instantiate_from_config
+from taming import instantiate_from_config
 from taming.modules.util import SOSProvider
 
 

taming/models/vqgan.py

@@ -2,7 +2,7 @@
 import torch.nn.functional as F
 import pytorch_lightning as pl
 
-from main import instantiate_from_config
+from taming import instantiate_from_config
 
 from taming.modules.diffusionmodules.model import Encoder, Decoder
 from taming.modules.vqvae.quantize import VectorQuantizer2 as VectorQuantizer