diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-14 07:10:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-14 07:10:43 +0000 |
| commit | 097140ac1a3caf6e3c9980a757d4b52e6a76b789 (patch) | |
| tree | c31cf29908f94e7f6792b063df4543d6f83b423c /modules/models/diffusion | |
| parent | bda86f0fd9653657c146f7c1128f92771d16ad4e (diff) | |
| parent | 778a30a95e216f9f7ce0126dbbdb1334afc3d796 (diff) | |
| download | stable-diffusion-webui-gfx803-097140ac1a3caf6e3c9980a757d4b52e6a76b789.tar.gz stable-diffusion-webui-gfx803-097140ac1a3caf6e3c9980a757d4b52e6a76b789.tar.bz2 stable-diffusion-webui-gfx803-097140ac1a3caf6e3c9980a757d4b52e6a76b789.zip | |
Merge branch 'dev' into master
Diffstat (limited to 'modules/models/diffusion')
| -rw-r--r-- | modules/models/diffusion/ddpm_edit.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/models/diffusion/ddpm_edit.py b/modules/models/diffusion/ddpm_edit.py index b892d5fc..6db340da 100644 --- a/modules/models/diffusion/ddpm_edit.py +++ b/modules/models/diffusion/ddpm_edit.py @@ -24,10 +24,15 @@ from pytorch_lightning.utilities.distributed import rank_zero_only from ldm.util import log_txt_as_img, exists, default, ismap, isimage, mean_flat, count_params, instantiate_from_config from ldm.modules.ema import LitEma from ldm.modules.distributions.distributions import normal_kl, DiagonalGaussianDistribution -from ldm.models.autoencoder import VQModelInterface, IdentityFirstStage, AutoencoderKL +from ldm.models.autoencoder import IdentityFirstStage, AutoencoderKL from ldm.modules.diffusionmodules.util import make_beta_schedule, extract_into_tensor, noise_like from ldm.models.diffusion.ddim import DDIMSampler +try: + from ldm.models.autoencoder import VQModelInterface +except Exception: + class VQModelInterface: + pass __conditioning_keys__ = {'concat': 'c_concat', 'crossattn': 'c_crossattn', |