Merge changes from dev

1 files changed, 5 insertions, 1 deletions

diff --git a/modules/sd_models_config.py b/modules/sd_models_config.py
index deab2f6e..b38137eb 100644
--- a/modules/sd_models_config.py
+++ b/modules/sd_models_config.py
@@ -15,6 +15,7 @@ config_sd2v = os.path.join(sd_repo_configs_path, "v2-inference-v.yaml")
 config_sd2_inpainting = os.path.join(sd_repo_configs_path, "v2-inpainting-inference.yaml")

 config_sdxl = os.path.join(sd_xl_repo_configs_path, "sd_xl_base.yaml")

 config_sdxl_refiner = os.path.join(sd_xl_repo_configs_path, "sd_xl_refiner.yaml")

+config_sdxl_inpainting = os.path.join(sd_configs_path, "sd_xl_inpaint.yaml")

 config_depth_model = os.path.join(sd_repo_configs_path, "v2-midas-inference.yaml")

 config_unclip = os.path.join(sd_repo_configs_path, "v2-1-stable-unclip-l-inference.yaml")

 config_unopenclip = os.path.join(sd_repo_configs_path, "v2-1-stable-unclip-h-inference.yaml")

@@ -71,7 +72,10 @@ def guess_model_config_from_state_dict(sd, filename):
     sd2_variations_weight = sd.get('embedder.model.ln_final.weight', None)

 

     if sd.get('conditioner.embedders.1.model.ln_final.weight', None) is not None:

-        return config_sdxl

+        if diffusion_model_input.shape[1] == 9:

+            return config_sdxl_inpainting

+        else:

+            return config_sdxl

     if sd.get('conditioner.embedders.0.model.ln_final.weight', None) is not None:

         return config_sdxl_refiner

     elif sd.get('depth_model.model.pretrained.act_postprocess3.0.project.0.bias', None) is not None: