diff options
| author | hako-mikan <122196982+hako-mikan@users.noreply.github.com> | 2024-02-09 14:17:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 14:17:40 +0000 |
| commit | 0bc7867ccd4ac24f5f270cb767c4642d0a0c001c (patch) | |
| tree | 2ad13a0cf77bc189a8c9097bd507f9674f993da6 /modules/models | |
| parent | 816096e642187a18b11e2729c42c0b5f677f047d (diff) | |
| parent | cf2772fab0af5573da775e7437e6acdca424f26e (diff) | |
| download | stable-diffusion-webui-gfx803-0bc7867ccd4ac24f5f270cb767c4642d0a0c001c.tar.gz stable-diffusion-webui-gfx803-0bc7867ccd4ac24f5f270cb767c4642d0a0c001c.tar.bz2 stable-diffusion-webui-gfx803-0bc7867ccd4ac24f5f270cb767c4642d0a0c001c.zip | |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/models')
| -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', |