Merge branch 'master' of github.com:AUTOMATIC1111/stable-diffusion-webui

1 files changed, 9 insertions, 5 deletions

diff --git a/modules/sd_models.py b/modules/sd_models.py
index 5b37f3fe..ecdd91c5 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -111,18 +111,19 @@ def model_hash(filename):
 

 def select_checkpoint():

     model_checkpoint = shared.opts.sd_model_checkpoint

+        

     checkpoint_info = checkpoints_list.get(model_checkpoint, None)

     if checkpoint_info is not None:

         return checkpoint_info

 

     if len(checkpoints_list) == 0:

-        print(f"No checkpoints found. When searching for checkpoints, looked at:", file=sys.stderr)

+        print("No checkpoints found. When searching for checkpoints, looked at:", file=sys.stderr)

         if shared.cmd_opts.ckpt is not None:

             print(f" - file {os.path.abspath(shared.cmd_opts.ckpt)}", file=sys.stderr)

         print(f" - directory {model_path}", file=sys.stderr)

         if shared.cmd_opts.ckpt_dir is not None:

             print(f" - directory {os.path.abspath(shared.cmd_opts.ckpt_dir)}", file=sys.stderr)

-        print(f"Can't run without a checkpoint. Find and place a .ckpt file into any of those locations. The program will exit.", file=sys.stderr)

+        print("Can't run without a checkpoint. Find and place a .ckpt file into any of those locations. The program will exit.", file=sys.stderr)

         exit(1)

 

     checkpoint_info = next(iter(checkpoints_list.values()))

@@ -293,13 +294,16 @@ def load_model(checkpoint_info=None):
     if should_hijack_inpainting(checkpoint_info):

         # Hardcoded config for now...

         sd_config.model.target = "ldm.models.diffusion.ddpm.LatentInpaintDiffusion"

-        sd_config.model.params.use_ema = False

         sd_config.model.params.conditioning_key = "hybrid"

         sd_config.model.params.unet_config.params.in_channels = 9

+        sd_config.model.params.finetune_keys = None

 

         # Create a "fake" config with a different name so that we know to unload it when switching models.

         checkpoint_info = checkpoint_info._replace(config=checkpoint_info.config.replace(".yaml", "-inpainting.yaml"))

 

+    if not hasattr(sd_config.model.params, "use_ema"):

+        sd_config.model.params.use_ema = False

+

     do_inpainting_hijack()

 

     if shared.cmd_opts.no_half:

@@ -320,7 +324,7 @@ def load_model(checkpoint_info=None):
 

     script_callbacks.model_loaded_callback(sd_model)

 

-    print(f"Model loaded.")

+    print("Model loaded.")

     return sd_model

 

 

@@ -355,5 +359,5 @@ def reload_model_weights(sd_model=None, info=None):
     if not shared.cmd_opts.lowvram and not shared.cmd_opts.medvram:

         sd_model.to(devices.device)

 

-    print(f"Weights loaded.")

+    print("Weights loaded.")

     return sd_model