primerz commited on
Commit
f6d97e6
·
verified ·
1 Parent(s): b887817

Update model.py

Browse files
Files changed (1) hide show
  1. model.py +7 -7
model.py CHANGED
@@ -68,7 +68,7 @@ class ModelHandler:
68
 
69
  # 2. Load ControlNets
70
  # --- MODIFIED: Updated print ---
71
- print("Loading ControlNets (InstantID, Zoe, LineArt, Tile)...")
72
 
73
  # Load the InstantID ControlNet from the correct subfolder
74
  print("Loading InstantID ControlNet from subfolder 'ControlNetModel'...")
@@ -80,17 +80,17 @@ class ModelHandler:
80
  print(" [OK] Loaded InstantID ControlNet.")
81
 
82
  # Load other ControlNets normally
83
- # --- MODIFIED: Load Tile CN ---
84
- print("Loading Zoe, LineArt, and Tile ControlNets...")
85
  cn_zoe = ControlNetModel.from_pretrained(Config.CN_ZOE_REPO, torch_dtype=Config.DTYPE)
86
  cn_lineart = ControlNetModel.from_pretrained(Config.CN_LINEART_REPO, torch_dtype=Config.DTYPE)
87
- cn_tile = ControlNetModel.from_pretrained(Config.CN_TILE_REPO, torch_dtype=Config.DTYPE)
88
  # --- END MODIFIED ---
89
 
90
  # --- Manually wrap the list of models in a MultiControlNetModel ---
91
  print("Wrapping ControlNets in MultiControlNetModel...")
92
- # --- MODIFIED: Add Tile CN to list ---
93
- controlnet_list = [cn_instantid, cn_zoe, cn_lineart, cn_tile]
94
  controlnet = MultiControlNetModel(controlnet_list)
95
  # --- End wrapping ---
96
 
@@ -154,7 +154,7 @@ class ModelHandler:
154
  print(" [OK] LoRA fused.")
155
 
156
  # 6. Load Preprocessors
157
- # --- MODIFIED: Removed ColorDetector ---
158
  print("Loading Preprocessors (LeReS, LineArtAnime)...")
159
  self.leres_detector = LeresDetector.from_pretrained(Config.ANNOTATOR_REPO)
160
  self.lineart_anime_detector = LineartAnimeDetector.from_pretrained(Config.ANNOTATOR_REPO)
 
68
 
69
  # 2. Load ControlNets
70
  # --- MODIFIED: Updated print ---
71
+ print("Loading ControlNets (InstantID, Zoe, LineArt)...")
72
 
73
  # Load the InstantID ControlNet from the correct subfolder
74
  print("Loading InstantID ControlNet from subfolder 'ControlNetModel'...")
 
80
  print(" [OK] Loaded InstantID ControlNet.")
81
 
82
  # Load other ControlNets normally
83
+ # --- MODIFIED: Removed Tile CN ---
84
+ print("Loading Zoe and LineArt ControlNets...")
85
  cn_zoe = ControlNetModel.from_pretrained(Config.CN_ZOE_REPO, torch_dtype=Config.DTYPE)
86
  cn_lineart = ControlNetModel.from_pretrained(Config.CN_LINEART_REPO, torch_dtype=Config.DTYPE)
87
+ # cn_tile = ControlNetModel.from_pretrained(Config.CN_TILE_REPO, torch_dtype=Config.DTYPE) # <-- REMOVED
88
  # --- END MODIFIED ---
89
 
90
  # --- Manually wrap the list of models in a MultiControlNetModel ---
91
  print("Wrapping ControlNets in MultiControlNetModel...")
92
+ # --- MODIFIED: Removed Tile CN from list ---
93
+ controlnet_list = [cn_instantid, cn_zoe, cn_lineart]
94
  controlnet = MultiControlNetModel(controlnet_list)
95
  # --- End wrapping ---
96
 
 
154
  print(" [OK] LoRA fused.")
155
 
156
  # 6. Load Preprocessors
157
+ # --- MODIFIED: Removed Tile ---
158
  print("Loading Preprocessors (LeReS, LineArtAnime)...")
159
  self.leres_detector = LeresDetector.from_pretrained(Config.ANNOTATOR_REPO)
160
  self.lineart_anime_detector = LineartAnimeDetector.from_pretrained(Config.ANNOTATOR_REPO)