sports2d 0.8.7__py3-none-any.whl → 0.8.9__py3-none-any.whl

Sports2D/Demo/Config_demo.toml

@@ -152,7 +152,7 @@ filter_type = 'butterworth'   # butterworth, gaussian, LOESS, median
 do_ik = false # Do scaling and inverse kinematics?
 use_augmentation = false  # true or false (lowercase) # Set to true if you want to use the model with augmented markers
 feet_on_floor = false # true or false (lowercase) # Set to false if you want to use the model with feet not on the floor (e.g. running, jumping, etc.)
-use_contacts_muscles = true # true or false (lowercase) # If true, contact spheres and muscles are added to the model
+use_simple_model = false # true or false # >10 times faster IK if true. No muscles, no constraints (eg stiff spine and shoulders, no patella)
 participant_mass = [55.0, 67.0] # kg # defaults to 70 if not provided. No influence on kinematics (motion), only on kinetics (forces)
 right_left_symmetry = true # true or false (lowercase) # Set to false only if you have good reasons to think the participant is not symmetrical (e.g. prosthetic limb)
 

Sports2D/Sports2D.py

@@ -151,7 +151,44 @@ DEFAULT_CONFIG =   {'base': {'video_input': ['demo.mp4'],
                                 'deepsort_params': """{'max_age':30, 'n_init':3, 'nms_max_overlap':0.8, 'max_cosine_distance':0.3, 'nn_budget':200, 'max_iou_distance':0.8, 'embedder_gpu': True, 'embedder':'torchreid'}""",
                                 'keypoint_likelihood_threshold': 0.3,
                                 'average_likelihood_threshold': 0.5,
-                                'keypoint_number_threshold': 0.3
+                                'keypoint_number_threshold': 0.3,
+                                'CUSTOM': { 'name': 'Hip',
+                                            'id': 19,
+                                            'children': [{'name': 'RHip',
+                                                'id': 12,
+                                                'children': [{'name': 'RKnee',
+                                                'id': 14,
+                                                'children': [{'name': 'RAnkle',
+                                                    'id': 16,
+                                                    'children': [{'name': 'RBigToe',
+                                                    'id': 21,
+                                                    'children': [{'name': 'RSmallToe', 'id': 23}]},
+                                                    {'name': 'RHeel', 'id': 25}]}]}]},
+                                                {'name': 'LHip',
+                                                'id': 11,
+                                                'children': [{'name': 'LKnee',
+                                                'id': 13,
+                                                'children': [{'name': 'LAnkle',
+                                                    'id': 15,
+                                                    'children': [{'name': 'LBigToe',
+                                                    'id': 20,
+                                                    'children': [{'name': 'LSmallToe', 'id': 22}]},
+                                                    {'name': 'LHeel', 'id': 24}]}]}]},
+                                                {'name': 'Neck',
+                                                'id': 18,
+                                                'children': [{'name': 'Head',
+                                                'id': 17,
+                                                'children': [{'name': 'Nose', 'id': 0}]},
+                                                {'name': 'RShoulder',
+                                                'id': 6,
+                                                'children': [{'name': 'RElbow',
+                                                    'id': 8,
+                                                    'children': [{'name': 'RWrist', 'id': 10}]}]},
+                                                {'name': 'LShoulder',
+                                                'id': 5,
+                                                'children': [{'name': 'LElbow',
+                                                    'id': 7,
+                                                    'children': [{'name': 'LWrist', 'id': 9}]}]}]}]}
                                 },
                     'px_to_meters_conversion': {
                                 'to_meters': True,
@@ -206,7 +243,7 @@ DEFAULT_CONFIG =   {'base': {'video_input': ['demo.mp4'],
                     'kinematics':{'do_ik': False,
                                           'use_augmentation': False,
                                           'feet_on_floor': False,
-                                          'use_contacts_muscles': True,
+                                          'use_simple_model ': True,
                                           'participant_mass': [55.0, 67.0], 
                                           'right_left_symmetry': True,
                                           'default_height': 1.70,
@@ -260,7 +297,7 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'do_ik': ["", "do inverse kinematics. false if not specified"],
                 'use_augmentation': ["", "Use LSTM marker augmentation. false if not specified"],
                 'feet_on_floor': ["", "offset marker augmentation results so that feet are at floor level. true if not specified"],
-                'use_contacts_muscles': ["", "Use model with contact spheres and muscles. false if not specified"],
+                'use_simple_model ': ["", ">10 times faster IK if true. No muscles, no constraints (eg stiff spine and shoulders, no patella). false if not specified"],
                 'participant_mass': ["", "mass of the participant in kg or none. Defaults to 70 if not provided. No influence on kinematics (motion), only on kinetics (forces)"],
                 'close_to_zero_speed_m': ["","Sum for all keypoints: about 50 px/frame or 0.2 m/frame"], 
                 'tracking_mode': ["", "'sports2d' or 'deepsort'. 'deepsort' is slower, harder to parametrize but can be more robust if correctly tuned"],

Sports2D/process.py

@@ -59,14 +59,13 @@ import ast
 import copy
 import shutil
 import os
+import re
 from importlib.metadata import version
-from functools import partial
 from datetime import datetime
 import itertools as it
 from tqdm import tqdm
 from collections import defaultdict
 from anytree import RenderTree
-from anytree.importer import DictImporter
 
 import numpy as np
 import pandas as pd
@@ -76,7 +75,7 @@ import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider, Button
 from matplotlib import patheffects
 
-from rtmlib import PoseTracker, BodyWithFeet, Wholebody, Body, Custom
+from rtmlib import PoseTracker, BodyWithFeet, Wholebody, Body, Hand, Custom
 from deep_sort_realtime.deepsort_tracker import DeepSort
 
 from Sports2D.Utilities import filter
@@ -193,6 +192,79 @@ def setup_video(video_file_path, save_vid, vid_output_path):
     return cap, out_vid, cam_width, cam_height, fps
 
 
+def setup_model_class_mode(pose_model, mode, config_dict={}):
+    '''
+    
+    '''
+
+    if pose_model.upper() in ('HALPE_26', 'BODY_WITH_FEET'):
+        model_name = 'HALPE_26'
+        ModelClass = BodyWithFeet # 26 keypoints(halpe26)
+        logging.info(f"Using HALPE_26 model (body and feet) for pose estimation in {mode} mode.")
+    elif pose_model.upper() in ('COCO_133', 'WHOLE_BODY', 'WHOLE_BODY_WRIST'):
+        model_name = 'COCO_133'
+        ModelClass = Wholebody
+        logging.info(f"Using COCO_133 model (body, feet, hands, and face) for pose estimation in {mode} mode.")
+    elif pose_model.upper() in ('COCO_17', 'BODY'):
+        model_name = 'COCO_17'
+        ModelClass = Body
+        logging.info(f"Using COCO_17 model (body) for pose estimation in {mode} mode.")
+    elif pose_model.upper() =='HAND':
+        model_name = 'HAND_21'
+        ModelClass = Hand
+        logging.info(f"Using HAND_21 model for pose estimation in {mode} mode.")
+    elif pose_model.upper() =='FACE':
+        model_name = 'FACE_106'
+        logging.info(f"Using FACE_106 model for pose estimation in {mode} mode.")
+    elif pose_model.upper() =='ANIMAL':
+        model_name = 'ANIMAL2D_17'
+        logging.info(f"Using ANIMAL2D_17 model for pose estimation in {mode} mode.")
+    else:
+        model_name = pose_model.upper()
+        logging.info(f"Using model {model_name} for pose estimation in {mode} mode.")
+    try:
+        pose_model = eval(model_name)
+    except:
+        try: # from Config.toml
+            from anytree.importer import DictImporter
+            model_name = pose_model.upper()
+            pose_model = DictImporter().import_(config_dict.get('pose').get(pose_model))
+            if pose_model.id == 'None':
+                pose_model.id = None
+            logging.info(f"Using model {model_name} for pose estimation.")
+        except:
+            raise NameError(f'{pose_model} not found in skeletons.py nor in Config.toml')
+
+    # Manually select the models if mode is a dictionary rather than 'lightweight', 'balanced', or 'performance'
+    if not mode in ['lightweight', 'balanced', 'performance'] or 'ModelClass' not in locals():
+        try:
+            from functools import partial
+            try:
+                mode = ast.literal_eval(mode)
+            except: # if within single quotes instead of double quotes when run with sports2d --mode """{dictionary}"""
+                mode = mode.strip("'").replace('\n', '').replace(" ", "").replace(",", '", "').replace(":", '":"').replace("{", '{"').replace("}", '"}').replace('":"/',':/').replace('":"\\',':\\')
+                mode = re.sub(r'"\[([^"]+)",\s?"([^"]+)\]"', r'[\1,\2]', mode) # changes "[640", "640]" to [640,640]
+                mode = json.loads(mode)
+            det_class = mode.get('det_class')
+            det = mode.get('det_model')
+            det_input_size = mode.get('det_input_size')
+            pose_class = mode.get('pose_class')
+            pose = mode.get('pose_model')
+            pose_input_size = mode.get('pose_input_size')
+
+            ModelClass = partial(Custom,
+                        det_class=det_class, det=det, det_input_size=det_input_size,
+                        pose_class=pose_class, pose=pose, pose_input_size=pose_input_size)
+            logging.info(f"Using model {model_name} with the following custom parameters: {mode}.")
+            
+        except (json.JSONDecodeError, TypeError):
+            logging.warning("Invalid mode. Must be 'lightweight', 'balanced', 'performance', or '''{dictionary}''' of parameters within triple quotes. Make sure input_sizes are within square brackets.")
+            logging.warning('Using the default "balanced" mode.')
+            mode = 'balanced'
+
+    return pose_model, ModelClass, mode
+
+
 def setup_backend_device(backend='auto', device='auto'):
     '''
     Set up the backend and device for the pose tracker based on the availability of hardware acceleration.
@@ -1427,74 +1499,15 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         cv2.namedWindow(f'{video_file} Sports2D', cv2.WINDOW_NORMAL + cv2.WINDOW_KEEPRATIO)
         cv2.setWindowProperty(f'{video_file} Sports2D', cv2.WND_PROP_ASPECT_RATIO, cv2.WINDOW_FULLSCREEN)
 
+
     # Select the appropriate model based on the model_type
     logging.info('\nEstimating pose...')
-    if pose_model.upper() in ('HALPE_26', 'BODY_WITH_FEET'):
-        model_name = 'HALPE_26'
-        ModelClass = BodyWithFeet # 26 keypoints(halpe26)
-        logging.info(f"Using HALPE_26 model (body and feet) for pose estimation.")
-    elif pose_model.upper() in ('COCO_133', 'WHOLE_BODY', 'WHOLE_BODY_WRIST'):
-        model_name = 'COCO_133'
-        ModelClass = Wholebody
-        logging.info(f"Using COCO_133 model (body, feet, hands, and face) for pose estimation.")
-    elif pose_model.upper() in ('COCO_17', 'BODY'):
-        model_name = 'COCO_17'
-        ModelClass = Body
-        logging.info(f"Using COCO_17 model (body) for pose estimation.")
-    elif pose_model.upper() =='HAND':
-        model_name = 'HAND_21'
-        ModelClass = Hand
-        logging.info(f"Using HAND_21 model for pose estimation.")
-    elif pose_model.upper() =='FACE':
-        model_name = 'FACE_106'
-        logging.info(f"Using FACE_106 model for pose estimation.")
-    elif pose_model.upper() =='ANIMAL':
-        model_name = 'ANIMAL2D_17'
-        logging.info(f"Using ANIMAL2D_17 model for pose estimation.")
-    else:
-        model_name = pose_model.upper()
-        logging.info(f"Using model {model_name} for pose estimation.")
     pose_model_name = pose_model
-    try:
-        pose_model = eval(model_name)
-    except:
-        try: # from Config.toml
-            pose_model = DictImporter().import_(config_dict.get('pose').get(pose_model))
-            if pose_model.id == 'None':
-                pose_model.id = None
-        except:
-            raise NameError(f'{pose_model} not found in skeletons.py nor in Config.toml')
-
+    pose_model, ModelClass, mode = setup_model_class_mode(pose_model, mode, config_dict)
+    
     # Select device and backend
     backend, device = setup_backend_device(backend=backend, device=device)
 
-    # Manually select the models if mode is a dictionary rather than 'lightweight', 'balanced', or 'performance'
-    if not mode in ['lightweight', 'balanced', 'performance']:
-        try:
-            try:
-                mode = ast.literal_eval(mode)
-            except: # if within single quotes instead of double quotes when run with sports2d --mode """{dictionary}"""
-                mode = mode.strip("'").replace('\n', '').replace(" ", "").replace(",", '", "').replace(":", '":"').replace("{", '{"').replace("}", '"}').replace('":"/',':/').replace('":"\\',':\\')
-                mode = re.sub(r'"\[([^"]+)",\s?"([^"]+)\]"', r'[\1,\2]', mode) # changes "[640", "640]" to [640,640]
-                mode = json.loads(mode)
-            det_class = mode.get('det_class')
-            det = mode.get('det_model')
-            det_input_size = mode.get('det_input_size')
-            pose_class = mode.get('pose_class')
-            pose = mode.get('pose_model')
-            pose_input_size = mode.get('pose_input_size')
-
-            ModelClass = partial(Custom,
-                        det_class=det_class, det=det, det_input_size=det_input_size,
-                        pose_class=pose_class, pose=pose, pose_input_size=pose_input_size,
-                        backend=backend, device=device)
-            
-        except (json.JSONDecodeError, TypeError):
-            logging.warning("Invalid mode. Must be 'lightweight', 'balanced', 'performance', or '''{dictionary}''' of parameters within triple quotes. Make sure input_sizes are within square brackets.")
-            logging.warning('Using the default "balanced" mode.')
-            mode = 'balanced'
-    
-
     # Skip pose estimation or set it up:
     if load_trc_px:
         if not '_px' in str(load_trc_px): 
@@ -1524,9 +1537,14 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         # Set up pose tracker
         try:
             pose_tracker = setup_pose_tracker(ModelClass, det_frequency, mode, False, backend, device)
-        except:
-            logging.error('Error: Pose estimation failed. Check in Config.toml that pose_model and mode are valid.')
-            raise ValueError('Error: Pose estimation failed. Check in Config.toml that pose_model and mode are valid.')
+        except: # for multi-threading
+            try:
+                import time
+                time.sleep(3)
+                pose_tracker = setup_pose_tracker(ModelClass, det_frequency, mode, False, backend, device)
+            except:
+                logging.error('Error: Pose estimation failed. Check in Config.toml that pose_model and mode are valid.')
+                raise ValueError('Error: Pose estimation failed. Check in Config.toml that pose_model and mode are valid.')
         
         if tracking_mode not in ['deepsort', 'sports2d']:
             logging.warning(f"Tracking mode {tracking_mode} not recognized. Using sports2d method.")

{sports2d-0.8.7.dist-info → sports2d-0.8.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sports2d
-Version: 0.8.7
+Version: 0.8.9
 Summary: Compute 2D human pose and angles from a video or a webcam.
 Author-email: David Pagnon <contact@david-pagnon.com>
 Maintainer-email: David Pagnon <contact@david-pagnon.com>
@@ -163,7 +163,8 @@ pip install .
 
 #### Full install
 
-> Only needed if you want to run inverse kinematics (`--do_ik True`).
+> **N.B.:** Only needed if you want to run inverse kinematics (`--do_ik True`).\
+> **N.B.:** If you already have a Pose2Sim conda environment, you can skip this step. Just run `conda activate Pose2Sim` and `pip install sports2d`.
 
 - Install Anaconda or [Miniconda](https://docs.conda.io/en/latest/miniconda.html):\
   Open an Anaconda prompt and create a virtual environment:
@@ -424,7 +425,7 @@ sports2d --video_input demo.mp4 other_video.mp4 --time_range 1.2 2.7 0 3.5
 #### Use a custom pose estimation model:
 - Retrieve hand motion:
   ``` cmd
-  sports2d --pose_model WholeBody 
+  sports2d --pose_model whole_body 
   ```
 - Use any custom (deployed) MMPose model
   ``` cmd
@@ -488,7 +489,7 @@ sports2d --help
 'do_ik': ["", "do inverse kinematics. false if not specified"],
 'use_augmentation': ["", "Use LSTM marker augmentation. false if not specified"],
 'feet_on_floor': ["", "offset marker augmentation results so that feet are at floor level. true if not specified"],
-'use_contacts_muscles': ["", "Use model with contact spheres and muscles. false if not specified"],
+'use_simple_model': ["", "IK 10+ times faster, but no muscles or flexible spine. false if not specified"],
 'participant_mass': ["", "mass of the participant in kg or none. Defaults to 70 if not provided. No influence on kinematics (motion), only on kinetics (forces)"],
 'close_to_zero_speed_m': ["","Sum for all keypoints: about 50 px/frame or 0.2 m/frame"], 
 'tracking_mode': ["", "'sports2d' or 'deepsort'. 'deepsort' is slower, harder to parametrize but can be more robust if correctly tuned"],
@@ -569,6 +570,7 @@ Will be much faster, with no impact on accuracy. However, the installation takes
 
 2. Finally, install ONNX Runtime with GPU support:
    ```
+   pip uninstall onnxruntime
    pip install onnxruntime-gpu
    ```
 

{sports2d-0.8.7.dist-info → sports2d-0.8.9.dist-info}/RECORD

@@ -9,18 +9,18 @@ Content/paper.md,sha256=8rWSOLrKTysloZv0Fz2lr3nayxtHi7GlFMqwdgDVggY,11333
 Content/sports2d_blender.gif,sha256=wgMuPRxhja3XtQn76_okGXsNnUT9Thp0pnD36GdW5_E,448786
 Content/sports2d_opensim.gif,sha256=XP1AcjqhbGcJknXUoNJjPWAwaM9ahZafbDgLWvzKJs4,376656
 Sports2D/Sports2D.ipynb,sha256=VnOVjIl6ndnCJTT13L4W5qTw4T-TQDF3jt3-wxnXDqM,2427047
-Sports2D/Sports2D.py,sha256=dalsLajzjMxhf8A26OSLHGD8az_deheW9u9CsDVb7fk,30792
+Sports2D/Sports2D.py,sha256=U8j27Bow127GavFjQdHzRVAHONPfs17gAHvZ-7x3ZZo,33522
 Sports2D/__init__.py,sha256=BuUkPEdItxlkeqz4dmoiPwZLkgAfABJK3KWQ1ujTGwE,153
-Sports2D/process.py,sha256=qmeIhQIEmdpsBEWdjsJJzC_lc6DF11iM8yl0wzHHl_g,110565
-Sports2D/Demo/Config_demo.toml,sha256=S6QTErGIdUvCB3HoBFqlZKtQmbUU-c2cQYJJSW3HXUk,14003
+Sports2D/process.py,sha256=UovoTjXSxlrTNnuog9MlQu_2HCAypovDVUKIUIZ8k_c,111353
+Sports2D/Demo/Config_demo.toml,sha256=jiPGr6JbePu1tItgRxdAu45mwFqr3RcIi_tfhO2ik1g,14027
 Sports2D/Demo/demo.mp4,sha256=2aZkFxhWR7ESMEtXCT8MGA83p2jmoU2sp1ylQfO3gDk,3968304
 Sports2D/Utilities/__init__.py,sha256=BuUkPEdItxlkeqz4dmoiPwZLkgAfABJK3KWQ1ujTGwE,153
 Sports2D/Utilities/common.py,sha256=idMRmesFv5BPX-5g3z5dOVa7SpS_8tNgijvGrOZlR-k,11185
 Sports2D/Utilities/filter.py,sha256=rfZcqofjllKI_5ovZTKEAmyjOZpB_PzbAJ0P874T8Ak,4973
 Sports2D/Utilities/tests.py,sha256=XnPNK63AZ_xlJBmFmPJtOMrzssBXIPXFzYd73CPzchI,4740
-sports2d-0.8.7.dist-info/licenses/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
-sports2d-0.8.7.dist-info/METADATA,sha256=VM20oIZDLU_zQLlnZpjFlNTIU31VLiHIoYv9rsGOyuc,38245
-sports2d-0.8.7.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-sports2d-0.8.7.dist-info/entry_points.txt,sha256=V8dFDIXatz9VvoGgoHzb2wE71C9-f85K6_OjnEQlxww,108
-sports2d-0.8.7.dist-info/top_level.txt,sha256=cWWBiDD2WbQXMoIoN6-9et9U2t2c_ZKo2JtBqO5uN-k,17
-sports2d-0.8.7.dist-info/RECORD,,
+sports2d-0.8.9.dist-info/licenses/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
+sports2d-0.8.9.dist-info/METADATA,sha256=S_gg8W3DhFHbiVh8EbnT7I_D3gM0t5UzQq9kwHzWK7U,38442
+sports2d-0.8.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sports2d-0.8.9.dist-info/entry_points.txt,sha256=V8dFDIXatz9VvoGgoHzb2wE71C9-f85K6_OjnEQlxww,108
+sports2d-0.8.9.dist-info/top_level.txt,sha256=cWWBiDD2WbQXMoIoN6-9et9U2t2c_ZKo2JtBqO5uN-k,17
+sports2d-0.8.9.dist-info/RECORD,,

{sports2d-0.8.7.dist-info → sports2d-0.8.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any