Merge 9cfd46b2d9a21c54ebbf88fbd435ec1cd3881315 into 44db9785310ab6ce7214ba7f04060bdbe572d284

This commit is contained in:
Joel Trauger 2024-12-11 18:10:21 +08:00 committed by GitHub
commit bf14f2318b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -435,7 +435,7 @@ class VAE:
if pixel_samples is None:
pixel_samples = torch.empty((samples_in.shape[0],) + tuple(out.shape[1:]), device=self.output_device)
pixel_samples[x:x+batch_number] = out
except model_management.OOM_EXCEPTION as e:
except (model_management.OOM_EXCEPTION, RuntimeError, MemoryError) as e:
logging.warning("Warning: Ran out of memory when regular VAE decoding, retrying with tiled VAE decoding.")
dims = samples_in.ndim - 2
if dims == 1: