Skip to content

Commit c4c5d0a

Browse files
authored
Add PPResNet from PaddleHub conversion (#4)
* add PPResNet impl and demo * add benchmark impl and results for PPResNet
1 parent 703a132 commit c4c5d0a

File tree

11 files changed

+1395
-11
lines changed

11 files changed

+1395
-11
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Hardware Setup:
1616
-->
1717

1818
***Important Notes***:
19-
- The time data that shown on the following tables presents the time elapsed from preprocess (resize is excluded), to a forward pass of a network, and postprocess to get final results.
20-
- The time data that shown on the following tables is the median of benchmark runs.
19+
- The time data that shown on the following table presents the time elapsed from preprocess (resize is excluded), to a forward pass of a network, and postprocess to get final results.
20+
- The time data that shown on the following table is the median of 10 runs. Different metrics may be applied to some specific models.
2121
- View [benchmark/config](./benchmark/config) for more details on benchmarking different models.
2222

2323
<!--
@@ -33,6 +33,7 @@ Hardware Setup:
3333
| [DB](./models/text_detection_db) | 640x480 | 137.38 | 2780.78 |
3434
| [CRNN](./models/text_recognition_crnn) | 100x32 | 50.21 | 234.32 |
3535
| [SFace](./models/face_recognition_sface) | 112x112 | 8.69 | 96.79 |
36+
| [PP-ResNet](./models/image_classification_ppresnet) | 224x224 | 56.05 | 602.58
3637

3738

3839
## License

benchmark/benchmark.py

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ def __init__(self, **kwargs):
7575
if self._use_label:
7676
self._labels = self._load_label()
7777

78+
self._to_rgb = kwargs.pop('toRGB', False)
79+
self._resize = tuple(kwargs.pop('resize', []))
80+
self._center_crop = kwargs.pop('centerCrop', None)
81+
7882
def _load_label(self):
7983
labels = dict.fromkeys(self._files, None)
8084
for filename in self._files:
@@ -83,6 +87,19 @@ def _load_label(self):
8387

8488
def __getitem__(self, idx):
8589
image = cv.imread(os.path.join(self._path, self._files[idx]))
90+
91+
if self._to_rgb:
92+
image = cv.cvtColor(image, cv.COLOR_BGR2RGB)
93+
if self._resize:
94+
image = cv.resize(image, self._resize)
95+
if self._center_crop:
96+
h, w, _ = image.shape
97+
w_crop = int((w - self._center_crop) / 2.)
98+
assert w_crop >= 0
99+
h_crop = int((h - self._center_crop) / 2.)
100+
assert h_crop >= 0
101+
image = image[w_crop:w-w_crop, h_crop:h-h_crop, :]
102+
86103
if self._use_label:
87104
return self._files[idx], image, self._labels[self._files[idx]]
88105
else:
@@ -113,7 +130,10 @@ def forward(self, model, *args, **kwargs):
113130
if len(args) == 1:
114131
for size in self._sizes:
115132
img_r = cv.resize(img, size)
116-
model.setInputSize(size)
133+
try:
134+
model.setInputSize(size)
135+
except:
136+
pass
117137
# TODO: batched inference
118138
# input_data = [img] * self._batch_size
119139
input_data = img_r
@@ -192,20 +212,21 @@ def build_from_cfg(cfg, registery):
192212
obj = registery.get(obj_name)
193213
return obj(**cfg)
194214

195-
def prepend_pythonpath(cfg, key1, key2):
196-
pythonpath = os.environ['PYTHONPATH']
197-
if cfg[key1][key2].startswith('/'):
198-
return
199-
cfg[key1][key2] = os.path.join(pythonpath, cfg[key1][key2])
215+
def prepend_pythonpath(cfg):
216+
for k, v in cfg.items():
217+
if isinstance(v, dict):
218+
prepend_pythonpath(v)
219+
else:
220+
if 'path' in k.lower():
221+
cfg[k] = os.path.join(os.environ['PYTHONPATH'], v)
200222

201223
if __name__ == '__main__':
202224
assert args.cfg.endswith('yaml'), 'Currently support configs of yaml format only.'
203225
with open(args.cfg, 'r') as f:
204226
cfg = yaml.safe_load(f)
205227

206228
# prepend PYTHONPATH to each path
207-
prepend_pythonpath(cfg['Benchmark'], key1='data', key2='path')
208-
prepend_pythonpath(cfg, key1='Model', key2='modelPath')
229+
prepend_pythonpath(cfg)
209230

210231
# Instantiate benchmarking
211232
benchmark = Benchmark(**cfg['Benchmark'])
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Benchmark:
2+
name: "Image Classification Benchmark"
3+
data:
4+
path: "benchmark/data/image_classification"
5+
files: ["coffee_mug.jpg", "umbrella.jpg", "wall_clock.jpg"]
6+
toRGB: True
7+
resize: [256, 256]
8+
centerCrop: 224
9+
metric:
10+
warmup: 3
11+
repeat: 10
12+
batchSize: 1
13+
reduction: 'median'
14+
backend: "default"
15+
target: "cpu"
16+
17+
Model:
18+
name: "PPResNet"
19+
modelPath: "models/image_classification_ppresnet/image_classification_ppresnet50.onnx"
20+
labelPath: "models/image_classification_ppresnet/imagenet_labels.txt"

benchmark/download_data.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ def get_confirm_token(response): # in case of large files
173173
url='https://drive.google.com/u/0/uc?id=1lTQdZUau7ujHBqp0P6M1kccnnJgO-dRj&export=download',
174174
sha='a40cf095ceb77159ddd2a5902f3b4329696dd866',
175175
filename='text.zip'),
176+
image_classification=Downloader(name='image_classification',
177+
url='https://drive.google.com/u/0/uc?id=1qcsrX3CIAGTooB-9fLKYwcvoCuMgjzGU&export=download',
178+
sha='987546f567f9f11d150eea78951024b55b015401',
179+
filename='image_classification.zip'),
176180
)
177181

