diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2022-09-15 11:54:33 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2022-09-15 11:54:33 +0000 |
| commit | cdaab233c46d01df45a8890da12ea9840ad6b98d (patch) | |
| tree | 02be6fe4cebf666ace6e29aa64ee8cdd331a33c7 /modules | |
| parent | 6d2eb339d650d3a6d9e4c8f5222d5080b526e7d2 (diff) | |
| parent | 56b0b0feb5b629873983b6e5e5a16c726a802d32 (diff) | |
| download | stable-diffusion-webui-gfx803-cdaab233c46d01df45a8890da12ea9840ad6b98d.tar.gz stable-diffusion-webui-gfx803-cdaab233c46d01df45a8890da12ea9840ad6b98d.tar.bz2 stable-diffusion-webui-gfx803-cdaab233c46d01df45a8890da12ea9840ad6b98d.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/images.py | 3 | ||||
| -rw-r--r-- | modules/sd_hijack.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/images.py b/modules/images.py index 91a58610..97cccf54 100644 --- a/modules/images.py +++ b/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):
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index ec7d14cb..65414518 100644 --- a/modules/sd_hijack.py +++ b/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']
|