From 2b79a716aac7968550382d991a2e5f85bf8ed34e Mon Sep 17 00:00:00 2001 From: Damian at mba Date: Tue, 18 Oct 2022 22:54:51 +0200 Subject: [PATCH] wip hi-res fix --- ldm/invoke/generator/txt2img2img.py | 8 ++++++-- ldm/models/diffusion/sampler.py | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ldm/invoke/generator/txt2img2img.py b/ldm/invoke/generator/txt2img2img.py index 945ebadd90..afe680ac6e 100644 --- a/ldm/invoke/generator/txt2img2img.py +++ b/ldm/invoke/generator/txt2img2img.py @@ -22,7 +22,7 @@ class Txt2Img2Img(Generator): Return value depends on the seed at the time you call it kwargs are 'width' and 'height' """ - uc, c = conditioning + uc, c, ec, edit_opcodes = conditioning @torch.no_grad() def make_image(x_T): @@ -60,7 +60,9 @@ class Txt2Img2Img(Generator): unconditional_guidance_scale = cfg_scale, unconditional_conditioning = uc, eta = ddim_eta, - img_callback = step_callback + img_callback = step_callback, + edited_conditioning = ec, + conditioning_edit_opcodes = edit_opcodes ) print( @@ -94,6 +96,8 @@ class Txt2Img2Img(Generator): img_callback = step_callback, unconditional_guidance_scale=cfg_scale, unconditional_conditioning=uc, + edited_conditioning = ec, + conditioning_edit_opcodes = edit_opcodes ) if self.free_gpu_mem: diff --git a/ldm/models/diffusion/sampler.py b/ldm/models/diffusion/sampler.py index b8377ebb39..cd8940fa6e 100644 --- a/ldm/models/diffusion/sampler.py +++ b/ldm/models/diffusion/sampler.py @@ -309,6 +309,9 @@ class Sampler(object): use_original_steps=False, init_latent = None, mask = None, + edited_conditioning = None, + conditioning_edit_opcodes = None, + **kwargs ): timesteps = (