From 13c32b3666545cce880634ba2866a42e542ed539 Mon Sep 17 00:00:00 2001 From: V Vishnu Anirudh Date: Sat, 24 Sep 2022 19:39:41 +0100 Subject: [PATCH 1/3] correcting the beta value assignment --- src/diffusers/schedulers/scheduling_lms_discrete.py | 2 +- src/diffusers/schedulers/scheduling_pndm.py | 2 +- src/diffusers/schedulers/scheduling_pndm_flax.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/diffusers/schedulers/scheduling_lms_discrete.py b/src/diffusers/schedulers/scheduling_lms_discrete.py index 1dd6dbda1e19..35560b9a8352 100644 --- a/src/diffusers/schedulers/scheduling_lms_discrete.py +++ b/src/diffusers/schedulers/scheduling_lms_discrete.py @@ -81,7 +81,7 @@ def __init__( ): if trained_betas is not None: self.betas = np.asarray(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = np.linspace(beta_start, beta_end, num_train_timesteps, dtype=np.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model. diff --git a/src/diffusers/schedulers/scheduling_pndm.py b/src/diffusers/schedulers/scheduling_pndm.py index 09e8a7e240c2..3e39ac913d4b 100644 --- a/src/diffusers/schedulers/scheduling_pndm.py +++ b/src/diffusers/schedulers/scheduling_pndm.py @@ -105,7 +105,7 @@ def __init__( ): if trained_betas is not None: self.betas = np.asarray(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = np.linspace(beta_start, beta_end, num_train_timesteps, dtype=np.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model. diff --git a/src/diffusers/schedulers/scheduling_pndm_flax.py b/src/diffusers/schedulers/scheduling_pndm_flax.py index 8344505620c4..17a7eece5156 100644 --- a/src/diffusers/schedulers/scheduling_pndm_flax.py +++ b/src/diffusers/schedulers/scheduling_pndm_flax.py @@ -131,7 +131,7 @@ def __init__( ): if trained_betas is not None: self.betas = jnp.asarray(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = jnp.linspace(beta_start, beta_end, num_train_timesteps, dtype=jnp.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model. From 9613f47e6059f2ddaf699305f9dd70e05e233934 Mon Sep 17 00:00:00 2001 From: V Vishnu Anirudh Date: Sat, 24 Sep 2022 19:51:18 +0100 Subject: [PATCH 2/3] updating DDIM and LMSDiscreteFlax schedulers --- src/diffusers/schedulers/scheduling_ddim.py | 2 +- src/diffusers/schedulers/scheduling_lms_discrete_flax.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffusers/schedulers/scheduling_ddim.py b/src/diffusers/schedulers/scheduling_ddim.py index 0613ffd41d0e..996b70edb06b 100644 --- a/src/diffusers/schedulers/scheduling_ddim.py +++ b/src/diffusers/schedulers/scheduling_ddim.py @@ -125,7 +125,7 @@ def __init__( ): if trained_betas is not None: self.betas = np.asarray(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = np.linspace(beta_start, beta_end, num_train_timesteps, dtype=np.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model. diff --git a/src/diffusers/schedulers/scheduling_lms_discrete_flax.py b/src/diffusers/schedulers/scheduling_lms_discrete_flax.py index 7f4c076b54d1..07d34af0e3d0 100644 --- a/src/diffusers/schedulers/scheduling_lms_discrete_flax.py +++ b/src/diffusers/schedulers/scheduling_lms_discrete_flax.py @@ -76,7 +76,7 @@ def __init__( ): if trained_betas is not None: self.betas = jnp.asarray(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = jnp.linspace(beta_start, beta_end, num_train_timesteps, dtype=jnp.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model. From 735b878b3c78a9c0a7ebfefedd957db22ac2396b Mon Sep 17 00:00:00 2001 From: V Vishnu Anirudh Date: Tue, 27 Sep 2022 14:46:51 +0100 Subject: [PATCH 3/3] bringing back the changes that were lost as part of main branch merge --- src/diffusers/schedulers/scheduling_ddim.py | 2 +- src/diffusers/schedulers/scheduling_lms_discrete.py | 2 +- src/diffusers/schedulers/scheduling_pndm.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/diffusers/schedulers/scheduling_ddim.py b/src/diffusers/schedulers/scheduling_ddim.py index 6880700ecef0..9f62e51ca95e 100644 --- a/src/diffusers/schedulers/scheduling_ddim.py +++ b/src/diffusers/schedulers/scheduling_ddim.py @@ -123,7 +123,7 @@ def __init__( ): if trained_betas is not None: self.betas = torch.from_numpy(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = torch.linspace(beta_start, beta_end, num_train_timesteps, dtype=torch.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model. diff --git a/src/diffusers/schedulers/scheduling_lms_discrete.py b/src/diffusers/schedulers/scheduling_lms_discrete.py index 6167af5ad42b..786aa10915b2 100644 --- a/src/diffusers/schedulers/scheduling_lms_discrete.py +++ b/src/diffusers/schedulers/scheduling_lms_discrete.py @@ -77,7 +77,7 @@ def __init__( ): if trained_betas is not None: self.betas = torch.from_numpy(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = torch.linspace(beta_start, beta_end, num_train_timesteps, dtype=torch.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model. diff --git a/src/diffusers/schedulers/scheduling_pndm.py b/src/diffusers/schedulers/scheduling_pndm.py index 1935a6ef93f2..65b50d33af94 100644 --- a/src/diffusers/schedulers/scheduling_pndm.py +++ b/src/diffusers/schedulers/scheduling_pndm.py @@ -103,7 +103,7 @@ def __init__( ): if trained_betas is not None: self.betas = torch.from_numpy(trained_betas) - if beta_schedule == "linear": + elif beta_schedule == "linear": self.betas = torch.linspace(beta_start, beta_end, num_train_timesteps, dtype=torch.float32) elif beta_schedule == "scaled_linear": # this schedule is very specific to the latent diffusion model.