From f8984f9408df3dfd07b9d686fba88222537b89cb Mon Sep 17 00:00:00 2001
From: Daniel <daniel@mail.de>
Date: Wed, 18 Dec 2024 16:28:13 +0100
Subject: [PATCH] Some mixed updates.

---
 README.md                           |  2 +-
 extras/easypose/run_container.sh    |  0
 extras/easypose/utils_2d_pose_ep.py |  2 +-
 scripts/test_skelda_dataset.py      |  3 ++-
 scripts/test_triangulate.py         |  3 ++-
 scripts/utils_2d_pose_ort.py        | 17 +++++------------
 6 files changed, 11 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 extras/easypose/run_container.sh

diff --git a/README.md b/README.md
index 6506675..306f9a4 100644
--- a/README.md
+++ b/README.md
@@ -43,5 +43,5 @@ Fast triangulation of multiple persons from multiple camera views.
 ## Debugging
 
 ```bash
-cd /RapidPoseTriangulation/swig/ && make all && cd ../tests/ && python3 test_interface.py
+cd /RapidPoseTriangulation/swig/ && make all && cd ../tests/ && python3 test_interface.py && cd ..
 ```
diff --git a/extras/easypose/run_container.sh b/extras/easypose/run_container.sh
old mode 100644
new mode 100755
diff --git a/extras/easypose/utils_2d_pose_ep.py b/extras/easypose/utils_2d_pose_ep.py
index 67fe3e2..7b95251 100644
--- a/extras/easypose/utils_2d_pose_ep.py
+++ b/extras/easypose/utils_2d_pose_ep.py
@@ -1,8 +1,8 @@
 import os
 
 import cv2
-import numpy as np
 import easypose as ep
+import numpy as np
 
 # ==================================================================================================
 
diff --git a/scripts/test_skelda_dataset.py b/scripts/test_skelda_dataset.py
index aa6a148..1fb65bb 100644
--- a/scripts/test_skelda_dataset.py
+++ b/scripts/test_skelda_dataset.py
@@ -8,8 +8,9 @@ import matplotlib
 import numpy as np
 import tqdm
 
+# import utils_2d_pose
+import utils_2d_pose_ort as utils_2d_pose
 import test_triangulate
-import utils_2d_pose
 from skelda import evals
 
 sys.path.append("/RapidPoseTriangulation/swig/")
diff --git a/scripts/test_triangulate.py b/scripts/test_triangulate.py
index 831a7e6..dcc9797 100644
--- a/scripts/test_triangulate.py
+++ b/scripts/test_triangulate.py
@@ -9,7 +9,8 @@ import cv2
 import matplotlib
 import numpy as np
 
-import utils_2d_pose
+# import utils_2d_pose
+import utils_2d_pose_ort as utils_2d_pose
 from skelda import utils_pose, utils_view
 
 sys.path.append("/RapidPoseTriangulation/swig/")
diff --git a/scripts/utils_2d_pose_ort.py b/scripts/utils_2d_pose_ort.py
index 7d4a91b..fe29cca 100644
--- a/scripts/utils_2d_pose_ort.py
+++ b/scripts/utils_2d_pose_ort.py
@@ -97,9 +97,7 @@ class BaseModel(ABC):
                     ishape = list(self.input_shapes[i])
                     if "batch_size" in ishape:
                         max_batch_size = 10
-                        ishape[0] = np.random.choice(
-                            list(range(1, max_batch_size + 1))
-                        )
+                        ishape[0] = np.random.choice(list(range(1, max_batch_size + 1)))
                     tensor = np.random.random(ishape)
                     tensor = tensor * 255
                 else:
@@ -498,17 +496,12 @@ def get_2d_pose(model, imgs, num_joints=17):
     new_poses = []
     for i in range(len(imgs)):
         img = imgs[i]
-
-        poses = []
         dets = model.predict(img)
-        for pose in dets:
-            pose = np.asarray(pose)
-            poses.append(pose)
 
-        if len(poses) == 0:
-            poses.append(np.zeros([num_joints, 3]))
-
-        poses = np.array(poses)
+        if len(dets) == 0:
+            poses = np.zeros([1, num_joints, 3], dtype=float)
+        else:
+            poses = np.asarray(dets, dtype=float)
         new_poses.append(poses)
 
     return new_poses