Fix some imports

Author: patrickvonplaten

setup.py

@@ -83,7 +83,6 @@
     "filelock",
     "importlib_metadata",
     "opencv-python",
-    "matplotlib",
     "scipy",
     "huggingface_hub",
     "einops",

src/controlnet_aux/dwpose/__init__.py

@@ -14,7 +14,6 @@
 
 from ..util import HWC3, resize_image
 from . import util
-from .wholebody import Wholebody
 
 
 def draw_pose(pose, H, W):
@@ -33,6 +32,7 @@ def draw_pose(pose, H, W):
 
 class DWposeDetector:
     def __init__(self, det_config=None, det_ckpt=None, pose_config=None, pose_ckpt=None, device="cpu"):
+        from .wholebody import Wholebody
 
         self.pose_estimation = Wholebody(det_config, det_ckpt, pose_config, pose_ckpt, device)
 

src/controlnet_aux/dwpose/util.py

@@ -1,6 +1,5 @@
 import math
 import numpy as np
-import matplotlib
 import cv2
 
 
@@ -110,6 +109,7 @@ def draw_bodypose(canvas, candidate, subset):
 
 
 def draw_handpose(canvas, all_hand_peaks):
+    import matplotlib
 
     H, W, C = canvas.shape
 

src/controlnet_aux/dwpose/wholebody.py

@@ -1,11 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import os
 import numpy as np
-from . import util
-import cv2
-import mmcv
-import torch
-import matplotlib.pyplot as plt
 import warnings
 
 try:
@@ -123,4 +118,4 @@ def __call__(self, oriImg):
         keypoints, scores, visible = keypoints_info[
             ..., :2], keypoints_info[..., 2], keypoints_info[..., 3]
 
-        return keypoints, scores
+        return keypoints, scores

src/controlnet_aux/open_pose/body.py

@@ -2,7 +2,6 @@
 from typing import List, NamedTuple, Union
 
 import cv2
-import matplotlib.pyplot as plt
 import numpy as np
 import torch
 from scipy.ndimage.filters import gaussian_filter
@@ -259,19 +258,3 @@ def format_body_result(candidate: np.ndarray, subset: np.ndarray) -> List[BodyRe
             )
             for person in subset
         ]
-    
-
-if __name__ == "__main__":
-    body_estimation = Body('../model/body_pose_model.pth')
-
-    test_image = '../images/ski.jpg'
-    oriImg = cv2.imread(test_image)  # B,G,R order
-    candidate, subset = body_estimation(oriImg)
-    bodies = body_estimation.format_body_result(candidate, subset)
-
-    canvas = oriImg
-    for body in bodies:
-        canvas = util.draw_bodypose(canvas, body)
-        
-    plt.imshow(canvas[:, :, [2, 1, 0]])
-    plt.show()

src/controlnet_aux/open_pose/util.py

@@ -1,6 +1,5 @@
 import math
 import numpy as np
-import matplotlib
 import cv2
 from typing import List, Tuple, Union
 
@@ -125,6 +124,7 @@ def draw_bodypose(canvas: np.ndarray, keypoints: List[Keypoint]) -> np.ndarray:
 
 
 def draw_handpose(canvas: np.ndarray, keypoints: Union[List[Keypoint], None]) -> np.ndarray:
+    import matplotlib
     """
     Draw keypoints and connections representing hand pose on a given canvas.
 
@@ -380,4 +380,4 @@ def npmax(array):
     arrayvalue = array.max(1)
     i = arrayvalue.argmax()
     j = arrayindex[i]
-    return i, j
+    return i, j