Compare commits

...
5 Commits
Author SHA1 Message Date
wassname edc6d5136a Update denoising_diffusion_pytorch_1d.py 2022-12-22 11:00:56 +08:00
wassname 207d23af86 Update denoising_diffusion_pytorch.py
Shouldn't eta be 0 for DDIM sampling? In the DDIM paper in section 5.1 they mention the eta=0 is DDIM, and eta=1 approximates the normal DDPM. They also use [eta=0](https://github.com/openai/improved-diffusion/blob/e94489283bb876ac1477d5dd7709bbbd2d9902ce/improved_diffusion/gaussian_diffusion.py#L487) in the openai implementation of DDIM.
2022-12-22 10:57:30 +08:00
Phil Wang cf4f44909f 0.1.5 2022-12-21 08:35:59 -08:00
Phil Wang a7f2d670bb always set results_folder on Trainer 2022-12-21 08:34:34 -08:00
Phil Wang 6ab29d5cea start saving version of library in the checkpoints, so in case of breaking changes, researchers can return to the right working version 2022-11-28 12:11:11 -08:00
4 changed files with 15 additions and 6 deletions
@@ -23,6 +23,8 @@ from ema_pytorch import EMA
from accelerate import Accelerator from accelerate import Accelerator
from denoising_diffusion_pytorch.version import __version__
# constants # constants
ModelPrediction = namedtuple('ModelPrediction', ['pred_noise', 'pred_x_start']) ModelPrediction = namedtuple('ModelPrediction', ['pred_noise', 'pred_x_start'])
@@ -429,7 +431,7 @@ class GaussianDiffusion(nn.Module):
beta_schedule = 'cosine', beta_schedule = 'cosine',
p2_loss_weight_gamma = 0., # p2 loss weight, from https://arxiv.org/abs/2204.00227 - 0 is equivalent to weight of 1 across time - 1. is recommended p2_loss_weight_gamma = 0., # p2 loss weight, from https://arxiv.org/abs/2204.00227 - 0 is equivalent to weight of 1 across time - 1. is recommended
p2_loss_weight_k = 1, p2_loss_weight_k = 1,
ddim_sampling_eta = 1. ddim_sampling_eta = 0.
): ):
super().__init__() super().__init__()
assert not (type(self) == GaussianDiffusion and model.channels != model.out_dim) assert not (type(self) == GaussianDiffusion and model.channels != model.out_dim)
@@ -808,8 +810,8 @@ class Trainer(object):
if self.accelerator.is_main_process: if self.accelerator.is_main_process:
self.ema = EMA(diffusion_model, beta = ema_decay, update_every = ema_update_every) self.ema = EMA(diffusion_model, beta = ema_decay, update_every = ema_update_every)
self.results_folder = Path(results_folder) self.results_folder = Path(results_folder)
self.results_folder.mkdir(exist_ok = True) self.results_folder.mkdir(exist_ok = True)
# step counter state # step counter state
@@ -828,7 +830,8 @@ class Trainer(object):
'model': self.accelerator.get_state_dict(self.model), 'model': self.accelerator.get_state_dict(self.model),
'opt': self.opt.state_dict(), 'opt': self.opt.state_dict(),
'ema': self.ema.state_dict(), 'ema': self.ema.state_dict(),
'scaler': self.accelerator.scaler.state_dict() if exists(self.accelerator.scaler) else None 'scaler': self.accelerator.scaler.state_dict() if exists(self.accelerator.scaler) else None,
'version': __version__
} }
torch.save(data, str(self.results_folder / f'model-{milestone}.pt')) torch.save(data, str(self.results_folder / f'model-{milestone}.pt'))
@@ -846,6 +849,9 @@ class Trainer(object):
self.opt.load_state_dict(data['opt']) self.opt.load_state_dict(data['opt'])
self.ema.load_state_dict(data['ema']) self.ema.load_state_dict(data['ema'])
if 'version' in data:
print(f"loading from version {data['version']}")
if exists(self.accelerator.scaler) and exists(data['scaler']): if exists(self.accelerator.scaler) and exists(data['scaler']):
self.accelerator.scaler.load_state_dict(data['scaler']) self.accelerator.scaler.load_state_dict(data['scaler'])
@@ -414,7 +414,7 @@ class GaussianDiffusion1D(nn.Module):
beta_schedule = 'cosine', beta_schedule = 'cosine',
p2_loss_weight_gamma = 0., p2_loss_weight_gamma = 0.,
p2_loss_weight_k = 1, p2_loss_weight_k = 1,
ddim_sampling_eta = 1. ddim_sampling_eta = 0.
): ):
super().__init__() super().__init__()
self.model = model self.model = model
+1
View File
@@ -0,0 +1 @@
__version__ = '0.1.5'
+3 -1
View File
@@ -1,9 +1,11 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
exec(open('denoising_diffusion_pytorch/version.py').read())
setup( setup(
name = 'denoising-diffusion-pytorch', name = 'denoising-diffusion-pytorch',
packages = find_packages(), packages = find_packages(),
version = '0.32.0', version = __version__,
license='MIT', license='MIT',
description = 'Denoising Diffusion Probabilistic Models - Pytorch', description = 'Denoising Diffusion Probabilistic Models - Pytorch',
author = 'Phil Wang', author = 'Phil Wang',