diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-10-25 05:40:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-25 05:40:12 +0000 |
commit | 16416e42b5d06c7c580e12dab427e29750146604 (patch) | |
tree | ebe736abe4098fe25ba8536533b6a7d583124cef /modules/sd_samplers.py | |
parent | 734986dde3231416813f827242c111da212b2ccb (diff) | |
parent | 77a320f406a76425176b8ca4c034c362b6734713 (diff) | |
download | stable-diffusion-webui-gfx803-16416e42b5d06c7c580e12dab427e29750146604.tar.gz stable-diffusion-webui-gfx803-16416e42b5d06c7c580e12dab427e29750146604.tar.bz2 stable-diffusion-webui-gfx803-16416e42b5d06c7c580e12dab427e29750146604.zip |
Merge branch 'master' into on-image-saved-callback
Diffstat (limited to 'modules/sd_samplers.py')
-rw-r--r-- | modules/sd_samplers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py index 0b408a70..3670b57d 100644 --- a/modules/sd_samplers.py +++ b/modules/sd_samplers.py @@ -228,7 +228,7 @@ class VanillaStableDiffusionSampler: unconditional_conditioning = {"c_concat": [image_conditioning], "c_crossattn": [unconditional_conditioning]}
- samples = self.launch_sampling(steps, lambda: self.sampler.decode(x1, conditioning, t_enc, unconditional_guidance_scale=p.cfg_scale, unconditional_conditioning=unconditional_conditioning))
+ samples = self.launch_sampling(t_enc + 1, lambda: self.sampler.decode(x1, conditioning, t_enc, unconditional_guidance_scale=p.cfg_scale, unconditional_conditioning=unconditional_conditioning))
return samples
@@ -429,7 +429,7 @@ class KDiffusionSampler: 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={
+ samples = self.launch_sampling(t_enc + 1, lambda: self.func(self.model_wrap_cfg, xi, extra_args={
'cond': conditioning,
'image_cond': image_conditioning,
'uncond': unconditional_conditioning,
|