Fix faceid (#2727)

AUTOMATIC1111 · Apr 1, 2024 · eb451a0 · eb451a0
1 parent e421081
commit eb451a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal_controlnet/external_code.py b/internal_controlnet/external_code.py
@@ -230,7 +230,7 @@ def is_animate_diff_batch(self) -> bool:
     def uses_clip(self) -> bool:
         """Whether this unit uses clip preprocessor."""
         return any((
-            ("ip-adapter" in self.module and "faceid" not in self.module),
+            ("ip-adapter" in self.module and "face_id" not in self.module),
             self.module in ("clip_vision", "revision_clipvision", "revision_ignore_prompt"),
         ))
 

diff --git a/scripts/processor.py b/scripts/processor.py
@@ -765,7 +765,7 @@ def load_model(self):
 
     def run_model(self, img: np.ndarray, **kwargs) -> Tuple[torch.Tensor, bool]:
         self.load_model()
-        img = HWC3(img)
+        assert img.shape[2] == 3, f"Expect RGB channels, but get {img.shape}"
         faces = self.model.get(img)
         if not faces:
             raise Exception("Insightface: No face found in image.")