diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-13 08:35:52 +0000 |
---|---|---|
committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-13 08:35:52 +0000 |
commit | 594c8e7b263d9b37f4b18b56b159aeb6d1bba1b4 (patch) | |
tree | 274143ec746dcc454c3b0b5b094abf688d2da676 /modules/sd_models_xl.py | |
parent | 21aec6f567f52271efbbe33a2ab6561f9a47b787 (diff) | |
download | stable-diffusion-webui-gfx803-594c8e7b263d9b37f4b18b56b159aeb6d1bba1b4.tar.gz stable-diffusion-webui-gfx803-594c8e7b263d9b37f4b18b56b159aeb6d1bba1b4.tar.bz2 stable-diffusion-webui-gfx803-594c8e7b263d9b37f4b18b56b159aeb6d1bba1b4.zip |
fix CLIP doing the unneeded normalization
revert SD2.1 back to use the original repo
add SDXL's force_zero_embeddings to negative prompt
Diffstat (limited to 'modules/sd_models_xl.py')
-rw-r--r-- | modules/sd_models_xl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/sd_models_xl.py b/modules/sd_models_xl.py index 1dd4459f..b799ff46 100644 --- a/modules/sd_models_xl.py +++ b/modules/sd_models_xl.py @@ -22,7 +22,8 @@ def get_learned_conditioning(self: sgm.models.diffusion.DiffusionEngine, batch: "target_size_as_tuple": torch.tensor([height, width]).repeat(len(batch), 1).to(devices.device, devices.dtype),
}
- c = self.conditioner(sdxl_conds)
+ force_zero_negative_prompt = getattr(batch, 'is_negative_prompt', False) and all(x == '' for x in batch)
+ c = self.conditioner(sdxl_conds, force_zero_embeddings=['txt'] if force_zero_negative_prompt else [])
return c
|