aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sd_samplers.py
diff options
context:
space:
mode:
authorliamkerr <liamkerr@users.noreply.github.com>2022-10-02 14:02:38 +0000
committerGitHub <noreply@github.com>2022-10-02 14:02:38 +0000
commit7308aeefd9d25212398068c1a35f0b879b9ba06f (patch)
tree60f81d876522c772f85911ec4065ab3f448a8479 /modules/sd_samplers.py
parent3c6a049fc3c6b54ada3736710a7e86663ea7f3d9 (diff)
parent4e72a1aab6d1b3a8d8c09fadc81843a07c05cc18 (diff)
downloadstable-diffusion-webui-gfx803-7308aeefd9d25212398068c1a35f0b879b9ba06f.tar.gz
stable-diffusion-webui-gfx803-7308aeefd9d25212398068c1a35f0b879b9ba06f.tar.bz2
stable-diffusion-webui-gfx803-7308aeefd9d25212398068c1a35f0b879b9ba06f.zip
Merge branch 'master' into token_updates
Diffstat (limited to 'modules/sd_samplers.py')
-rw-r--r--modules/sd_samplers.py10
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)