Refactor: Move sd2_clip.py to text_encoders folder.

kamilsulima · Jul 28, 2024 · 4ba7fa0 · 4ba7fa0
1 parent ab76abc
commit 4ba7fa0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/comfy/sd.py b/comfy/sd.py
@@ -17,8 +17,8 @@
 from . import model_detection
 
 from . import sd1_clip
-from . import sd2_clip
 from . import sdxl_clip
+import comfy.text_encoders.sd2_clip
 import comfy.text_encoders.sd3_clip
 import comfy.text_encoders.sa_t5
 import comfy.text_encoders.aura_t5
@@ -414,8 +414,8 @@ class EmptyClass:
                 clip_target.clip = sdxl_clip.SDXLRefinerClipModel
                 clip_target.tokenizer = sdxl_clip.SDXLTokenizer
         elif "text_model.encoder.layers.22.mlp.fc1.weight" in clip_data[0]:
-            clip_target.clip = sd2_clip.SD2ClipModel
-            clip_target.tokenizer = sd2_clip.SD2Tokenizer
+            clip_target.clip = comfy.text_encoders.sd2_clip.SD2ClipModel
+            clip_target.tokenizer = comfy.text_encoders.sd2_clip.SD2Tokenizer
         elif "encoder.block.23.layer.1.DenseReluDense.wi_1.weight" in clip_data[0]:
             weight = clip_data[0]["encoder.block.23.layer.1.DenseReluDense.wi_1.weight"]
             dtype_t5 = weight.dtype

diff --git a/comfy/supported_models.py b/comfy/supported_models.py
@@ -3,8 +3,8 @@
 from . import utils
 
 from . import sd1_clip
-from . import sd2_clip
 from . import sdxl_clip
+import comfy.text_encoders.sd2_clip
 import comfy.text_encoders.sd3_clip
 import comfy.text_encoders.sa_t5
 import comfy.text_encoders.aura_t5
@@ -101,7 +101,7 @@ def process_clip_state_dict_for_saving(self, state_dict):
         return state_dict
 
     def clip_target(self, state_dict={}):
-        return supported_models_base.ClipTarget(sd2_clip.SD2Tokenizer, sd2_clip.SD2ClipModel)
+        return supported_models_base.ClipTarget(comfy.text_encoders.sd2_clip.SD2Tokenizer, comfy.text_encoders.sd2_clip.SD2ClipModel)
 
 class SD21UnclipL(SD20):
     unet_config = {

diff --git a/comfy/sd2_clip.py → comfy/text_encoders/sd2_clip.py b/comfy/sd2_clip.py → comfy/text_encoders/sd2_clip.py
diff --git a/comfy/sd2_clip_config.json → comfy/text_encoders/sd2_clip_config.json b/comfy/sd2_clip_config.json → comfy/text_encoders/sd2_clip_config.json