Skip to content

Commit 3ca452f

Browse files
authored
fix mmpose version of v0.24.0 (open-mmlab#217)
1 parent 24c7f47 commit 3ca452f

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

.github/workflows/build.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ jobs:
5151
run: rm -rf .eggs && pip install -e .
5252
- name: Run unittests and generate coverage report
5353
run: |
54-
coverage run --branch --source mmdeploy -m pytest -rsE tests --ignore=tests/test_codebase/test_mmpose
55-
coverage run --branch --source mmdeploy --append -m pytest -rsE tests/test_codebase/test_mmpose
54+
coverage run --branch --source mmdeploy -m pytest -rsE tests
5655
coverage xml
5756
coverage report -m
5857
@@ -96,8 +95,7 @@ jobs:
9695
python tools/check_env.py
9796
- name: Run unittests and generate coverage report
9897
run: |
99-
coverage run --branch --source mmdeploy -m pytest -rsE tests --ignore=tests/test_codebase/test_mmpose
100-
coverage run --branch --source mmdeploy --append -m pytest -rsE tests/test_codebase/test_mmpose
98+
coverage run --branch --source mmdeploy -m pytest -rsE tests
10199
coverage xml
102100
coverage report -m
103101
@@ -141,8 +139,7 @@ jobs:
141139
python tools/check_env.py
142140
- name: Run unittests and generate coverage report
143141
run: |
144-
coverage run --branch --source mmdeploy -m pytest -rsE tests --ignore=tests/test_codebase/test_mmpose
145-
coverage run --branch --source mmdeploy --append -m pytest -rsE tests/test_codebase/test_mmpose
142+
coverage run --branch --source mmdeploy -m pytest -rsE tests
146143
coverage xml
147144
coverage report -m
148145
- name: Upload coverage to Codecov

mmdeploy/codebase/mmpose/deploy/pose_detection.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def create_input(self,
8181
Returns:
8282
tuple: (data, img), meta information for the input image and input.
8383
"""
84-
from mmpose.apis.inference import LoadImage, _box2cs
84+
from mmpose.apis.inference import _box2cs
8585
from mmpose.datasets.dataset_info import DatasetInfo
8686
from mmpose.datasets.pipelines import Compose
8787

@@ -98,10 +98,7 @@ def create_input(self,
9898
bboxes = np.array([box['bbox'] for box in person_results])
9999

100100
# build the data pipeline
101-
channel_order = cfg.test_pipeline[0].get('channel_order', 'rgb')
102-
test_pipeline = [LoadImage(channel_order=channel_order)
103-
] + cfg.test_pipeline[1:]
104-
test_pipeline = Compose(test_pipeline)
101+
test_pipeline = Compose(cfg.test_pipeline)
105102
dataset_name = dataset_info.dataset_name
106103
flip_pairs = dataset_info.flip_pairs
107104
batch_data = []
@@ -114,7 +111,7 @@ def create_input(self,
114111

115112
# prepare data
116113
data = {
117-
'img_or_path':
114+
'img':
118115
imgs,
119116
'center':
120117
center,
@@ -138,6 +135,7 @@ def create_input(self,
138135
'flip_pairs': flip_pairs
139136
}
140137
}
138+
141139
data = test_pipeline(data)
142140
batch_data.append(data)
143141

requirements/optional.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ mmcls>=0.15.0,<=0.19.0
22
mmdet>=2.19.0,<=2.20.0
33
mmedit
44
mmocr>=0.3.0
5-
mmpose>=0.23.0
5+
mmpose>=0.24.0
66
mmsegmentation
77
onnxruntime>=1.8.0
88
openvino-dev

0 commit comments

Comments
 (0)