Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui

1 files changed, 9 insertions, 2 deletions

diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py
index 8772db56..c7c414ef 100644
--- a/modules/sd_samplers.py
+++ b/modules/sd_samplers.py
@@ -12,6 +12,7 @@ from modules import prompt_parser, devices, processing, images
 

 from modules.shared import opts, cmd_opts, state

 import modules.shared as shared

+from modules.script_callbacks import CFGDenoiserParams, cfg_denoiser_callback

 

 

 SamplerData = namedtuple('SamplerData', ['name', 'constructor', 'aliases', 'options'])

@@ -92,8 +93,8 @@ def single_sample_to_image(sample):
     return Image.fromarray(x_sample)

 

 

-def sample_to_image(samples):

-    return single_sample_to_image(samples[0])

+def sample_to_image(samples, index=0):

+    return single_sample_to_image(samples[index])

 

 

 def samples_to_image_grid(samples):

@@ -280,6 +281,12 @@ class CFGDenoiser(torch.nn.Module):
         image_cond_in = torch.cat([torch.stack([image_cond[i] for _ in range(n)]) for i, n in enumerate(repeats)] + [image_cond])

         sigma_in = torch.cat([torch.stack([sigma[i] for _ in range(n)]) for i, n in enumerate(repeats)] + [sigma])

 

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

+        cfg_denoiser_callback(denoiser_params)

+        x_in = denoiser_params.x

+        image_cond_in = denoiser_params.image_cond

+        sigma_in = denoiser_params.sigma

+

         if tensor.shape[1] == uncond.shape[1]:

             cond_in = torch.cat([tensor, uncond])