custom rtmlib version until pull request is accepted

perfanalytics · Jan 21, 2025 · 0386bc7 · 0386bc7
1 parent 2b8a721
commit 0386bc7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/Pose2Sim/Demo_Batch/Config.toml b/Pose2Sim/Demo_Batch/Config.toml
@@ -56,6 +56,7 @@ pose_model = 'Body_with_feet'  #With RTMLib:
 mode = 'balanced' # 'lightweight', 'balanced', 'performance', 
                   # or """{dictionary}""" (see below)
 # A dictionary (WITHIN THREE DOUBLE QUOTES) allows you to manually select the person detection (if top_down approach) and/or pose estimation models (see https://github.com/Tau-J/rtmlib). 
+# Models can be local paths or URLs.
 # Make sure the input_sizes are within triple quotes, and that they are in the opposite order from the one in the model path (for example, it would be [192,256] for rtmpose-m_simcc-body7_pt-body7-halpe26_700e-256x192-4d3e73dd_20230605.zip). 
 # If your pose_model is not provided in skeletons.py, you may have to create your own one (see example at the end of the file).
 # Example, equivalent to mode='balanced':

diff --git a/Pose2Sim/Demo_Batch/Trial_1/Config.toml b/Pose2Sim/Demo_Batch/Trial_1/Config.toml
@@ -56,6 +56,7 @@
 # mode = 'balanced' # 'lightweight', 'balanced', 'performance', 
 #                   # or """{dictionary}""" (see below)
 # # A dictionary (WITHIN THREE DOUBLE QUOTES) allows you to manually select the person detection (if top_down approach) and/or pose estimation models (see https://github.com/Tau-J/rtmlib). 
+# # Models can be local paths or URLs.
 # # Make sure the input_sizes are within triple quotes, and that they are in the opposite order from the one in the model path (for example, it would be [192,256] for rtmpose-m_simcc-body7_pt-body7-halpe26_700e-256x192-4d3e73dd_20230605.zip). 
 # # If your pose_model is not provided in skeletons.py, you may have to create your own one (see example at the end of the file).
 # # Example, equivalent to mode='balanced':

diff --git a/Pose2Sim/Demo_Batch/Trial_2/Config.toml b/Pose2Sim/Demo_Batch/Trial_2/Config.toml
@@ -55,6 +55,7 @@ participant_mass = [70.0, 63.5]     # float (eg 70.0), or list of floats (eg [70
 # mode = 'balanced' # 'lightweight', 'balanced', 'performance', 
 #                   # or """{dictionary}""" (see below)
 # # A dictionary (WITHIN THREE DOUBLE QUOTES) allows you to manually select the person detection (if top_down approach) and/or pose estimation models (see https://github.com/Tau-J/rtmlib). 
+# # Models can be local paths or URLs.
 # # Make sure the input_sizes are within triple quotes, and that they are in the opposite order from the one in the model path (for example, it would be [192,256] for rtmpose-m_simcc-body7_pt-body7-halpe26_700e-256x192-4d3e73dd_20230605.zip). 
 # # If your pose_model is not provided in skeletons.py, you may have to create your own one (see example at the end of the file).
 # # Example, equivalent to mode='balanced':

diff --git a/Pose2Sim/Demo_MultiPerson/Config.toml b/Pose2Sim/Demo_MultiPerson/Config.toml
@@ -56,6 +56,7 @@ pose_model = 'Body_with_feet'  #With RTMLib:
 mode = 'balanced' # 'lightweight', 'balanced', 'performance', 
                   # or """{dictionary}""" (see below)
 # A dictionary (WITHIN THREE DOUBLE QUOTES) allows you to manually select the person detection (if top_down approach) and/or pose estimation models (see https://github.com/Tau-J/rtmlib). 
+# Models can be local paths or URLs.
 # Make sure the input_sizes are within triple quotes, and that they are in the opposite order from the one in the model path (for example, it would be [192,256] for rtmpose-m_simcc-body7_pt-body7-halpe26_700e-256x192-4d3e73dd_20230605.zip). 
 # If your pose_model is not provided in skeletons.py, you may have to create your own one (see example at the end of the file).
 # Example, equivalent to mode='balanced':

diff --git a/Pose2Sim/Demo_SinglePerson/Config.toml b/Pose2Sim/Demo_SinglePerson/Config.toml
@@ -56,6 +56,7 @@ pose_model = 'Body_with_feet'  #With RTMLib:
 mode = 'balanced' # 'lightweight', 'balanced', 'performance', 
                   # or """{dictionary}""" (see below)
 # A dictionary (WITHIN THREE DOUBLE QUOTES) allows you to manually select the person detection (if top_down approach) and/or pose estimation models (see https://github.com/Tau-J/rtmlib). 
+# Models can be local paths or URLs.
 # Make sure the input_sizes are within triple quotes, and that they are in the opposite order from the one in the model path (for example, it would be [192,256] for rtmpose-m_simcc-body7_pt-body7-halpe26_700e-256x192-4d3e73dd_20230605.zip). 
 # If your pose_model is not provided in skeletons.py, you may have to create your own one (see example at the end of the file).
 # Example, equivalent to mode='balanced':

diff --git a/Pose2Sim/Utilities/tests.py b/Pose2Sim/Utilities/tests.py
@@ -156,11 +156,11 @@ def test_workflow(self, mock_input):
         # Step by step
         Pose2Sim.calibration(config_dict)
         Pose2Sim.poseEstimation(config_dict)
-        # Pose2Sim.synchronization(config_dict) # No synchronization for multi-person for now
+        # Pose2Sim.synchronization(config_dict) # No test for synchronization for multi-person
         Pose2Sim.personAssociation(config_dict)
         Pose2Sim.triangulation(config_dict)
         Pose2Sim.filtering(config_dict)
-        Pose2Sim.markerAugmentation(config_dict)
+        # Pose2Sim.markerAugmentation(config_dict) # Marker augmentation requires markers that are not provided by RTMO: ['RHeel', 'RBigToe', 'RSmallToe', 'LSmallToe', 'LHeel', 'LBigToe']
         Pose2Sim.kinematics(config_dict)
 
         # Run all

diff --git a/setup.cfg b/setup.cfg
@@ -48,7 +48,8 @@ install_requires =
     c3d
     tensorflow
     # torch
-    rtmlib @ git+https://github.com/davidpagnon/rtmlib_Pose2Sim.git@7ff790a757e9a1bc964e1f9395c965ae8b078e57
+    # rtmlib @ git+https://github.com/davidpagnon/rtmlib_Pose2Sim.git@7ff790a757e9a1bc964e1f9395c965ae8b078e57
+    rtmlib_pose2sim
     # onnxruntime
     openvino
     opencv-python