|
21 | 21 | from PIL import Image, ImageDraw, ImageFont
|
22 | 22 | import math
|
23 | 23 | from paddle import inference
|
| 24 | +import time |
| 25 | +from ppocr.utils.logging import get_logger |
| 26 | +logger = get_logger() |
24 | 27 |
|
25 | 28 |
|
26 | 29 | def parse_args():
|
@@ -98,6 +101,7 @@ def str2bool(v):
|
98 | 101 | parser.add_argument("--cls_thresh", type=float, default=0.9)
|
99 | 102 |
|
100 | 103 | parser.add_argument("--enable_mkldnn", type=str2bool, default=False)
|
| 104 | + parser.add_argument("--cpu_threads", type=int, default=10) |
101 | 105 | parser.add_argument("--use_pdserving", type=str2bool, default=False)
|
102 | 106 |
|
103 | 107 | parser.add_argument("--use_mp", type=str2bool, default=False)
|
@@ -140,14 +144,15 @@ def create_predictor(args, mode, logger):
|
140 | 144 | max_batch_size=args.max_batch_size)
|
141 | 145 | else:
|
142 | 146 | config.disable_gpu()
|
143 |
| - config.set_cpu_math_library_num_threads(6) |
| 147 | + if hasattr(args, "cpu_threads"): |
| 148 | + config.set_cpu_math_library_num_threads(args.cpu_threads) |
| 149 | + else: |
| 150 | + config.set_cpu_math_library_num_threads( |
| 151 | + 10) # default cpu threads as 10 |
144 | 152 | if args.enable_mkldnn:
|
145 | 153 | # cache 10 different shapes for mkldnn to avoid memory leak
|
146 | 154 | config.set_mkldnn_cache_capacity(10)
|
147 | 155 | config.enable_mkldnn()
|
148 |
| - # TODO LDOUBLEV: fix mkldnn bug when bach_size > 1 |
149 |
| - #config.set_mkldnn_op({'conv2d', 'depthwise_conv2d', 'pool2d', 'batch_norm'}) |
150 |
| - args.rec_batch_num = 1 |
151 | 156 |
|
152 | 157 | # enable memory optim
|
153 | 158 | config.enable_memory_optim()
|
|
0 commit comments