From ff1609f91ea0e9a90ba7b6ecc6d794c39c1f8c8f Mon Sep 17 00:00:00 2001
From: Ritesh Gangnani <riteshgangnani10>
Date: Sun, 5 Nov 2023 19:13:49 +0530
Subject: Add SSD-1B as a supported model

---
 modules/sd_models.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index 930d0bee..ef96d29d 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -346,10 +346,14 @@ def load_model_weights(model, checkpoint_info: CheckpointInfo, state_dict, timer
     model.is_sdxl = hasattr(model, 'conditioner')
     model.is_sd2 = not model.is_sdxl and hasattr(model.cond_stage_model, 'model')
     model.is_sd1 = not model.is_sdxl and not model.is_sd2
-
+    model.is_ssd = model.is_sdxl and 'model.diffusion_model.middle_block.1.transformer_blocks.0.attn1.to_q.weight' not in state_dict.keys()
+    
     if model.is_sdxl:
         sd_models_xl.extend_sdxl(model)
-
+    
+    if model.is_ssd:
+        sd_hijack.model_hijack.conv_ssd(model)
+        
     model.load_state_dict(state_dict, strict=False)
     timer.record("apply weights to model")
 
-- 
cgit v1.2.3


From 44c5097375ae4cf40300c09473bb46cf6c5d6cb7 Mon Sep 17 00:00:00 2001
From: Ritesh Gangnani <riteshgangnani10>
Date: Sun, 5 Nov 2023 20:31:57 +0530
Subject: Use devices.torch_gc() instead of empty_cache()

---
 modules/sd_models.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index ef96d29d..2242c363 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -347,7 +347,6 @@ def load_model_weights(model, checkpoint_info: CheckpointInfo, state_dict, timer
     model.is_sd2 = not model.is_sdxl and hasattr(model.cond_stage_model, 'model')
     model.is_sd1 = not model.is_sdxl and not model.is_sd2
     model.is_ssd = model.is_sdxl and 'model.diffusion_model.middle_block.1.transformer_blocks.0.attn1.to_q.weight' not in state_dict.keys()
-    
     if model.is_sdxl:
         sd_models_xl.extend_sdxl(model)
     
-- 
cgit v1.2.3


From 80d639a440929e9effe4620ce74333de283e7efc Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 5 Nov 2023 19:32:21 +0300
Subject: linter

---
 modules/sd_models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index d76dc580..1036a3b1 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -355,10 +355,10 @@ def load_model_weights(model, checkpoint_info: CheckpointInfo, state_dict, timer
     model.is_ssd = model.is_sdxl and 'model.diffusion_model.middle_block.1.transformer_blocks.0.attn1.to_q.weight' not in state_dict.keys()
     if model.is_sdxl:
         sd_models_xl.extend_sdxl(model)
-    
+
     if model.is_ssd:
         sd_hijack.model_hijack.conv_ssd(model)
-        
+
     if shared.opts.sd_checkpoint_cache > 0:
         # cache newly loaded model
         checkpoints_loaded[checkpoint_info] = state_dict.copy()
-- 
cgit v1.2.3


From 6ad666e4794a57dd65790dd6a259d5d4330d45ed Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 5 Nov 2023 19:46:20 +0300
Subject: more changes for #13865: fix formatting, rename the function, add
 comment and add a readme entry

---
 modules/sd_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index 1036a3b1..841402e8 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -357,7 +357,7 @@ def load_model_weights(model, checkpoint_info: CheckpointInfo, state_dict, timer
         sd_models_xl.extend_sdxl(model)
 
     if model.is_ssd:
-        sd_hijack.model_hijack.conv_ssd(model)
+        sd_hijack.model_hijack.convert_sdxl_to_ssd(model)
 
     if shared.opts.sd_checkpoint_cache > 0:
         # cache newly loaded model
-- 
cgit v1.2.3