mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2024-06-07 21:20:49 +00:00
Fix flag check for SD15
This commit is contained in:
parent
9eb2f78631
commit
6a48476502
@ -115,7 +115,7 @@ def txt2img_image_conditioning(sd_model, x, width, height):
|
|||||||
return x.new_zeros(x.shape[0], 2*sd_model.noise_augmentor.time_embed.dim, dtype=x.dtype, device=x.device)
|
return x.new_zeros(x.shape[0], 2*sd_model.noise_augmentor.time_embed.dim, dtype=x.dtype, device=x.device)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
if sd_model.model.is_sdxl_inpaint:
|
if getattr(sd_model.model, "is_sdxl_inpaint", False):
|
||||||
# The "masked-image" in this case will just be all 0.5 since the entire image is masked.
|
# The "masked-image" in this case will just be all 0.5 since the entire image is masked.
|
||||||
image_conditioning = torch.ones(x.shape[0], 3, height, width, device=x.device) * 0.5
|
image_conditioning = torch.ones(x.shape[0], 3, height, width, device=x.device) * 0.5
|
||||||
image_conditioning = images_tensor_to_samples(image_conditioning,
|
image_conditioning = images_tensor_to_samples(image_conditioning,
|
||||||
@ -387,7 +387,7 @@ class StableDiffusionProcessing:
|
|||||||
if self.sampler.conditioning_key == "crossattn-adm":
|
if self.sampler.conditioning_key == "crossattn-adm":
|
||||||
return self.unclip_image_conditioning(source_image)
|
return self.unclip_image_conditioning(source_image)
|
||||||
|
|
||||||
if self.sampler.model_wrap.inner_model.model.is_sdxl_inpaint:
|
if getattr(self.sampler.model_wrap.inner_model.model, "is_sdxl_inpaint", False):
|
||||||
return self.inpainting_image_conditioning(source_image, latent_image, image_mask=image_mask)
|
return self.inpainting_image_conditioning(source_image, latent_image, image_mask=image_mask)
|
||||||
|
|
||||||
# Dummy zero conditioning if we're not using inpainting or depth model.
|
# Dummy zero conditioning if we're not using inpainting or depth model.
|
||||||
|
Loading…
Reference in New Issue
Block a user