bug fix

diffsynth_engine/models/base.py

@@ -3,6 +3,7 @@
 import torch.nn as nn
 from typing import Dict, Union
 from diffsynth_engine.utils.loader import load_file
+from typing import List
 
 from diffsynth_engine.models.basic.lora import LoRALinear, LoRAConv2d
 from diffsynth_engine.models.utils import no_init_weights

diffsynth_engine/models/flux/flux_dit.py

@@ -21,16 +21,6 @@
     config = json.load(f)
 
 
-
-def default_patch_callback(hidden_states, controlnet_outputs, index, patch_point: FluxPatchPoint):
-    for controlnet_output in controlnet_outputs:
-        if len(controlnet_output) <= index:
-            continue
-        #  主模型第i层输出的hidden_states和每个controlnet第i层的输出结果相加
-        hidden_states = hidden_states + controlnet_output[index]
-    return hidden_states
-
-
 class FluxDiTStateDictConverter(StateDictConverter):
     def __init__(self):
         pass

diffsynth_engine/pipelines/base.py

@@ -2,8 +2,7 @@
 import torch
 import numpy as np
 from typing import Dict, List, Tuple
-from PIL import Image, ImageOps
-from einops import repeat
+from PIL import Image
 from dataclasses import dataclass
 from diffsynth_engine.utils.loader import load_file
 from diffsynth_engine.utils.offload import enable_sequential_cpu_offload

diffsynth_engine/pipelines/flux_image.py

@@ -3,8 +3,7 @@
 import torch
 import torch.nn as nn
 import math
-from typing import Callable, Dict, List, Tuple, Optional
-from diffsynth_engine.utils.loader import load_file
+from typing import Callable, Dict, List, Optional
 from tqdm import tqdm
 from PIL import Image
 from dataclasses import dataclass

diffsynth_engine/pipelines/sd_image.py

@@ -4,8 +4,7 @@
 import numpy as np
 from einops import repeat
 from dataclasses import dataclass
-from typing import Callable, Dict, Optional, List, Tuple
-from diffsynth_engine.utils.loader import load_file
+from typing import Callable, Dict, Optional
 from tqdm import tqdm
 from PIL import Image, ImageOps
 

diffsynth_engine/pipelines/sdxl_image.py

@@ -3,8 +3,7 @@
 import torch
 import numpy as np
 from einops import repeat
-from typing import Callable, Dict, List, Tuple, Optional
-from diffsynth_engine.utils.loader import load_file
+from typing import Callable, Dict, Optional
 from tqdm import tqdm
 from PIL import Image, ImageOps
 from dataclasses import dataclass