aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2022-10-21 06:49:40 +0000
committerGitHub <noreply@github.com>2022-10-21 06:49:40 +0000
commit6c54532a345a8b4d95f6d0c7becf088b1abb8403 (patch)
treedde93ee7ce75ce736fe927e99c461cfa0d26fcae
parentc23f666dba2b484d521d2dc4be91cf9e09312647 (diff)
parentd6bd6a425dd3ed6d9ea10912a17a3618ce68ca30 (diff)
downloadstable-diffusion-webui-gfx803-6c54532a345a8b4d95f6d0c7becf088b1abb8403.tar.gz
stable-diffusion-webui-gfx803-6c54532a345a8b4d95f6d0c7becf088b1abb8403.tar.bz2
stable-diffusion-webui-gfx803-6c54532a345a8b4d95f6d0c7becf088b1abb8403.zip
Merge pull request #3263 from mezotaken/master
Fix skip and interrupt buttons for Highres. fix option enabled
-rw-r--r--modules/sd_samplers.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py
index cc682593..f58a29b9 100644
--- a/modules/sd_samplers.py
+++ b/modules/sd_samplers.py
@@ -210,6 +210,7 @@ class VanillaStableDiffusionSampler:
x1 = self.sampler.stochastic_encode(x, torch.tensor([t_enc] * int(x.shape[0])).to(shared.device), noise=noise)
self.init_latent = x
+ self.last_latent = x
self.step = 0
# Wrap the conditioning models with additional image conditioning for inpainting model
@@ -226,6 +227,7 @@ class VanillaStableDiffusionSampler:
self.initialize(p)
self.init_latent = None
+ self.last_latent = x
self.step = 0
steps = steps or p.steps
@@ -416,6 +418,7 @@ class KDiffusionSampler:
extra_params_kwargs['sigmas'] = sigma_sched
self.model_wrap_cfg.init_latent = x
+ self.last_latent = x
samples = self.launch_sampling(steps, lambda: self.func(self.model_wrap_cfg, xi, extra_args={
'cond': conditioning,
@@ -447,6 +450,7 @@ class KDiffusionSampler:
else:
extra_params_kwargs['sigmas'] = sigmas
+ self.last_latent = x
samples = self.launch_sampling(steps, lambda: self.func(self.model_wrap_cfg, x, extra_args={
'cond': conditioning,
'image_cond': image_conditioning,