diff options
| author | RnDMonkey <RnDMonkey@users.noreply.github.com> | 2022-10-01 22:52:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-01 22:52:21 +0000 |
| commit | 37c9073f58e25513392cd68a5b0fca70c9bd17b5 (patch) | |
| tree | 4127e073124e9feed8d5269076c0ac731e4be294 /modules/sd_samplers.py | |
| parent | f6a97868e57e44fba6c4283769fedd30ee11cacf (diff) | |
| parent | 3f417566b0bda8eab05d247567aebf001c1d1725 (diff) | |
| download | stable-diffusion-webui-gfx803-37c9073f58e25513392cd68a5b0fca70c9bd17b5.tar.gz stable-diffusion-webui-gfx803-37c9073f58e25513392cd68a5b0fca70c9bd17b5.tar.bz2 stable-diffusion-webui-gfx803-37c9073f58e25513392cd68a5b0fca70c9bd17b5.zip | |
Merge branch 'AUTOMATIC1111:master' into trunk
Diffstat (limited to 'modules/sd_samplers.py')
| -rw-r--r-- | modules/sd_samplers.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py index dff89c09..92522214 100644 --- a/modules/sd_samplers.py +++ b/modules/sd_samplers.py @@ -290,7 +290,10 @@ class KDiffusionSampler: def sample_img2img(self, p, x, noise, conditioning, unconditional_conditioning, steps=None):
steps, t_enc = setup_img2img_steps(p, steps)
- sigmas = self.model_wrap.get_sigmas(steps)
+ if p.sampler_noise_scheduler_override:
+ sigmas = p.sampler_noise_scheduler_override(steps)
+ else:
+ sigmas = self.model_wrap.get_sigmas(steps)
noise = noise * sigmas[steps - t_enc - 1]
xi = x + noise
@@ -306,7 +309,10 @@ class KDiffusionSampler: def sample(self, p, x, conditioning, unconditional_conditioning, steps=None):
steps = steps or p.steps
- sigmas = self.model_wrap.get_sigmas(steps)
+ if p.sampler_noise_scheduler_override:
+ sigmas = p.sampler_noise_scheduler_override(steps)
+ else:
+ sigmas = self.model_wrap.get_sigmas(steps)
x = x * sigmas[0]
extra_params_kwargs = self.initialize(p)
|