aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-08-30 04:27:13 +0000
committerAUTOMATIC1111 <16777216c@gmail.com>2023-08-30 05:23:37 +0000
commit642faa1f6555b6522ee45a0275b87c61a34813f8 (patch)
treeb83743f26c06fdef524eacc5980526bca397d0c4
parenta0af2852b67859b427b662789d0b42f592e78dec (diff)
downloadstable-diffusion-webui-gfx803-642faa1f6555b6522ee45a0275b87c61a34813f8.tar.gz
stable-diffusion-webui-gfx803-642faa1f6555b6522ee45a0275b87c61a34813f8.tar.bz2
stable-diffusion-webui-gfx803-642faa1f6555b6522ee45a0275b87c61a34813f8.zip
Merge pull request #12856 from catboxanon/extra-noise-noisy-latent
Add noisy latent to `ExtraNoiseParams` for callback
-rw-r--r--modules/script_callbacks.py7
-rw-r--r--modules/sd_samplers_kdiffusion.py2
-rw-r--r--modules/sd_samplers_timesteps.py2
3 files changed, 7 insertions, 4 deletions
diff --git a/modules/script_callbacks.py b/modules/script_callbacks.py
index fab23551..c99695eb 100644
--- a/modules/script_callbacks.py
+++ b/modules/script_callbacks.py
@@ -29,12 +29,15 @@ class ImageSaveParams:
class ExtraNoiseParams:
- def __init__(self, noise, x):
+ def __init__(self, noise, x, xi):
self.noise = noise
"""Random noise generated by the seed"""
self.x = x
- """Latent image representation of the image"""
+ """Latent representation of the image"""
+
+ self.xi = xi
+ """Noisy latent representation of the image"""
class CFGDenoiserParams:
diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py
index 72c352a6..8a8c87e0 100644
--- a/modules/sd_samplers_kdiffusion.py
+++ b/modules/sd_samplers_kdiffusion.py
@@ -148,7 +148,7 @@ class KDiffusionSampler(sd_samplers_common.Sampler):
if opts.img2img_extra_noise > 0:
p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
- extra_noise_params = ExtraNoiseParams(noise, x)
+ extra_noise_params = ExtraNoiseParams(noise, x, xi)
extra_noise_callback(extra_noise_params)
noise = extra_noise_params.noise
xi += noise * opts.img2img_extra_noise
diff --git a/modules/sd_samplers_timesteps.py b/modules/sd_samplers_timesteps.py
index 7a6cbd46..b17a8f93 100644
--- a/modules/sd_samplers_timesteps.py
+++ b/modules/sd_samplers_timesteps.py
@@ -107,7 +107,7 @@ class CompVisSampler(sd_samplers_common.Sampler):
if opts.img2img_extra_noise > 0:
p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
- extra_noise_params = ExtraNoiseParams(noise, x)
+ extra_noise_params = ExtraNoiseParams(noise, x, xi)
extra_noise_callback(extra_noise_params)
noise = extra_noise_params.noise
xi += noise * opts.img2img_extra_noise * sqrt_alpha_cumprod