From 67d6fa001da5cb58b81dcb68968355995f8e586f Mon Sep 17 00:00:00 2001 From: "hanyuan.chy" Date: Tue, 11 Oct 2022 17:17:51 +0800 Subject: [PATCH] [to #42322933] unify keys forbody_3d_keypoints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 统一关键点检测输出key的名字 Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10359335 --- modelscope/outputs.py | 4 ++-- modelscope/pipelines/cv/body_3d_keypoints_pipeline.py | 4 ++-- tests/pipelines/test_body_3d_keypoints.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modelscope/outputs.py b/modelscope/outputs.py index c16e256e..331f4816 100644 --- a/modelscope/outputs.py +++ b/modelscope/outputs.py @@ -222,7 +222,7 @@ TASK_OUTPUTS = { # 3D human body keypoints detection result for single sample # { - # "poses": [ # 3d pose coordinate in camera coordinate + # "keypoints": [ # 3d pose coordinate in camera coordinate # [[x, y, z]*17], # joints of per image # [[x, y, z]*17], # ... @@ -236,7 +236,7 @@ TASK_OUTPUTS = { # and is only avaialbe when the "render" option is enabled. # } Tasks.body_3d_keypoints: - [OutputKeys.POSES, OutputKeys.TIMESTAMPS, OutputKeys.OUTPUT_VIDEO], + [OutputKeys.KEYPOINTS, OutputKeys.TIMESTAMPS, OutputKeys.OUTPUT_VIDEO], # 2D hand keypoints result for single sample # { diff --git a/modelscope/pipelines/cv/body_3d_keypoints_pipeline.py b/modelscope/pipelines/cv/body_3d_keypoints_pipeline.py index b0faa1e0..c3f4e8c1 100644 --- a/modelscope/pipelines/cv/body_3d_keypoints_pipeline.py +++ b/modelscope/pipelines/cv/body_3d_keypoints_pipeline.py @@ -180,7 +180,7 @@ class Body3DKeypointsPipeline(Pipeline): return res def postprocess(self, input: Dict[str, Any], **kwargs) -> Dict[str, Any]: - res = {OutputKeys.POSES: [], OutputKeys.TIMESTAMPS: []} + res = {OutputKeys.KEYPOINTS: [], OutputKeys.TIMESTAMPS: []} if not input['success']: pass @@ -197,7 +197,7 @@ class Body3DKeypointsPipeline(Pipeline): self.render_prediction(pred_3d_pose, output_video_path) res[OutputKeys.OUTPUT_VIDEO] = output_video_path - res[OutputKeys.POSES] = pred_3d_pose + res[OutputKeys.KEYPOINTS] = pred_3d_pose res[OutputKeys.TIMESTAMPS] = self.timestamps return res diff --git a/tests/pipelines/test_body_3d_keypoints.py b/tests/pipelines/test_body_3d_keypoints.py index 6f27f12d..6e671d2e 100644 --- a/tests/pipelines/test_body_3d_keypoints.py +++ b/tests/pipelines/test_body_3d_keypoints.py @@ -21,7 +21,7 @@ class Body3DKeypointsTest(unittest.TestCase, DemoCompatibilityCheck): def pipeline_inference(self, pipeline: Pipeline, pipeline_input): output = pipeline(pipeline_input, output_video='./result.mp4') - poses = np.array(output[OutputKeys.POSES]) + poses = np.array(output[OutputKeys.KEYPOINTS]) print(f'result 3d points shape {poses.shape}') @unittest.skipUnless(test_level() >= 0, 'skip test in current test level')