Browse Source

Merge pull request #12856 from catboxanon/extra-noise-noisy-latent

Add noisy latent to `ExtraNoiseParams` for callback
AUTOMATIC1111 2 years ago
parent
commit
642faa1f65

+ 5 - 2
modules/script_callbacks.py

@@ -29,12 +29,15 @@ class ImageSaveParams:
 
 
 
 
 class ExtraNoiseParams:
 class ExtraNoiseParams:
-    def __init__(self, noise, x):
+    def __init__(self, noise, x, xi):
         self.noise = noise
         self.noise = noise
         """Random noise generated by the seed"""
         """Random noise generated by the seed"""
 
 
         self.x = x
         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:
 class CFGDenoiserParams:

+ 1 - 1
modules/sd_samplers_kdiffusion.py

@@ -148,7 +148,7 @@ class KDiffusionSampler(sd_samplers_common.Sampler):
 
 
         if opts.img2img_extra_noise > 0:
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
             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)
             extra_noise_callback(extra_noise_params)
             noise = extra_noise_params.noise
             noise = extra_noise_params.noise
             xi += noise * opts.img2img_extra_noise
             xi += noise * opts.img2img_extra_noise

+ 1 - 1
modules/sd_samplers_timesteps.py

@@ -107,7 +107,7 @@ class CompVisSampler(sd_samplers_common.Sampler):
 
 
         if opts.img2img_extra_noise > 0:
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
             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)
             extra_noise_callback(extra_noise_params)
             noise = extra_noise_params.noise
             noise = extra_noise_params.noise
             xi += noise * opts.img2img_extra_noise * sqrt_alpha_cumprod
             xi += noise * opts.img2img_extra_noise * sqrt_alpha_cumprod