Merge pull request #14573 from continue-revolution/conrevo/add-p-to-cfg

Add self to CFGDenoiserParams

2 files changed, 5 insertions, 2 deletions

diff --git a/modules/script_callbacks.py b/modules/script_callbacks.py
index 9ed7ad21..a54cb3eb 100644
--- a/modules/script_callbacks.py
+++ b/modules/script_callbacks.py
@@ -41,7 +41,7 @@ class ExtraNoiseParams:
 

 

 class CFGDenoiserParams:

-    def __init__(self, x, image_cond, sigma, sampling_step, total_sampling_steps, text_cond, text_uncond):

+    def __init__(self, x, image_cond, sigma, sampling_step, total_sampling_steps, text_cond, text_uncond, denoiser=None):

         self.x = x

         """Latent image representation in the process of being denoised"""

 

@@ -63,6 +63,9 @@ class CFGDenoiserParams:
         self.text_uncond = text_uncond

         """ Encoder hidden states of text conditioning from negative prompt"""

 

+        self.denoiser = denoiser

+        """Current CFGDenoiser object with processing parameters"""

+

 

 class CFGDenoisedParams:

     def __init__(self, x, sampling_step, total_sampling_steps, inner_model):

diff --git a/modules/sd_samplers_cfg_denoiser.py b/modules/sd_samplers_cfg_denoiser.py
index eb9d5daf..6d76aa96 100644
--- a/modules/sd_samplers_cfg_denoiser.py
+++ b/modules/sd_samplers_cfg_denoiser.py
@@ -146,7 +146,7 @@ class CFGDenoiser(torch.nn.Module):
             sigma_in = torch.cat([torch.stack([sigma[i] for _ in range(n)]) for i, n in enumerate(repeats)] + [sigma] + [sigma])

             image_cond_in = torch.cat([torch.stack([image_cond[i] for _ in range(n)]) for i, n in enumerate(repeats)] + [image_uncond] + [torch.zeros_like(self.init_latent)])

 

-        denoiser_params = CFGDenoiserParams(x_in, image_cond_in, sigma_in, state.sampling_step, state.sampling_steps, tensor, uncond)

+        denoiser_params = CFGDenoiserParams(x_in, image_cond_in, sigma_in, state.sampling_step, state.sampling_steps, tensor, uncond, self)

         cfg_denoiser_callback(denoiser_params)

         x_in = denoiser_params.x

         image_cond_in = denoiser_params.image_cond