Merge branch 'main' into development

Synchronizing dev with legacy pulls to main.
This commit is contained in:
Lincoln Stein 2022-09-02 10:22:57 -04:00
commit 33cc16473f

View File

@ -280,7 +280,14 @@ class T2I:
), 'can only work with strength in [0.0, 1.0]'
width, height, _ = self._resolution_check(width, height, log=True)
scope = autocast if self.precision == 'autocast' else nullcontext
# TODO: - Check if this is still necessary to run on M1 devices.
# - Move code into ldm.dream.devices to live alongside other
# special-hardware casing code.
if self.precision == 'autocast' and torch.cuda.is_available():
scope = autocast
else:
scope = nullcontext
if sampler_name and (sampler_name != self.sampler_name):
self.sampler_name = sampler_name