178182
if __name__ == '__main__':

models/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from .text_detection_db.db import DB
33
from .text_recognition_crnn.crnn import CRNN
44
from .face_recognition_sface.sface import SFace
5+
from .image_classification_ppresnet.ppresnet import PPResNet
56

67
class Registery:
78
def __init__(self, name):
@@ -18,4 +19,5 @@ def register(self, item):
1819
MODELS.register(YuNet)
1920
MODELS.register(DB)
2021
MODELS.register(CRNN)
21-
MODELS.register(SFace)
22+
MODELS.register(SFace)
23+
MODELS.register(PPResNet)
Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved
2+
3+
Apache License
4+
Version 2.0, January 2004
5+
http://www.apache.org/licenses/
6+
7+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8+
9+
1. Definitions.
10+
11+
"License" shall mean the terms and conditions for use, reproduction,
12+
and distribution as defined by Sections 1 through 9 of this document.
13+
14+
"Licensor" shall mean the copyright owner or entity authorized by
15+
the copyright owner that is granting the License.
16+
17+
"Legal Entity" shall mean the union of the acting entity and all
18+
other entities that control, are controlled by, or are under common
19+
control with that entity. For the purposes of this definition,
20+
"control" means (i) the power, direct or indirect, to cause the
21+
direction or management of such entity, whether by contract or
22+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
23+
outstanding shares, or (iii) beneficial ownership of such entity.
24+
25+
"You" (or "Your") shall mean an individual or Legal Entity
26+
exercising permissions granted by this License.
27+
28+
"Source" form shall mean the preferred form for making modifications,
29+
including but not limited to software source code, documentation
30+
source, and configuration files.
31+
32+
"Object" form shall mean any form resulting from mechanical
33+
transformation or translation of a Source form, including but
34+
not limited to compiled object code, generated documentation,
35+
and conversions to other media types.
36+
37+
"Work" shall mean the work of authorship, whether in Source or
38+
Object form, made available under the License, as indicated by a
39+
copyright notice that is included in or attached to the work
40+
(an example is provided in the Appendix below).
41+
42+
"Derivative Works" shall mean any work, whether in Source or Object
43+
form, that is based on (or derived from) the Work and for which the
44+
editorial revisions, annotations, elaborations, or other modifications
45+
represent, as a whole, an original work of authorship. For the purposes
46+
of this License, Derivative Works shall not include works that remain
47+
separable from, or merely link (or bind by name) to the interfaces of,
48+
the Work and Derivative Works thereof.
49+
50+
"Contribution" shall mean any work of authorship, including
51+
the original version of the Work and any modifications or additions
52+
to that Work or Derivative Works thereof, that is intentionally
53+
submitted to Licensor for inclusion in the Work by the copyright owner
54+
or by an individual or Legal Entity authorized to submit on behalf of
55+
the copyright owner. For the purposes of this definition, "submitted"
56+
means any form of electronic, verbal, or written communication sent
57+
to the Licensor or its representatives, including but not limited to
58+
communication on electronic mailing lists, source code control systems,
59+
and issue tracking systems that are managed by, or on behalf of, the
60+
Licensor for the purpose of discussing and improving the Work, but
61+
excluding communication that is conspicuously marked or otherwise
62+
designated in writing by the copyright owner as "Not a Contribution."
63+
64+
"Contributor" shall mean Licensor and any individual or Legal Entity
65+
on behalf of whom a Contribution has been received by Licensor and
66+
subsequently incorporated within the Work.
67+
68+
2. Grant of Copyright License. Subject to the terms and conditions of
69+
this License, each Contributor hereby grants to You a perpetual,
70+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
71+
copyright license to reproduce, prepare Derivative Works of,
72+
publicly display, publicly perform, sublicense, and distribute the
73+
Work and such Derivative Works in Source or Object form.
74+
75+
3. Grant of Patent License. Subject to the terms and conditions of
76+
this License, each Contributor hereby grants to You a perpetual,
77+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
78+
(except as stated in this section) patent license to make, have made,
79+
use, offer to sell, sell, import, and otherwise transfer the Work,
80+
where such license applies only to those patent claims licensable
81+
by such Contributor that are necessarily infringed by their
82+
Contribution(s) alone or by combination of their Contribution(s)
83+
with the Work to which such Contribution(s) was submitted. If You
84+
institute patent litigation against any entity (including a
85+
cross-claim or counterclaim in a lawsuit) alleging that the Work
86+
or a Contribution incorporated within the Work constitutes direct
87+
or contributory patent infringement, then any patent licenses
88+
granted to You under this License for that Work shall terminate
89+
as of the date such litigation is filed.
90+
91+
4. Redistribution. You may reproduce and distribute copies of the
92+
Work or Derivative Works thereof in any medium, with or without
93+
modifications, and in Source or Object form, provided that You
94+
meet the following conditions:
95+
96+
(a) You must give any other recipients of the Work or
97+
Derivative Works a copy of this License; and
98+
99+
(b) You must cause any modified files to carry prominent notices
100+
stating that You changed the files; and
101+
102+
(c) You must retain, in the Source form of any Derivative Works
103+
that You distribute, all copyright, patent, trademark, and
104+
attribution notices from the Source form of the Work,
105+
excluding those notices that do not pertain to any part of
106+
the Derivative Works; and
107+
108+
(d) If the Work includes a "NOTICE" text file as part of its
109+
distribution, then any Derivative Works that You distribute must
110+
include a readable copy of the attribution notices contained
111+
within such NOTICE file, excluding those notices that do not
112+
pertain to any part of the Derivative Works, in at least one
113+
of the following places: within a NOTICE text file distributed
114+
as part of the Derivative Works; within the Source form or
115+
documentation, if provided along with the Derivative Works; or,
116+
within a display generated by the Derivative Works, if and
117+
wherever such third-party notices normally appear. The contents
118+
of the NOTICE file are for informational purposes only and
119+
do not modify the License. You may add Your own attribution
120+
notices within Derivative Works that You distribute, alongside
121+
or as an addendum to the NOTICE text from the Work, provided
122+
that such additional attribution notices cannot be construed
123+
as modifying the License.
124+
125+
You may add Your own copyright statement to Your modifications and
126+
may provide additional or different license terms and conditions
127+
for use, reproduction, or distribution of Your modifications, or
128+
for any such Derivative Works as a whole, provided Your use,
129+
reproduction, and distribution of the Work otherwise complies with
130+
the conditions stated in this License.
131+
132+
5. Submission of Contributions. Unless You explicitly state otherwise,
133+
any Contribution intentionally submitted for inclusion in the Work
134+
by You to the Licensor shall be under the terms and conditions of
135+
this License, without any additional terms or conditions.
136+
Notwithstanding the above, nothing herein shall supersede or modify
137+
the terms of any separate license agreement you may have executed
138+
with Licensor regarding such Contributions.
139+
140+
6. Trademarks. This License does not grant permission to use the trade
141+
names, trademarks, service marks, or product names of the Licensor,
142+
except as required for reasonable and customary use in describing the
143+
origin of the Work and reproducing the content of the NOTICE file.
144+
145+
7. Disclaimer of Warranty. Unless required by applicable law or
146+
agreed to in writing, Licensor provides the Work (and each
147+
Contributor provides its Contributions) on an "AS IS" BASIS,
148+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
149+
implied, including, without limitation, any warranties or conditions
150+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
151+
PARTICULAR PURPOSE. You are solely responsible for determining the
152+
appropriateness of using or redistributing the Work and assume any
153+
risks associated with Your exercise of permissions under this License.
154+
155+
8. Limitation of Liability. In no event and under no legal theory,
156+
whether in tort (including negligence), contract, or otherwise,
157+
unless required by applicable law (such as deliberate and grossly
158+
negligent acts) or agreed to in writing, shall any Contributor be
159+
liable to You for damages, including any direct, indirect, special,
160+
incidental, or consequential damages of any character arising as a
161+
result of this License or out of the use or inability to use the
162+
Work (including but not limited to damages for loss of goodwill,
163+
work stoppage, computer failure or malfunction, or any and all
164+
other commercial damages or losses), even if such Contributor
165+
has been advised of the possibility of such damages.
166+
167+
9. Accepting Warranty or Additional Liability. While redistributing
168+
the Work or Derivative Works thereof, You may choose to offer,
169+
and charge a fee for, acceptance of support, warranty, indemnity,
170+
or other liability obligations and/or rights consistent with this
171+
License. However, in accepting such obligations, You may act only
172+
on Your own behalf and on Your sole responsibility, not on behalf
173+
of any other Contributor, and only if You agree to indemnify,
174+
defend, and hold each Contributor harmless for any liability
175+
incurred by, or claims asserted against, such Contributor by reason
176+
of your accepting any such warranty or additional liability.
177+
178+
END OF TERMS AND CONDITIONS
179+
180+
APPENDIX: How to apply the Apache License to your work.
181+
182+
To apply the Apache License to your work, attach the following
183+
boilerplate notice, with the fields enclosed by brackets "[]"
184+
replaced with your own identifying information. (Don't include
185+
the brackets!) The text should be enclosed in the appropriate
186+
comment syntax for the file format. We also recommend that a
187+
file or class name and description of purpose be included on the
188+
same "printed page" as the copyright notice for easier
189+
identification within third-party archives.
190+
191+
Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
192+
193+
Licensed under the Apache License, Version 2.0 (the "License");
194+
you may not use this file except in compliance with the License.
195+
You may obtain a copy of the License at
196+
197+
http://www.apache.org/licenses/LICENSE-2.0
198+
199+
Unless required by applicable law or agreed to in writing, software
200+
distributed under the License is distributed on an "AS IS" BASIS,
201+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
202+
See the License for the specific language governing permissions and
203+
limitations under the License.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# ResNet
2+
3+
Deep Residual Learning for Image Recognition
4+
5+
This model is ported from [PaddleHub](https://github.com/PaddlePaddle/PaddleHub) using [this script from OpenCV](https://github.com/opencv/opencv/blob/master/samples/dnn/dnn_model_runner/dnn_conversion/paddlepaddle/paddle_resnet50.py).
6+
7+
## Demo
8+
9+
Run the following command to try the demo:
10+
```shell
11+
python demo.py --input /path/to/image
12+
```
13+
14+
## License
15+
16+
All files in this directory are licensed under [Apache 2.0 License](./LICENSE).
17+
18+
## Reference
19+
20+
- https://arxiv.org/abs/1512.03385
21+
- https://github.com/opencv/opencv/tree/master/samples/dnn/dnn_model_runner/dnn_conversion/paddlepaddle
22+
- https://github.com/PaddlePaddle/PaddleHub

0 commit comments

Comments
 (0)