Merge branch 'master' into saving

1 files changed, 6 insertions, 2 deletions

diff --git a/modules/extras.py b/modules/extras.py
index c2543fcf..6a0d5cb0 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -40,6 +40,8 @@ def run_extras(extras_mode, image, image_folder, gfpgan_visibility, codeformer_v
 

     outputs = []

     for image, image_name in zip(imageArr, imageNameArr):

+        if image is None:

+            return outputs, "Please select an input image.", ''

         existing_pnginfo = image.info or {}

 

         image = image.convert("RGB")

@@ -74,7 +76,7 @@ def run_extras(extras_mode, image, image_folder, gfpgan_visibility, codeformer_v
                 c = cached_images.get(key)

                 if c is None:

                     upscaler = shared.sd_upscalers[scaler_index]

-                    c = upscaler.upscale(image, image.width * resize, image.height * resize)

+                    c = upscaler.scaler.upscale(image, resize, upscaler.data_path)

                     cached_images[key] = c

 

                 return c

@@ -189,9 +191,11 @@ def run_modelmerger(primary_model_name, secondary_model_name, interp_method, int
             if save_as_half:

                 theta_0[key] = theta_0[key].half()

 

+    ckpt_dir = shared.cmd_opts.ckpt_dir or sd_models.model_path

+

     filename = primary_model_info.model_name + '_' + str(round(interp_amount, 2)) + '-' + secondary_model_info.model_name + '_' + str(round((float(1.0) - interp_amount), 2)) + '-' + interp_method.replace(" ", "_") + '-merged.ckpt'

     filename = filename if custom_name == '' else (custom_name + '.ckpt')

-    output_modelname = os.path.join(shared.cmd_opts.ckpt_dir, filename)

+    output_modelname = os.path.join(ckpt_dir, filename)

 

     print(f"Saving to {output_modelname}...")

     torch.save(primary_model, output_modelname)