Merge remote-tracking branch 'origin/main' into dev/diffusers

Author: keturn

ldm/invoke/generator/base.py

@@ -114,7 +114,8 @@ def generate(self,prompt,init_image,width,height,sampler, iterations=1,seed=None
                 results.append([image, seed])
 
                 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()
 

ldm/models/diffusion/cross_attention_control.py

@@ -281,7 +281,7 @@ def einsum_op_cuda(self, q, k, v):
                     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
-        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
         return self.einsum_op_tensor_mem(q, k, v, mem_free_total / 3.3 / (1 << 20))
 

tests/pr_prompt.txt

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