Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash (be a little less aggressive clearing out the attention slice)

Browse Source
This commit is contained in:
damian0815 2022-11-01 20:08:52 +01:00 committed by Lincoln Stein
parent 214d276379
commit 349cc25433
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ldm/models/diffusion/cross_attention_control.py
View File

@ -110,13 +110,14 @@ class CrossAttentionControl:
type(module).__name__ == "CrossAttention" and which_attn in name] type(module).__name__ == "CrossAttention" and which_attn in name]
@classmethod @classmethod
def clear_requests(cls, model): def clear_requests(cls, model, clear_attn_slice=True):
self_attention_modules = cls.get_attention_modules(model, cls.CrossAttentionType.SELF) self_attention_modules = cls.get_attention_modules(model, cls.CrossAttentionType.SELF)
tokens_attention_modules = cls.get_attention_modules(model, cls.CrossAttentionType.TOKENS) tokens_attention_modules = cls.get_attention_modules(model, cls.CrossAttentionType.TOKENS)
for m in self_attention_modules+tokens_attention_modules: for m in self_attention_modules+tokens_attention_modules:
m.save_last_attn_slice = False m.save_last_attn_slice = False
m.use_last_attn_slice = False m.use_last_attn_slice = False
m.last_attn_slice = None if clear_attn_slice:
m.last_attn_slice = None
@classmethod @classmethod
def request_save_attention_maps(cls, model, cross_attention_type: CrossAttentionType): def request_save_attention_maps(cls, model, cross_attention_type: CrossAttentionType):

2
ldm/models/diffusion/shared_invokeai_diffusion.py
View File

@ -142,7 +142,7 @@ class InvokeAIDiffuserComponent:
for type in cross_attention_control_types_to_do: for type in cross_attention_control_types_to_do:
CrossAttentionControl.request_save_attention_maps(self.model, type) CrossAttentionControl.request_save_attention_maps(self.model, type)
_ = self.model_forward_callback(x, sigma, conditioning) _ = self.model_forward_callback(x, sigma, conditioning)
CrossAttentionControl.clear_requests(self.model) CrossAttentionControl.clear_requests(self.model, clear_attn_slice=False)
# process x again, using the saved attention maps to control where self.edited_conditioning will be applied # process x again, using the saved attention maps to control where self.edited_conditioning will be applied
for type in cross_attention_control_types_to_do: for type in cross_attention_control_types_to_do: