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

Merge branch 'main' into install/refactor-configure-and-model-select

Browse Source
This commit is contained in:
Lincoln Stein 2023-02-21 14:09:38 -05:00 committed by GitHub
commit 4878c7a2d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ldm/generate.py
View File

@ -178,7 +178,9 @@ class Generate:
self.model_hash = None
self.sampler = None
self.device = None
self.session_peakmem = None
self.max_memory_allocated = 0
self.memory_allocated = 0
self.session_peakmem = 0
self.base_generator = None
self.seed = None
self.outdir = outdir
@ -787,6 +789,7 @@ class Generate:
embiggen_tiles=opt.embiggen_tiles,
embiggen_strength=opt.embiggen_strength,
image_callback=callback,
clear_cuda_cache=self.clear_cuda_cache,
)
elif tool == "outpaint":
from ldm.invoke.restoration.outpaint import Outpaint

2
ldm/invoke/generator/base.py
View File

@ -126,7 +126,7 @@ class Generator:
seed = self.new_seed()
# Free up memory from the last generation.
clear_cuda_cache = kwargs['clear_cuda_cache'] or None
clear_cuda_cache = kwargs['clear_cuda_cache'] if 'clear_cuda_cache' in kwargs else None
if clear_cuda_cache is not None:
clear_cuda_cache()

2
ldm/invoke/generator/diffusers_pipeline.py
View File

@ -331,7 +331,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
16 * \
latents.size(dim=2) * latents.size(dim=3) * latents.size(dim=2) * latents.size(dim=3) * \
bytes_per_element_needed_for_baddbmm_duplication
if max_size_required_for_baddbmm > (mem_free * 3.3 / 4.0): # 3.3 / 4.0 is from old Invoke code
if max_size_required_for_baddbmm > (mem_free * 3.0 / 4.0): # 3.3 / 4.0 is from old Invoke code
self.enable_attention_slicing(slice_size='max')
else:
self.disable_attention_slicing()

2
ldm/invoke/generator/embiggen.py
View File

@ -346,6 +346,7 @@ class Embiggen(Generator):
newinitimage = torch.from_numpy(newinitimage)
newinitimage = 2.0 * newinitimage - 1.0
newinitimage = newinitimage.to(self.model.device)
clear_cuda_cache = kwargs['clear_cuda_cache'] if 'clear_cuda_cache' in kwargs else None
tile_results = gen_img2img.generate(
prompt,
@ -363,6 +364,7 @@ class Embiggen(Generator):
init_image = newinitimage, # notice that init_image is different from init_img
mask_image = None,
strength = strength,
clear_cuda_cache = clear_cuda_cache
)
emb_tile_store.append(tile_results[0][0])