combine PRs #690 and #683

ldm/dream/args.py

@@ -350,14 +350,16 @@ class Args(object):
         )
         # Restoration related args
         postprocessing_group.add_argument(
-            '--restore',
+            '--no_restore',
-            action='store_true',
+            dest='restore',
-            help='Enable Face Restoration',
+            action='store_false',
+            help='Disable face restoration with GFPGAN or codeformer',
         )
         postprocessing_group.add_argument(
-            '--esrgan',
+            '--no_upscale',
-            action='store_true',
+            dest='esrgan',
-            help='Enable Upscaling',
+            action='store_false',
+            help='Disable upscaling with ESRGAN',
         )
         postprocessing_group.add_argument(
             '--esrgan_bg_tile',

ldm/dream/generator/embiggen.py

@@ -79,7 +79,7 @@ class Embiggen(Generator):
             initsuperwidth = round(initsuperwidth*embiggen[0])
             initsuperheight = round(initsuperheight*embiggen[0])
             if embiggen[1] > 0:  # No point in ESRGAN upscaling if strength is set zero
-                from ldm.restoration.realesrgan import ESRGAN
+                from ldm.dream.restoration.realesrgan import ESRGAN
                 esrgan = ESRGAN()
                 print(
                     f'>> ESRGAN upscaling init image prior to cutting with Embiggen with strength {embiggen[1]}')

ldm/dream/restoration/base.py

@@ -19,16 +19,16 @@ class Restoration():
 
     # Face Restore Models
     def load_gfpgan(self):
-        from ldm.restoration.gfpgan.gfpgan import GFPGAN
+        from ldm.dream.restoration.gfpgan import GFPGAN
         return GFPGAN(self.gfpgan_dir, self.gfpgan_model_path)
 
     def load_codeformer(self):
-        from ldm.restoration.codeformer.codeformer import CodeFormerRestoration
+        from ldm.dream.restoration.codeformer import CodeFormerRestoration
         return CodeFormerRestoration()
 
     # Upscale Models
     def load_ersgan(self):
-        from ldm.restoration.realesrgan.realesrgan import ESRGAN
+        from ldm.dream.restoration.realesrgan import ESRGAN
         esrgan = ESRGAN(self.esrgan_bg_tile)
         print('>> ESRGAN Initialized')
-        return esrgan;
+        return esrgan;

ldm/dream/restoration/codeformer.py

@@ -8,7 +8,7 @@ pretrained_model_url = 'https://github.com/sczhou/CodeFormer/releases/download/v
 
 class CodeFormerRestoration():
     def __init__(self,
-            codeformer_dir='ldm/restoration/codeformer',
+            codeformer_dir='ldm/dream/restoration/codeformer',
             codeformer_model_path='weights/codeformer.pth') -> None:
         self.model_path = os.path.join(codeformer_dir, codeformer_model_path)
         self.codeformer_model_exists = os.path.isfile(self.model_path)
@@ -27,7 +27,7 @@ class CodeFormerRestoration():
             from basicsr.utils.download_util import load_file_from_url
             from basicsr.utils import img2tensor, tensor2img
             from facexlib.utils.face_restoration_helper import FaceRestoreHelper
-            from ldm.restoration.codeformer.codeformer_arch import CodeFormer
+            from ldm.dream.restoration.codeformer_arch import CodeFormer
             from torchvision.transforms.functional import normalize
             from PIL import Image
             
@@ -35,7 +35,7 @@ class CodeFormerRestoration():
             
             cf = cf_class(dim_embd=512, codebook_size=1024, n_head=8, n_layers=9, connect_list=['32', '64', '128', '256']).to(device)
             
-            checkpoint_path = load_file_from_url(url=pretrained_model_url, model_dir=os.path.abspath('ldm/restoration/codeformer/weights'), progress=True)
+            checkpoint_path = load_file_from_url(url=pretrained_model_url, model_dir=os.path.abspath('ldm/dream/restoration/codeformer/weights'), progress=True)
             checkpoint = torch.load(checkpoint_path)['params_ema']
             cf.load_state_dict(checkpoint)
             cf.eval()
@@ -81,4 +81,4 @@ class CodeFormerRestoration():
 
             cf = None
 
-            return res
+            return res

ldm/dream/restoration/codeformer/weights/README

@@ -0,0 +1,3 @@
+To use codeformer face reconstruction, you will need to copy
+https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth
+into this directory.

ldm/dream/restoration/codeformer_arch.py

@@ -5,7 +5,7 @@ from torch import nn, Tensor
 import torch.nn.functional as F
 from typing import Optional, List
 
-from ldm.restoration.codeformer.vqgan_arch import *
+from ldm.dream.restoration.vqgan_arch import *
 from basicsr.utils import get_root_logger
 from basicsr.utils.registry import ARCH_REGISTRY
 
@@ -273,4 +273,4 @@ class CodeFormer(VQAutoEncoder):
                     x = self.fuse_convs_dict[f_size](enc_feat_dict[f_size].detach(), x, w)
         out = x
         # logits doesn't need softmax before cross_entropy loss
-        return out, logits, lq_feat
+        return out, logits, lq_feat

ldm/generate.py

@@ -27,7 +27,8 @@ from ldm.util import instantiate_from_config
 from ldm.models.diffusion.ddim import DDIMSampler
 from ldm.models.diffusion.plms import PLMSSampler
 from ldm.models.diffusion.ksampler import KSampler
-from ldm.dream.pngwriter import PngWriter
+from ldm.dream.pngwriter import PngWriter, retrieve_metadata
+from ldm.dream.args import metadata_loads
 from ldm.dream.image_util import InitImageResizer
 from ldm.dream.devices import choose_torch_device
 from ldm.dream.conditioning import get_uc_and_c

scripts/dream.py

@@ -45,16 +45,16 @@ def main():
     # Loading Face Restoration and ESRGAN Modules
     try:
         gfpgan, codeformer, esrgan = None, None, None
-        from ldm.restoration.restoration import Restoration
+        from ldm.dream.restoration import Restoration
         restoration = Restoration(opt.gfpgan_dir, opt.gfpgan_model_path, opt.esrgan_bg_tile)
         if opt.restore:
             gfpgan, codeformer = restoration.load_face_restore_models()
         else:
-            print('>> Face Restoration Disabled')
+            print('>> Face restoration disabled')
         if opt.esrgan:
             esrgan = restoration.load_ersgan()
         else:
-            print('>> ESRGAN Disabled')
+            print('>> Upscaling disabled')
     except (ModuleNotFoundError, ImportError):
         import traceback
         print(traceback.format_exc(), file=sys.stderr)

scripts/preload_models.py

@@ -103,11 +103,11 @@ print('preloading CodeFormer model file...')
 try:
         import urllib.request
         model_url  = 'https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth'
-        model_dest = 'ldm/restoration/codeformer/weights/codeformer.pth'
+        model_dest = 'ldm/dream/restoration/codeformer/weights/codeformer.pth'
         if not os.path.exists(model_dest):
             print('downloading codeformer model file...')
             os.makedirs(os.path.dirname(model_dest), exist_ok=True)
-            urllib.request.urlretrieve(model_path,model_dest)
+            urllib.request.urlretrieve(model_url,model_dest)
 except Exception:
     import traceback
     print('Error loading CodeFormer:')