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 remote-tracking branch 'origin/main' into dev/diffusers

Browse Source
This commit is contained in:
Kevin Turner 2022-12-10 19:18:00 -08:00
commit 061c5369a2
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,8 @@ class Generator:
results.append([image, seed]) results.append([image, seed])
if image_callback is not None: if image_callback is not None:
image_callback(image, seed, first_seed=first_seed, attention_maps_image=attention_maps_images[-1]) attention_maps_image = None if len(attention_maps_images)==0 else attention_maps_images[-1]
image_callback(image, seed, first_seed=first_seed, attention_maps_image=attention_maps_image)
seed = self.new_seed() seed = self.new_seed()

2
ldm/models/diffusion/cross_attention_control.py
View File

@ -281,7 +281,7 @@ class InvokeAICrossAttentionMixin:
return self.einsum_op_slice_dim1(q, k, v, slice_size) return self.einsum_op_slice_dim1(q, k, v, slice_size)
# fallback for when there is no saved strategy, or saved strategy does not slice # fallback for when there is no saved strategy, or saved strategy does not slice
mem_free_total = self.cached_mem_free_total or get_mem_free_total(q.device) mem_free_total = get_mem_free_total(q.device)
# Divide factor of safety as there's copying and fragmentation # Divide factor of safety as there's copying and fragmentation
return self.einsum_op_tensor_mem(q, k, v, mem_free_total / 3.3 / (1 << 20)) return self.einsum_op_tensor_mem(q, k, v, mem_free_total / 3.3 / (1 << 20))

1
tests/pr_prompt.txt
View File

@ -1 +0,0 @@
banana sushi -Ak_lms -S42 -s10

4
tests/validate_pr_prompt.txt
View File

@ -1 +1,3 @@
banana sushi -Ak_lms -S42 -s10 banana sushi -Ak_lms -S42 -s5
banana sushi -Ak_heun -S42 -s5
banana sushi -Addim -S42 -s5