merge Origin branch

convertPth2Onnx.py

@@ -0,0 +1,4 @@
+import torch
+import torchvision.models as  models
+
+model = models.resnet18(pretrained=False)

rtmlib/__init__.py

@@ -1,8 +1,7 @@
 from .tools import (RTMO, YOLOX, Body, Hand, PoseTracker, RTMDet, RTMPose,
                     Wholebody, BodyWithFeet)
-from .visualization.draw import draw_bbox, draw_skeleton
+from .visualization.draw import draw_bbox, draw_skeleton, draw_skeleton_fixColor
 
 __all__ = [
-    'RTMDet', 'RTMPose', 'YOLOX', 'Wholebody', 'Body', 'draw_skeleton',
-    'draw_bbox', 'PoseTracker', 'Hand', 'RTMO', 'BodyWithFeet'
-]
+    'RTMDet', 'RTMPose', 'YOLOX', 'Wholebody', 'Body', 'draw_skeleton', 'draw_skeleton_fixColor',
+    'draw_bbox', 'PoseTracker', 'Hand', 'RTMO', 'BodyWithFeet']

rtmlib/tools/pose_estimation/rtmo.py

@@ -38,7 +38,7 @@ def preprocess(self, img: np.ndarray):
         Args:
             img (np.ndarray): Input image in shape.
 
-        Returns:
+        Returns:1
             tuple:
             - resized_img (np.ndarray): Preprocessed image.
             - center (np.ndarray): Center of image.

rtmlib/tools/solution/body.py

@@ -105,6 +105,7 @@ def __init__(self,
             self.one_stage = True
 
             pose = self.RTMO_MODE[mode]['pose']
+            print("pose: ", pose)
             pose_input_size = self.RTMO_MODE[mode]['pose_input_size']
             self.pose_model = RTMO(pose,
                                    model_input_size=pose_input_size,
@@ -116,13 +117,18 @@ def __init__(self,
 
             self.one_stage = False
 
+            print("before pose: ", pose)
             if pose is None:
                 pose = self.MODE[mode]['pose']
                 pose_input_size = self.MODE[mode]['pose_input_size']
+            pose = "C:/Users/max/.cache/rtmlib/hub/checkpoints/rtmpose-m_simcc-body7_pt-body7_420e-256x192-e48f03d0_20230504.onnx"
+            print("after pose: ", pose)
 
+            print("before det: ", det)
             if det is None:
                 det = self.MODE[mode]['det']
                 det_input_size = self.MODE[mode]['det_input_size']
+            print("after det: ", det)
 
             self.det_model = YOLOX(det,
                                    model_input_size=det_input_size,

rtmlib/visualization/__init__.py

@@ -1,7 +1,6 @@
-from .draw import draw_bbox, draw_skeleton
-from .skeleton import coco17, coco133, hand21, openpose18, openpose134, halpe26
+from .draw import draw_bbox, draw_skeleton, draw_skeleton_fixColor
+from .skeleton import coco17, coco133, hand21, openpose18, openpose134
 
 __all__ = [
-    'draw_skeleton', 'draw_bbox', 'coco17', 'coco133', 'hand21', 'openpose18',
-    'openpose134', 'halpe26'
-]
+    'draw_skeleton', 'draw_skeleton_fixColor', 'draw_bbox', 'coco17', 'coco133', 'hand21', 'openpose18',
+    'openpose134', 'halpe26']