The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Fix imports.
comfyanonymousbae4fb4a9dc9
diff --git a/comfy/cldm/cldm.py b/comfy/cldm/cldm.pyindex c60abf80b..cb660ee77 100644--- a/comfy/cldm/cldm.py+++ b/comfy/cldm/cldm.py@@ -5,17 +5,17 @@ import torchimport torch as thimport torch.nn as nn-from ldm.modules.diffusionmodules.util import (+from ..ldm.modules.diffusionmodules.util import (conv_nd,linear,zero_module,timestep_embedding,)-from ldm.modules.attention import SpatialTransformer-from ldm.modules.diffusionmodules.openaimodel import UNetModel, TimestepEmbedSequential, ResBlock, Downsample, AttentionBlock-from ldm.models.diffusion.ddpm import LatentDiffusion-from ldm.util import log_txt_as_img, exists, instantiate_from_config+from ..ldm.modules.attention import SpatialTransformer+from ..ldm.modules.diffusionmodules.openaimodel import UNetModel, TimestepEmbedSequential, ResBlock, Downsample, AttentionBlock+from ..ldm.models.diffusion.ddpm import LatentDiffusion+from ..ldm.util import log_txt_as_img, exists, instantiate_from_configclass ControlledUnetModel(UNetModel):diff --git a/comfy/gligen.py b/comfy/gligen.pyindex 8770383e5..45b674503 100644--- a/comfy/gligen.py+++ b/comfy/gligen.py@@ -1,6 +1,6 @@import torchfrom torch import nn, einsum-from ldm.modules.attention import CrossAttention+from .ldm.modules.attention import CrossAttentionfrom inspect import isfunctiondiff --git a/comfy/ldm/models/autoencoder.py b/comfy/ldm/models/autoencoder.pyindex bd698621c..1fb7ed879 100644--- a/comfy/ldm/models/autoencoder.py+++ b/comfy/ldm/models/autoencoder.py@@ -3,11 +3,11 @@ import torchimport torch.nn.functional as Ffrom contextlib import contextmanager-from ldm.modules.diffusionmodules.model import Encoder, Decoder-from ldm.modules.distributions.distributions import DiagonalGaussianDistribution+from comfy.ldm.modules.diffusionmodules.model import Encoder, Decoder+from comfy.ldm.modules.distributions.distributions import DiagonalGaussianDistribution-from ldm.util import instantiate_from_config-from ldm.modules.ema import LitEma+from comfy.ldm.util import instantiate_from_config+from comfy.ldm.modules.ema import LitEma# class AutoencoderKL(pl.LightningModule):class AutoencoderKL(torch.nn.Module):diff --git a/comfy/ldm/models/diffusion/ddim.py b/comfy/ldm/models/diffusion/ddim.pyindex deab76f21..c279f2c18 100644--- a/comfy/ldm/models/diffusion/ddim.py+++ b/comfy/ldm/models/diffusion/ddim.py@@ -4,7 +4,7 @@ import torchimport numpy as npfrom tqdm import tqdm-from ldm.modules.diffusionmodules.util import make_ddim_sampling_parameters, make_ddim_timesteps, noise_like, extract_into_tensor+from comfy.ldm.modules.diffusionmodules.util import make_ddim_sampling_parameters, make_ddim_timesteps, noise_like, extract_into_tensorclass DDIMSampler(object):diff --git a/comfy/ldm/models/diffusion/ddpm.py b/comfy/ldm/models/diffusion/ddpm.pyindex d3f0eb2b2..0f484a7f1 100644--- a/comfy/ldm/models/diffusion/ddpm.py+++ b/comfy/ldm/models/diffusion/ddpm.py@@ -19,12 +19,12 @@ from tqdm import tqdmfrom torchvision.utils import make_grid# 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 IdentityFirstStage, AutoencoderKL-from ldm.modules.diffusionmodules.util import make_beta_schedule, extract_into_tensor, noise_like-from ldm.models.diffusion.ddim import DDIMSampler+from comfy.ldm.util import log_txt_as_img, exists, default, ismap, isimage, mean_flat, count_params, instantiate_from_config+from comfy.ldm.modules.ema import LitEma+from comfy.ldm.modules.distributions.distributions import normal_kl, DiagonalGaussianDistribution+from ..autoencoder import IdentityFirstStage, AutoencoderKL+from comfy.ldm.modules.diffusionmodules.util import make_beta_schedule, extract_into_tensor, noise_like+from .ddim import DDIMSampler__conditioning_keys__ = {'concat': 'c_concat',diff --git a/comfy/ldm/modules/attention.py b/comfy/ldm/modules/attention.pyindex ce7180d91..5eabecd65 100644--- a/comfy/ldm/modules/attention.py+++ b/comfy/ldm/modules/attention.py@@ -6,7 +6,7 @@ from torch import nn, einsumfrom einops import rearrange, repeatfrom typing import Optional, Any-from ldm.modules.diffusionmodules.util import checkpoint+from .diffusionmodules.util import checkpointfrom .sub_quadratic_attention import efficient_dot_product_attentionfrom comfy import model_management@@ -21,7 +21,7 @@ if model_management.xformers_enabled():import os_ATTN_PRECISION = os.environ.get("ATTN_PRECISION", "fp32")-from cli_args import args+from comfy.cli_args import argsdef exists(val):return val is not Nonediff --git a/comfy/ldm/modules/diffusionmodules/model.py b/comfy/ldm/modules/diffusionmodules/model.pyindex 1599d386e..5e4d2b60f 100644--- a/comfy/ldm/modules/diffusionmodules/model.py+++ b/comfy/ldm/modules/diffusionmodules/model.py@@ -6,7 +6,7 @@ import numpy as npfrom einops import rearrangefrom typing import Optional, Any-from ldm.modules.attention import MemoryEfficientCrossAttention+from ..attention import MemoryEfficientCrossAttentionfrom comfy import model_managementif model_management.xformers_enabled_vae():diff --git a/comfy/ldm/modules/diffusionmodules/openaimodel.py b/comfy/ldm/modules/diffusionmodules/openaimodel.pyindex 25309dbd7..4352b756d 100644--- a/comfy/ldm/modules/diffusionmodules/openaimodel.py+++ b/comfy/ldm/modules/diffusionmodules/openaimodel.py@@ -6,7 +6,7 @@ import torch as thimport torch.nn as nnimport torch.nn.functional as F-from ldm.modules.diffusionmodules.util import (+from .util import (checkpoint,conv_nd,linear,@@ -15,8 +15,8 @@ from ldm.modules.diffusionmodules.util import (normalization,timestep_embedding,)-from ldm.modules.attention import SpatialTransformer-from ldm.util import exists+from ..attention import SpatialTransformer+from comfy.ldm.util import exists# dummy replacediff --git a/comfy/ldm/modules/diffusionmodules/upscaling.py b/comfy/ldm/modules/diffusionmodules/upscaling.pyindex 038166620..709a7f52e 100644--- a/comfy/ldm/modules/diffusionmodules/upscaling.py+++ b/comfy/ldm/modules/diffusionmodules/upscaling.py@@ -3,8 +3,8 @@ import torch.nn as nnimport numpy as npfrom functools import partial-from ldm.modules.diffusionmodules.util import extract_into_tensor, make_beta_schedule-from ldm.util import default+from .util import extract_into_tensor, make_beta_schedule+from comfy.ldm.util import defaultclass AbstractLowScaleModel(nn.Module):diff --git a/comfy/ldm/modules/diffusionmodules/util.py b/comfy/ldm/modules/diffusionmodules/util.pyindex daf35da7b..82ea3f0a6 100644--- a/comfy/ldm/modules/diffusionmodules/util.py+++ b/comfy/ldm/modules/diffusionmodules/util.py@@ -15,7 +15,7 @@ import torch.nn as nnimport numpy as npfrom einops import repeat-from ldm.util import instantiate_from_config+from comfy.ldm.util import instantiate_from_configdef make_beta_schedule(schedule, n_timestep, linear_start=1e-4, linear_end=2e-2, cosine_s=8e-3):diff --git a/comfy/ldm/modules/encoders/noise_aug_modules.py b/comfy/ldm/modules/encoders/noise_aug_modules.pyindex f99e7920a..b59bf204b 100644--- a/comfy/ldm/modules/encoders/noise_aug_modules.py+++ b/comfy/ldm/modules/encoders/noise_aug_modules.py@@ -1,5 +1,5 @@-from ldm.modules.diffusionmodules.upscaling import ImageConcatWithNoiseAugmentation-from ldm.modules.diffusionmodules.openaimodel import Timestep+from ..diffusionmodules.upscaling import ImageConcatWithNoiseAugmentation+from ..diffusionmodules.openaimodel import Timestepimport torchclass CLIPEmbeddingNoiseAugmentation(ImageConcatWithNoiseAugmentation):diff --git a/comfy/model_management.py b/comfy/model_management.pyindex db5d368e1..e89f80d69 100644--- a/comfy/model_management.py+++ b/comfy/model_management.py@@ -1,6 +1,6 @@import psutilfrom enum import Enum-from cli_args import args+from .cli_args import argsclass VRAMState(Enum):CPU = 0diff --git a/comfy/sd.py b/comfy/sd.pyindex 174ed35e5..3543bdb77 100644--- a/comfy/sd.py+++ b/comfy/sd.py@@ -2,8 +2,8 @@ import torchimport contextlibimport copy-import sd1_clip-import sd2_clip+from . import sd1_clip+from . import sd2_clipfrom comfy import model_managementfrom .ldm.util import instantiate_from_configfrom .ldm.models.autoencoder import AutoencoderKL@@ -446,10 +446,10 @@ class CLIP:else:params = {}- if self.target_clip == "ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder":+ if self.target_clip.endswith("FrozenOpenCLIPEmbedder"):clip = sd2_clip.SD2ClipModeltokenizer = sd2_clip.SD2Tokenizer- elif self.target_clip == "ldm.modules.encoders.modules.FrozenCLIPEmbedder":+ elif self.target_clip.endswith("FrozenCLIPEmbedder"):clip = sd1_clip.SD1ClipModeltokenizer = sd1_clip.SD1Tokenizer@@ -896,9 +896,9 @@ def load_clip(ckpt_path, embedding_directory=None):clip_data = utils.load_torch_file(ckpt_path)config = {}if "text_model.encoder.layers.22.mlp.fc1.weight" in clip_data:- config['target'] = 'ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder'+ config['target'] = 'comfy.ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder'else:- config['target'] = 'ldm.modules.encoders.modules.FrozenCLIPEmbedder'+ config['target'] = 'comfy.ldm.modules.encoders.modules.FrozenCLIPEmbedder'clip = CLIP(config=config, embedding_directory=embedding_directory)clip.load_from_state_dict(clip_data)return clip@@ -974,9 +974,9 @@ def load_checkpoint_guess_config(ckpt_path, output_vae=True, output_clip=True, oif output_clip:clip_config = {}if "cond_stage_model.model.transformer.resblocks.22.attn.out_proj.weight" in sd_keys:- clip_config['target'] = 'ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder'+ clip_config['target'] = 'comfy.ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder'else:- clip_config['target'] = 'ldm.modules.encoders.modules.FrozenCLIPEmbedder'+ clip_config['target'] = 'comfy.ldm.modules.encoders.modules.FrozenCLIPEmbedder'clip = CLIP(config=clip_config, embedding_directory=embedding_directory)w.cond_stage_model = clip.cond_stage_modelload_state_dict_to = [w]@@ -997,7 +997,7 @@ def load_checkpoint_guess_config(ckpt_path, output_vae=True, output_clip=True, onoise_schedule_config["timesteps"] = sd[noise_aug_key].shape[0]noise_schedule_config["beta_schedule"] = "squaredcos_cap_v2"params["noise_schedule_config"] = noise_schedule_config- noise_aug_config['target'] = "ldm.modules.encoders.noise_aug_modules.CLIPEmbeddingNoiseAugmentation"+ noise_aug_config['target'] = "comfy.ldm.modules.encoders.noise_aug_modules.CLIPEmbeddingNoiseAugmentation"if size == 1280: #hparams["timestep_dim"] = 1024elif size == 1024: #l@@ -1049,19 +1049,19 @@ def load_checkpoint_guess_config(ckpt_path, output_vae=True, output_clip=True, ounet_config["in_channels"] = sd['model.diffusion_model.input_blocks.0.0.weight'].shape[1]unet_config["context_dim"] = sd['model.diffusion_model.input_blocks.1.1.transformer_blocks.0.attn2.to_k.weight'].shape[1]- sd_config["unet_config"] = {"target": "ldm.modules.diffusionmodules.openaimodel.UNetModel", "params": unet_config}- model_config = {"target": "ldm.models.diffusion.ddpm.LatentDiffusion", "params": sd_config}+ sd_config["unet_config"] = {"target": "comfy.ldm.modules.diffusionmodules.openaimodel.UNetModel", "params": unet_config}+ model_config = {"target": "comfy.ldm.models.diffusion.ddpm.LatentDiffusion", "params": sd_config}if noise_aug_config is not None: #SD2.x unclip modelsd_config["noise_aug_config"] = noise_aug_configsd_config["image_size"] = 96sd_config["embedding_dropout"] = 0.25sd_config["conditioning_key"] = 'crossattn-adm'- model_config["target"] = "ldm.models.diffusion.ddpm.ImageEmbeddingConditionedLatentDiffusion"+ model_config["target"] = "comfy.ldm.models.diffusion.ddpm.ImageEmbeddingConditionedLatentDiffusion"elif unet_config["in_channels"] > 4: #inpainting modelsd_config["conditioning_key"] = "hybrid"sd_config["finetune_keys"] = None- model_config["target"] = "ldm.models.diffusion.ddpm.LatentInpaintDiffusion"+ model_config["target"] = "comfy.ldm.models.diffusion.ddpm.LatentInpaintDiffusion"else:sd_config["conditioning_key"] = "crossattn"