Merge remote-tracking branch 'origin/master'

modules/images.py

@@ -357,6 +357,9 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
     else:
         image.save(fullfn, quality=opts.jpeg_quality, pnginfo=pnginfo)
 
+    if extension.lower() == "webp":
+        piexif.insert(exif_bytes, fullfn)
+
     target_side_length = 4000
     oversize = image.width > target_side_length or image.height > target_side_length
     if opts.export_for_4chan and (oversize or os.stat(fullfn).st_size > 4 * 1024 * 1024):

modules/sd_hijack.py

@@ -57,7 +57,7 @@ def split_cross_attention_forward(self, x, context=None, mask=None):
     q, k, v = map(lambda t: rearrange(t, 'b n (h d) -> (b h) n d', h=h), (q_in, k_in, v_in))
     del q_in, k_in, v_in
 
-    r1 = torch.zeros(q.shape[0], q.shape[1], v.shape[2], device=q.device)
+    r1 = torch.zeros(q.shape[0], q.shape[1], v.shape[2], device=q.device, dtype=q.dtype)
 
     stats = torch.cuda.memory_stats(q.device)
     mem_active = stats['active_bytes.all.current']