fix merge conflicts

This commit is contained in:
Lincoln Stein 2022-09-20 23:55:57 -04:00
parent f408ef2e6c
commit 8731b498c0
2 changed files with 2 additions and 2 deletions

View File

@ -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)

View File

@ -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):