diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-16 07:05:10 +0000 |
---|---|---|
committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-16 07:05:10 +0000 |
commit | e9c6325fc635302e2b4b8295345833cb8b15f7fb (patch) | |
tree | b501070bcf1ae667b1555e682598973818c945e0 /modules/models | |
parent | 29f04149b60bcf6e8e2b41a161d6cc7e8981710f (diff) | |
parent | 7504f14503d6ce5a014f1c558ea4f4d57675e1e9 (diff) | |
download | stable-diffusion-webui-gfx803-e9c6325fc635302e2b4b8295345833cb8b15f7fb.tar.gz stable-diffusion-webui-gfx803-e9c6325fc635302e2b4b8295345833cb8b15f7fb.tar.bz2 stable-diffusion-webui-gfx803-e9c6325fc635302e2b4b8295345833cb8b15f7fb.zip |
Merge branch 'dev' into torch210
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', |