From 8731b498c02f3ae0bf991489b69dabd8733a5ade Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue, 20 Sep 2022 23:55:57 -0400
Subject: [PATCH] fix merge conflicts

---
 ldm/dream/generator/embiggen.py | 2 +-
 ldm/generate.py                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ldm/dream/generator/embiggen.py b/ldm/dream/generator/embiggen.py
index e28819713b..88ac9373fb 100644
--- a/ldm/dream/generator/embiggen.py
+++ b/ldm/dream/generator/embiggen.py
@@ -66,7 +66,7 @@ class Embiggen(Generator):
             print(f'* WARNING: Embiggen may produce mirror motifs if the strength (-f) is too high (currently {strength}). Try values between 0.35-0.45.')
 
         # Prep img2img generator, since we wrap over it
-        gen_img2img = Img2Img(self.model)
+        gen_img2img = Img2Img(self.model,self.precision)
 
         # Open original init image (not a tensor) to manipulate
         initsuperimage = Image.open(init_img)
diff --git a/ldm/generate.py b/ldm/generate.py
index 70a00eca33..db22e16fd3 100644
--- a/ldm/generate.py
+++ b/ldm/generate.py
@@ -30,7 +30,7 @@ from ldm.models.diffusion.ksampler import KSampler
 from ldm.dream.pngwriter import PngWriter, retrieve_metadata
 from ldm.dream.args import metadata_loads
 from ldm.dream.image_util import InitImageResizer
-from ldm.dream.devices import choose_torch_device
+from ldm.dream.devices import choose_torch_device, choose_precision
 from ldm.dream.conditioning import get_uc_and_c
 
 def fix_func(orig):