add infotext

add proper support for recalculating conds in k-diffusion samplers
remove support for compvis samplers

1 files changed, 20 insertions, 9 deletions

diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py
index 3f3e83e3..92bf0ca1 100644
--- a/modules/sd_samplers_common.py
+++ b/modules/sd_samplers_common.py
@@ -131,16 +131,27 @@ replace_torchsde_browinan()
 

 def apply_refiner(sampler):

     completed_ratio = sampler.step / sampler.steps

-    if completed_ratio > shared.opts.sd_refiner_switch_at and shared.sd_model.sd_checkpoint_info.title != shared.opts.sd_refiner_checkpoint:

-        refiner_checkpoint_info = sd_models.get_closet_checkpoint_match(shared.opts.sd_refiner_checkpoint)

-        if refiner_checkpoint_info is None:

-            raise Exception(f'Could not find checkpoint with name {shared.opts.sd_refiner_checkpoint}')

 

-        with sd_models.SkipWritingToConfig():

-            sd_models.reload_model_weights(info=refiner_checkpoint_info)

+    if completed_ratio <= shared.opts.sd_refiner_switch_at:

+        return False

+

+    if shared.sd_model.sd_checkpoint_info.title == shared.opts.sd_refiner_checkpoint:

+        return False

+

+    refiner_checkpoint_info = sd_models.get_closet_checkpoint_match(shared.opts.sd_refiner_checkpoint)

+    if refiner_checkpoint_info is None:

+        raise Exception(f'Could not find checkpoint with name {shared.opts.sd_refiner_checkpoint}')

+

+    sampler.p.extra_generation_params['Refiner'] = refiner_checkpoint_info.short_title

+    sampler.p.extra_generation_params['Refiner switch at'] = shared.opts.sd_refiner_switch_at

+

+    with sd_models.SkipWritingToConfig():

+        sd_models.reload_model_weights(info=refiner_checkpoint_info)

+

+    devices.torch_gc()

+    sampler.p.setup_conds()

+    sampler.update_inner_model()

 

-        devices.torch_gc()

+    return True

 

-        sampler.update_inner_model()

 

-        sampler.p.setup_conds()