by request: fix tiled vae extension

2 files changed, 7 insertions, 2 deletions

diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py
index f47431af..5613b8c1 100644
--- a/modules/sd_samplers_kdiffusion.py
+++ b/modules/sd_samplers_kdiffusion.py
@@ -1,7 +1,8 @@
 import torch

 import inspect

 import k_diffusion.sampling

-from modules import sd_samplers_common, sd_samplers_extra, sd_samplers_cfg_denoiser

+from modules import sd_samplers_common, sd_samplers_extra

+from modules.sd_samplers_cfg_denoiser import CFGDenoiser

 

 from modules.shared import opts

 import modules.shared as shared

@@ -62,7 +63,7 @@ class KDiffusionSampler(sd_samplers_common.Sampler):
 

         denoiser = k_diffusion.external.CompVisVDenoiser if sd_model.parameterization == "v" else k_diffusion.external.CompVisDenoiser

         self.model_wrap = denoiser(sd_model, quantize=shared.opts.enable_quantization)

-        self.model_wrap_cfg = sd_samplers_cfg_denoiser.CFGDenoiser(self.model_wrap, self)

+        self.model_wrap_cfg = CFGDenoiser(self.model_wrap, self)

 

     def get_sigmas(self, p, steps):

         discard_next_to_last_sigma = self.config is not None and self.config.options.get('discard_next_to_last_sigma', False)

diff --git a/modules/sd_samplers_timesteps.py b/modules/sd_samplers_timesteps.py
index d89d0efb..f61799a8 100644
--- a/modules/sd_samplers_timesteps.py
+++ b/modules/sd_samplers_timesteps.py
@@ -1,5 +1,6 @@
 import torch

 import inspect

+import sys

 from modules import devices, sd_samplers_common, sd_samplers_timesteps_impl

 from modules.sd_samplers_cfg_denoiser import CFGDenoiser

 

@@ -145,3 +146,6 @@ class CompVisSampler(sd_samplers_common.Sampler):
 

         return samples

 

+

+sys.modules['modules.sd_samplers_compvis'] = sys.modules[__name__]

+VanillaStableDiffusionSampler = CompVisSampler  # temp. compatibility with older extensions