Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks to get embiggen to work with new development changes PR #553

Browse Source 
- swapped out calls to choose_autocast()
- fixed call to retrieve_png_metadata() so as to recover original prompt

Original author: @travco
This commit is contained in:
Lincoln Stein 2022-09-26 03:23:03 -04:00
parent fdf6a542bf
commit d63897fc39
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ldm/dream/generator/embiggen.py
View File

@ -7,9 +7,9 @@ import torch
import numpy as np import numpy as np
from tqdm import trange from tqdm import trange
from PIL import Image from PIL import Image
from ldm.dream.devices import choose_autocast_device
from ldm.dream.generator.base import Generator from ldm.dream.generator.base import Generator
from ldm.dream.generator.img2img import Img2Img from ldm.dream.generator.img2img import Img2Img
from ldm.dream.devices import choose_autocast
class Embiggen(Generator): class Embiggen(Generator):
def __init__(self, model, precision): def __init__(self, model, precision):
@ -20,16 +20,17 @@ class Embiggen(Generator):
def generate(self,prompt,iterations=1,seed=None, def generate(self,prompt,iterations=1,seed=None,
image_callback=None, step_callback=None, image_callback=None, step_callback=None,
**kwargs): **kwargs):
device_type,scope = choose_autocast_device(self.model.device) scope = choose_autocast(self.precision)
make_image = self.get_make_image( make_image = self.get_make_image(
prompt, prompt,
step_callback = step_callback, step_callback = step_callback,
**kwargs **kwargs
) )
results = [] results = []
seed = seed if seed else self.new_seed() seed = seed if seed else self.new_seed()
# Noise will be generated by the Img2Img generator when called # Noise will be generated by the Img2Img generator when called
with scope(device_type), self.model.ema_scope(): with scope(self.model.device.type), self.model.ema_scope():
for n in trange(iterations, desc='Generating'): for n in trange(iterations, desc='Generating'):
# make_image will call Img2Img which will do the equivalent of get_noise itself # make_image will call Img2Img which will do the equivalent of get_noise itself
image = make_image() image = make_image()
@ -360,21 +361,6 @@ class Embiggen(Generator):
init_image = newinitimage, # notice that init_image is different from init_img init_image = newinitimage, # notice that init_image is different from init_img
mask_image = None, mask_image = None,
strength = strength, strength = strength,
iterations=1,
seed=self.seed,
sampler=sampler,
steps=steps,
cfg_scale=cfg_scale,
conditioning=conditioning,
ddim_eta=ddim_eta,
image_callback=None, # called only after the final image is generated
step_callback=step_callback, # called after each intermediate image is generated
width=width,
height=height,
init_img=init_img, # img2img doesn't need this, but it might in the future
init_image=newinitimage, # notice that init_image is different from init_img
mask_image=None,
strength=strength,
) )
emb_tile_store.append(tile_results[0][0]) emb_tile_store.append(tile_results[0][0])

7
ldm/generate.py
View File

@ -497,11 +497,8 @@ class Generate:
prompt = None prompt = None
try: try:
args = metadata_from_png(image_path) args = metadata_from_png(image_path)
if len(args) > 1: seed = args.seed
print("* Can't postprocess a grid") prompt = args.prompt
return
seed = args[0].seed
prompt = args[0].prompt
print(f'>> retrieved seed {seed} and prompt "{prompt}" from {image_path}') print(f'>> retrieved seed {seed} and prompt "{prompt}" from {image_path}')
except: except:
m = re.search('(\d+)\.png$',image_path) m = re.search('(\d+)\.png$',image_path)