From 5055e9e1d5946c9badb79894b06e6b7350f8ca39 Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed, 24 Aug 2022 12:09:22 -0400
Subject: [PATCH 1/4] corrected double clip reference from requirements.txt

---
 .gitignore       | 2 +-
 requirements.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 889ab60c84..992cb2be90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -169,7 +169,7 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-src/
+src
 logs/
 **/__pycache__/
 outputs
diff --git a/requirements.txt b/requirements.txt
index 79f5fee300..78d43aae26 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
 accelerate==0.12.0
 albumentations==0.4.3
-clip==1.0
 einops==0.3.0
 huggingface-hub==0.8.1
 imageio==2.9.0

From f55f4d715654aeac42653fbac0a217699060dccd Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed, 24 Aug 2022 12:31:48 -0400
Subject: [PATCH 2/4] squelch warnings about modified untracked content due to
 the src/* submodules

---
 .gitmodules | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..c8f0748436
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,13 @@
+[submodule "taming-transformers"]
+	   path = src/taming-transformers
+	   url  = https://github.com/CompVis/taming-transformers.git
+	   ignore = dirty
+[submodule "clip"]
+	   path = src/clip
+	   url  = https://github.com/openai/CLIP.git
+	   ignore = dirty
+[submodule "k-diffusion"]
+	   path = src/k-diffusion
+	   url  = https://github.com/lstein/k-diffusion.git
+	   ignore = dirty
+	   
\ No newline at end of file

From 47a5da25b774dd4c492495ae4d8e07d0d318cd7b Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed, 24 Aug 2022 12:57:04 -0400
Subject: [PATCH 3/4] runtime errors now produce a stack trace

---
 ldm/simplet2i.py | 4 +++-
 scripts/dream.py | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ldm/simplet2i.py b/ldm/simplet2i.py
index 231ea887c0..0691cccb7b 100644
--- a/ldm/simplet2i.py
+++ b/ldm/simplet2i.py
@@ -69,6 +69,7 @@ from contextlib import contextmanager, nullcontext
 import time
 import math
 import re
+import traceback
 
 from ldm.util import instantiate_from_config
 from ldm.models.diffusion.ddim     import DDIMSampler
@@ -415,7 +416,8 @@ The vast majority of these arguments default to reasonable values.
             print('*interrupted*')
             print('Partial results will be returned; if --grid was requested, nothing will be returned.')
         except RuntimeError as e:
-            print(str(e))
+            print("Oops! A runtime error has occurred. If this is unexpected, please copy-and-paste this stack trace and post it as an Issue to http://github.com/lstein/stable-diffusion")
+            traceback.print_exc()
 
         toc = time.time()
         print(f'{image_count} images generated in',"%4.2fs"% (toc-tic))
diff --git a/scripts/dream.py b/scripts/dream.py
index f7452d9e48..7ba6205653 100755
--- a/scripts/dream.py
+++ b/scripts/dream.py
@@ -80,8 +80,7 @@ def main():
         exit(-1)
 
     # preload the model
-    if not debugging:
-        t2i.load_model()
+    t2i.load_model()
     print("\n* Initialization done! Awaiting your command (-h for help, 'q' to quit, 'cd' to change output dir, 'pwd' to print output dir)...")
 
     log_path   = os.path.join(opt.outdir,'dream_log.txt')

From e043f238af75b81165238c2a3e55ecb322d272d9 Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed, 24 Aug 2022 13:09:01 -0400
Subject: [PATCH 4/4] backed out change from PR #44 that was causing ddim
 sampler to fail with the message 'sqrt _vml_cpu not implemented for 'Half'

---
 ldm/models/diffusion/ddim.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ldm/models/diffusion/ddim.py b/ldm/models/diffusion/ddim.py
index 2ebaeabd22..065b32986a 100644
--- a/ldm/models/diffusion/ddim.py
+++ b/ldm/models/diffusion/ddim.py
@@ -17,6 +17,9 @@ class DDIMSampler(object):
         self.schedule = schedule
 
     def register_buffer(self, name, attr):
+        if type(attr) == torch.Tensor:
+            if attr.device != torch.device("cuda"):
+                attr = attr.to(torch.device("cuda"))
         setattr(self, name, attr)
 
     def make_schedule(self, ddim_num_steps, ddim_discretize="uniform", ddim_eta=0., verbose=True):