mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2026-01-07 09:42:09 -08:00
add infotext
add proper support for recalculating conds in k-diffusion samplers remove support for compvis samplers
This commit is contained in:
parent
956e69bf3a
commit
5a0db84b6c
5 changed files with 48 additions and 19 deletions
|
|
@ -370,6 +370,9 @@ class StableDiffusionProcessing:
|
|||
self.uc = self.get_conds_with_caching(prompt_parser.get_learned_conditioning, negative_prompts, self.steps * self.step_multiplier, [self.cached_uc], self.extra_network_data)
|
||||
self.c = self.get_conds_with_caching(prompt_parser.get_multicond_learned_conditioning, prompts, self.steps * self.step_multiplier, [self.cached_c], self.extra_network_data)
|
||||
|
||||
def get_conds(self):
|
||||
return self.c, self.uc
|
||||
|
||||
def parse_extra_network_prompts(self):
|
||||
self.prompts, self.extra_network_data = extra_networks.parse_prompts(self.prompts)
|
||||
|
||||
|
|
@ -1251,6 +1254,13 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
|
|||
with devices.autocast():
|
||||
extra_networks.activate(self, self.extra_network_data)
|
||||
|
||||
def get_conds(self):
|
||||
if self.is_hr_pass:
|
||||
return self.hr_c, self.hr_uc
|
||||
|
||||
return super().get_conds()
|
||||
|
||||
|
||||
def parse_extra_network_prompts(self):
|
||||
res = super().parse_extra_network_prompts()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue