From 7ba3923d5b494b7756d0b12f33acb3716d830b9a Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Fri, 11 Nov 2022 18:20:18 +0300
Subject: move DDIM/PLMS fix for OSX out of the file with inpainting code.

---
 modules/sd_hijack.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'modules/sd_hijack.py')

diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py
index bc49d235..75b2d22d 100644
--- a/modules/sd_hijack.py
+++ b/modules/sd_hijack.py
@@ -14,6 +14,8 @@ from modules.sd_hijack_optimizations import invokeAI_mps_available
 
 import ldm.modules.attention
 import ldm.modules.diffusionmodules.model
+import ldm.models.diffusion.ddim
+import ldm.models.diffusion.plms
 
 attention_CrossAttention_forward = ldm.modules.attention.CrossAttention.forward
 diffusionmodules_model_nonlinearity = ldm.modules.diffusionmodules.model.nonlinearity
@@ -406,3 +408,24 @@ def add_circular_option_to_conv_2d():
 
 
 model_hijack = StableDiffusionModelHijack()
+
+
+def register_buffer(self, name, attr):
+    """
+    Fix register buffer bug for Mac OS.
+    """
+
+    if type(attr) == torch.Tensor:
+        if attr.device != devices.device:
+
+            # would this not break cuda when torch adds has_mps() to main version?
+            if getattr(torch, 'has_mps', False):
+                attr = attr.to(device="mps", dtype=torch.float32)
+            else:
+                attr = attr.to(devices.device)
+
+    setattr(self, name, attr)
+
+
+ldm.models.diffusion.ddim.DDIMSampler.register_buffer = register_buffer
+ldm.models.diffusion.plms.PLMSSampler.register_buffer = register_buffer
-- 
cgit v1.2.1


From c62d17aee36b5f4ca24f9cfa7bf6d7aca0c923f8 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 12 Nov 2022 10:00:22 +0300
Subject: use the new devices.has_mps() function in register_buffer for
 DDIM/PLMS fix for OSX

---
 modules/sd_hijack.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules/sd_hijack.py')

diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py
index 75b2d22d..97979d05 100644
--- a/modules/sd_hijack.py
+++ b/modules/sd_hijack.py
@@ -418,8 +418,7 @@ def register_buffer(self, name, attr):
     if type(attr) == torch.Tensor:
         if attr.device != devices.device:
 
-            # would this not break cuda when torch adds has_mps() to main version?
-            if getattr(torch, 'has_mps', False):
+            if devices.has_mps():
                 attr = attr.to(device="mps", dtype=torch.float32)
             else:
                 attr = attr.to(devices.device)
-- 
cgit v1.2.1


From 17e44328204a09653bb89eea18b7b489cc118703 Mon Sep 17 00:00:00 2001
From: killfrenzy96 <evan298@gmail.com>
Date: Fri, 18 Nov 2022 21:22:55 +1100
Subject: cleanly undo circular hijack #4818

---
 modules/sd_hijack.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/sd_hijack.py')

diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py
index 97979d05..eaedac13 100644
--- a/modules/sd_hijack.py
+++ b/modules/sd_hijack.py
@@ -96,8 +96,8 @@ class StableDiffusionModelHijack:
         if type(model_embeddings.token_embedding) == EmbeddingsWithFixes:
             model_embeddings.token_embedding = model_embeddings.token_embedding.wrapped
 
+        self.apply_circular(False)
         self.layers = None
-        self.circular_enabled = False
         self.clip = None
 
     def apply_circular(self, enable):
-- 
cgit v1.2.1