Merge pull request #10804 from AUTOMATIC1111/fix-xyz-clip

Fix get_conds_with_caching()
This commit is contained in:
AUTOMATIC1111 2023-05-31 18:47:24 +03:00 committed by AUTOMATIC
parent fae8bdfa48
commit c63d46ceb8

View File

@ -321,14 +321,13 @@ class StableDiffusionProcessing:
have been used before. The second element is where the previously
computed result is stored.
"""
if cache[0] is not None and (required_prompts, steps) == cache[0]:
if cache[0] is not None and (required_prompts, steps, opts.CLIP_stop_at_last_layers, shared.sd_model.sd_checkpoint_info) == cache[0]:
return cache[1]
with devices.autocast():
cache[1] = function(shared.sd_model, required_prompts, steps)
cache[0] = (required_prompts, steps)
cache[0] = (required_prompts, steps, opts.CLIP_stop_at_last_layers, shared.sd_model.sd_checkpoint_info)
return cache[1]
def setup_conds(self):