Fix issue caused by IDE automated patching of some paths #635

py/libs/controlnet.py

@@ -14,9 +14,9 @@ class easyControlnet:
             return (positive, negative)
 
         # kolors controlnet patch
-        from py.modules.kolors import is_kolors_model, applyKolorsUnet
+        from ..modules.kolors.loader import is_kolors_model, applyKolorsUnet
         if is_kolors_model(model):
-            from py.modules.kolors import patch_controlnet
+            from ..modules.kolors.model_patch import patch_controlnet
             if control_net is None:
                 with applyKolorsUnet():
                     control_net = easyCache.load_controlnet(control_net_name, scale_soft_weights, use_cache)

py/modules/brushnet/model.py

@@ -25,7 +25,7 @@ try:
     from diffusers.models.transformers.dual_transformer_2d import DualTransformer2DModel
     from diffusers.models.transformers.transformer_2d import Transformer2DModel
 
-    from py.modules.brushnet.unet_2d_blocks import (
+    from .unet_2d_blocks import (
         CrossAttnDownBlock2D,
         DownBlock2D,
         get_down_block,
@@ -33,7 +33,7 @@ try:
         get_up_block,
     )
 
-    from py.modules.brushnet.unet_2d_condition import UNet2DConditionModel
+    from .unet_2d_condition import UNet2DConditionModel
 
     logger = logging.get_logger(__name__)
 

py/modules/brushnet/unet_2d_condition.py

@@ -43,7 +43,7 @@ from diffusers.models.embeddings import (
     Timesteps,
 )
 from diffusers.models.modeling_utils import ModelMixin
-from py.modules.brushnet.unet_2d_blocks import (
+from .unet_2d_blocks import (
     get_down_block,
     get_mid_block,
     get_up_block,

py/modules/dit/pixArt/loader.py

@@ -1,3 +1,6 @@
+import os
+import json
+import copy
 import torch
 import math
 import comfy.supported_models_base
@@ -7,7 +10,7 @@ import comfy.model_base
 import comfy.utils
 import comfy.conds
 from comfy import model_management
-from .diffusers_convert import convert_state_dict
+from .diffusers_convert import convert_state_dict, convert_lora_state_dict
 
 # checkpointbf
 class EXM_PixArt(comfy.supported_models_base.BASE):
@@ -85,23 +88,23 @@ def load_pixart(model_path, model_conf=None):
     )
 
     if model_conf.model_target == "PixArtMS":
-        from py.modules.dit.pixArt.models.PixArtMS import PixArtMS
+        from .models.PixArtMS import PixArtMS
         model.diffusion_model = PixArtMS(**model_conf.unet_config)
     elif model_conf.model_target == "PixArt":
-        from py.modules.dit.pixArt.models.PixArt import PixArt
+        from .models.PixArt import PixArt
         model.diffusion_model = PixArt(**model_conf.unet_config)
     elif model_conf.model_target == "PixArtMSSigma":
-        from py.modules.dit.pixArt.models.PixArtMS import PixArtMS
+        from .models.PixArtMS import PixArtMS
         model.diffusion_model = PixArtMS(**model_conf.unet_config)
         model.latent_format = comfy.latent_formats.SDXL()
     elif model_conf.model_target == "ControlPixArtMSHalf":
-        from py.modules.dit.pixArt.models.PixArtMS import PixArtMS
-        from py.modules.dit.pixArt.models.pixart_controlnet import ControlPixArtMSHalf
+        from .models.PixArtMS import PixArtMS
+        from .models.pixart_controlnet import ControlPixArtMSHalf
         model.diffusion_model = PixArtMS(**model_conf.unet_config)
         model.diffusion_model = ControlPixArtMSHalf(model.diffusion_model)
     elif model_conf.model_target == "ControlPixArtHalf":
-        from py.modules.dit.pixArt.models.PixArt import PixArt
-        from py.modules.dit.pixArt.models.pixart_controlnet import ControlPixArtHalf
+        from .models.PixArt import PixArt
+        from .models.pixart_controlnet import ControlPixArtHalf
         model.diffusion_model = PixArt(**model_conf.unet_config)
         model.diffusion_model = ControlPixArtHalf(model.diffusion_model)
     else:

py/modules/dit/pixArt/models/PixArt.py

@@ -17,8 +17,8 @@ from timm.models.layers import DropPath
 from timm.models.vision_transformer import PatchEmbed, Mlp
 
 
-from py.modules.dit.pixArt.models.utils import auto_grad_checkpoint, to_2tuple
-from py.modules.dit.pixArt.models.PixArt_blocks import t2i_modulate, CaptionEmbedder, AttentionKVCompress, MultiHeadCrossAttention, T2IFinalLayer, TimestepEmbedder, LabelEmbedder, FinalLayer
+from .utils import auto_grad_checkpoint, to_2tuple
+from .PixArt_blocks import t2i_modulate, CaptionEmbedder, AttentionKVCompress, MultiHeadCrossAttention, T2IFinalLayer, TimestepEmbedder, LabelEmbedder, FinalLayer
 
 
 class PixArtBlock(nn.Module):

py/modules/dit/pixArt/models/PixArtMS.py

@@ -14,9 +14,9 @@ from tqdm import tqdm
 from timm.models.layers import DropPath
 from timm.models.vision_transformer import Mlp
 
-from py.modules.dit.pixArt.models.utils import auto_grad_checkpoint, to_2tuple
-from py.modules.dit.pixArt.models.PixArt_blocks import t2i_modulate, CaptionEmbedder, AttentionKVCompress, MultiHeadCrossAttention, T2IFinalLayer, TimestepEmbedder, SizeEmbedder
-from py.modules.dit.pixArt.models.PixArt import PixArt, get_2d_sincos_pos_embed
+from .utils import auto_grad_checkpoint, to_2tuple
+from .PixArt_blocks import t2i_modulate, CaptionEmbedder, AttentionKVCompress, MultiHeadCrossAttention, T2IFinalLayer, TimestepEmbedder, SizeEmbedder
+from .PixArt import PixArt, get_2d_sincos_pos_embed
 
 
 class PatchEmbed(nn.Module):

py/modules/dit/pixArt/models/pixart_controlnet.py

@@ -7,9 +7,9 @@ from torch import Tensor
 from torch.nn import Module, Linear, init
 from typing import Any, Mapping
 
-from py.modules.dit.pixArt.models.PixArt import PixArt, get_2d_sincos_pos_embed
-from py.modules.dit.pixArt.models.PixArtMS import PixArtMSBlock, PixArtMS
-from py.modules.dit.pixArt.models.utils import auto_grad_checkpoint
+from .PixArt import PixArt, get_2d_sincos_pos_embed
+from .PixArtMS import PixArtMSBlock, PixArtMS
+from .utils import auto_grad_checkpoint
 
 # The implementation of ControlNet-Half architrecture
 # https://github.com/lllyasviel/ControlNet/discussions/188