Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/diffusers/schedulers/scheduling_ddpm.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,10 @@ def step(
)
if self.variance_type == "fixed_small_log":
variance = self._get_variance(t, predicted_variance=predicted_variance) * variance_noise
elif self.variance_type == "learned_range":
elif self.variance_type in ("learned_range", "fixed_large_log"):
# `_get_variance` returns a log-space value for these types. Convert back to a
# standard deviation with exp(0.5 * log_var). Taking sqrt() of log(beta) for
# `fixed_large_log` is invalid (beta < 1) and produces NaNs.
variance = self._get_variance(t, predicted_variance=predicted_variance)
variance = torch.exp(0.5 * variance) * variance_noise
else:
Expand Down
5 changes: 4 additions & 1 deletion src/diffusers/schedulers/scheduling_ddpm_parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,10 @@ def step(
)
if self.variance_type == "fixed_small_log":
variance = self._get_variance(t, predicted_variance=predicted_variance) * variance_noise
elif self.variance_type == "learned_range":
elif self.variance_type in ("learned_range", "fixed_large_log"):
# `_get_variance` returns a log-space value for these types. Convert back to a
# standard deviation with exp(0.5 * log_var). Taking sqrt() of log(beta) for
# `fixed_large_log` is invalid (beta < 1) and produces NaNs.
variance = self._get_variance(t, predicted_variance=predicted_variance)
variance = torch.exp(0.5 * variance) * variance_noise
else:
Expand Down
18 changes: 18 additions & 0 deletions tests/schedulers/test_scheduler_ddpm.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,24 @@ def test_variance(self):
assert torch.sum(torch.abs(scheduler._get_variance(487) - 0.00979)) < 1e-5
assert torch.sum(torch.abs(scheduler._get_variance(999) - 0.02)) < 1e-5

def test_fixed_large_log_sampling_is_finite_and_matches_fixed_large(self):
# `fixed_large_log` stores log(beta). Sampling must use exp(0.5 * log) rather than
# sqrt(log(beta)), which is NaN because beta < 1. The intended scale matches `fixed_large`.
sample = torch.zeros((1, 2, 2, 2))
model_output = torch.zeros_like(sample)
log_scheduler = self.scheduler_classes[0](**self.get_scheduler_config(variance_type="fixed_large_log"))
large_scheduler = self.scheduler_classes[0](**self.get_scheduler_config(variance_type="fixed_large"))

log_output = log_scheduler.step(
model_output, 500, sample, generator=torch.Generator().manual_seed(0)
).prev_sample
large_output = large_scheduler.step(
model_output, 500, sample, generator=torch.Generator().manual_seed(0)
).prev_sample

assert torch.isfinite(log_output).all()
assert torch.allclose(log_output, large_output)

def test_rescale_betas_zero_snr(self):
for rescale_betas_zero_snr in [True, False]:
self.check_over_configs(rescale_betas_zero_snr=rescale_betas_zero_snr)
Expand Down
18 changes: 18 additions & 0 deletions tests/schedulers/test_scheduler_ddpm_parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ def test_variance(self):
assert torch.sum(torch.abs(scheduler._get_variance(487) - 0.00979)) < 1e-5
assert torch.sum(torch.abs(scheduler._get_variance(999) - 0.02)) < 1e-5

def test_fixed_large_log_sampling_is_finite_and_matches_fixed_large(self):
# `fixed_large_log` stores log(beta). Sampling must use exp(0.5 * log) rather than
# sqrt(log(beta)), which is NaN because beta < 1. The intended scale matches `fixed_large`.
sample = torch.zeros((1, 2, 2, 2))
model_output = torch.zeros_like(sample)
log_scheduler = self.scheduler_classes[0](**self.get_scheduler_config(variance_type="fixed_large_log"))
large_scheduler = self.scheduler_classes[0](**self.get_scheduler_config(variance_type="fixed_large"))

log_output = log_scheduler.step(
model_output, 500, sample, generator=torch.Generator().manual_seed(0)
).prev_sample
large_output = large_scheduler.step(
model_output, 500, sample, generator=torch.Generator().manual_seed(0)
).prev_sample

assert torch.isfinite(log_output).all()
assert torch.allclose(log_output, large_output)

def test_rescale_betas_zero_snr(self):
for rescale_betas_zero_snr in [True, False]:
self.check_over_configs(rescale_betas_zero_snr=rescale_betas_zero_snr)
Expand Down
Loading