Skip to content

Fix nested manual cast #14689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AUTOMATIC1111 merged 3 commits into from
Jan 20, 2024
+9 −2
Merged

Fix nested manual cast #14689

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0181c1f
Fix nested manual cast
KohakuBlueleaf Jan 18, 2024
8112602
Avoid early disable
KohakuBlueleaf Jan 20, 2024
4a66d2f
Avoid exceptions to be silenced
KohakuBlueleaf Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions modules/devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,11 @@ def forward_wrapper(self, *args, **kwargs):

@contextlib.contextmanager
def manual_cast(target_dtype):
applied = False
for module_type in patch_module_list:
if hasattr(module_type, "org_forward"):
continue
applied = True
org_forward = module_type.forward
if module_type == torch.nn.MultiheadAttention and has_xpu():
module_type.forward = manual_cast_forward(torch.float32)
Expand All @@ -174,8 +178,11 @@ def manual_cast(target_dtype):
try:
yield None
finally:
for module_type in patch_module_list:
module_type.forward = module_type.org_forward
if applied:
for module_type in patch_module_list:
if hasattr(module_type, "org_forward"):
module_type.forward = module_type.org_forward
delattr(module_type, "org_forward")


def autocast(disable=False):
Expand Down