Skip to content

Commit 2b07b3a

Browse files
BobholamovicBobholamovic
committed
[Fix] Fix HPI bugs (#4137)
* Add HPI info for PP-LCNet_x1_0_textline_ori * For OCR models use MKLDNN by default * Fix mkldnn
1 parent 4ab13da commit 2b07b3a

File tree

4 files changed

+64
-49
lines changed

4 files changed

+64
-49
lines changed

‎paddlex/inference/models/common/static_infer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,15 +407,15 @@ def _create(
407407
assert self._option.device_type == "cpu"
408408
config.disable_gpu()
409409
if "mkldnn" in self._option.run_mode:
410-
try:
410+
if hasattr(config, "set_mkldnn_cache_capacity"):
411411
config.enable_mkldnn()
412412
if "bf16" in self._option.run_mode:
413413
config.enable_mkldnn_bfloat16()
414-
except Exception:
414+
config.set_mkldnn_cache_capacity(-1)
415+
else:
415416
logging.warning(
416417
"MKL-DNN is not available. We will disable MKL-DNN."
417418
)
418-
config.set_mkldnn_cache_capacity(-1)
419419
else:
420420
if hasattr(config, "disable_mkldnn"):
421421
config.disable_mkldnn()

‎paddlex/inference/utils/hpi.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,14 @@ def suggest_inference_backend_and_config(
236236
assert pseudo_backend in (
237237
"paddle",
238238
"paddle_fp16",
239+
"paddle_mkldnn",
239240
"paddle_tensorrt",
240241
"paddle_tensorrt_fp16",
241242
), pseudo_backend
242243
if pseudo_backend == "paddle_fp16":
243244
suggested_backend_config.update({"run_mode": "paddle_fp16"})
245+
elif pseudo_backend == "paddle_mkldnn":
246+
suggested_backend_config.update({"run_mode": "mkldnn"})
244247
elif pseudo_backend == "paddle_tensorrt":
245248
suggested_backend_config.update({"run_mode": "trt_fp32"})
246249
elif pseudo_backend == "paddle_tensorrt_fp16":

‎paddlex/inference/utils/hpi_model_info_collection.json‎

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"PP-LCNet_x1_0_doc_ori": [
44
"openvino",
55
"onnxruntime",
6-
"paddle"
6+
"paddle_mkldnn"
77
],
88
"PicoDet_LCNet_x2_5_face": [
99
"openvino",
@@ -443,23 +443,23 @@
443443
],
444444
"PP-DocLayout-L": [
445445
"onnxruntime",
446-
"paddle"
446+
"paddle_mkldnn"
447447
],
448448
"PP-DocLayout_plus-L": [
449449
"onnxruntime",
450-
"paddle"
450+
"paddle_mkldnn"
451451
],
452452
"PP-DocBlockLayout": [
453453
"onnxruntime",
454-
"paddle"
454+
"paddle_mkldnn"
455455
],
456456
"RT-DETR-H_layout_17cls": [
457457
"onnxruntime",
458-
"paddle"
458+
"paddle_mkldnn"
459459
],
460460
"RT-DETR-H_layout_3cls": [
461461
"onnxruntime",
462-
"paddle"
462+
"paddle_mkldnn"
463463
],
464464
"PP-ShiTuV2_det": [
465465
"openvino",
@@ -494,12 +494,12 @@
494494
"PP-OCRv4_mobile_seal_det": [
495495
"openvino",
496496
"onnxruntime",
497-
"paddle"
497+
"paddle_mkldnn"
498498
],
499499
"PP-OCRv4_server_seal_det": [
500500
"openvino",
501501
"onnxruntime",
502-
"paddle"
502+
"paddle_mkldnn"
503503
],
504504
"Deeplabv3-R101": [
505505
"openvino",
@@ -552,131 +552,131 @@
552552
],
553553
"RT-DETR-L_wired_table_cell_det": [
554554
"onnxruntime",
555-
"paddle"
555+
"paddle_mkldnn"
556556
],
557557
"RT-DETR-L_wireless_table_cell_det": [
558558
"onnxruntime",
559-
"paddle"
559+
"paddle_mkldnn"
560560
],
561561
"PP-LCNet_x1_0_table_cls": [
562562
"openvino",
563563
"onnxruntime",
564-
"paddle"
564+
"paddle_mkldnn"
565565
],
566566
"PP-OCRv3_mobile_det": [
567567
"openvino",
568568
"onnxruntime",
569-
"paddle"
569+
"paddle_mkldnn"
570570
],
571571
"PP-OCRv3_server_det": [
572572
"openvino",
573-
"paddle",
573+
"paddle_mkldnn",
574574
"onnxruntime"
575575
],
576576
"PP-OCRv4_mobile_det": [
577577
"openvino",
578578
"onnxruntime",
579-
"paddle"
579+
"paddle_mkldnn"
580580
],
581581
"PP-OCRv4_server_det": [
582-
"paddle",
582+
"paddle_mkldnn",
583583
"openvino",
584584
"onnxruntime"
585585
],
586586
"PP-OCRv3_mobile_rec": [
587587
"openvino",
588588
"onnxruntime",
589-
"paddle"
589+
"paddle_mkldnn"
590590
],
591591
"PP-OCRv4_mobile_rec": [
592592
"openvino",
593593
"onnxruntime",
594-
"paddle"
594+
"paddle_mkldnn"
595595
],
596596
"PP-OCRv4_server_rec_doc": [
597-
"paddle",
597+
"paddle_mkldnn",
598598
"openvino",
599599
"onnxruntime"
600600
],
601601
"PP-OCRv4_server_rec": [
602-
"paddle",
602+
"paddle_mkldnn",
603603
"openvino",
604604
"onnxruntime"
605605
],
606606
"arabic_PP-OCRv3_mobile_rec": [
607607
"openvino",
608608
"onnxruntime",
609-
"paddle"
609+
"paddle_mkldnn"
610610
],
611611
"ch_RepSVTR_rec": [
612612
"openvino",
613613
"onnxruntime",
614-
"paddle"
614+
"paddle_mkldnn"
615615
],
616616
"ch_SVTRv2_rec": [
617617
"openvino",
618618
"onnxruntime",
619-
"paddle"
619+
"paddle_mkldnn"
620620
],
621621
"chinese_cht_PP-OCRv3_mobile_rec": [
622622
"openvino",
623623
"onnxruntime",
624-
"paddle"
624+
"paddle_mkldnn"
625625
],
626626
"cyrillic_PP-OCRv3_mobile_rec": [
627627
"openvino",
628628
"onnxruntime",
629-
"paddle"
629+
"paddle_mkldnn"
630630
],
631631
"devanagari_PP-OCRv3_mobile_rec": [
632632
"openvino",
633633
"onnxruntime",
634-
"paddle"
634+
"paddle_mkldnn"
635635
],
636636
"en_PP-OCRv3_mobile_rec": [
637637
"openvino",
638638
"onnxruntime",
639-
"paddle"
639+
"paddle_mkldnn"
640640
],
641641
"en_PP-OCRv4_mobile_rec": [
642642
"openvino",
643643
"onnxruntime",
644-
"paddle"
644+
"paddle_mkldnn"
645645
],
646646
"japan_PP-OCRv3_mobile_rec": [
647647
"openvino",
648648
"onnxruntime",
649-
"paddle"
649+
"paddle_mkldnn"
650650
],
651651
"ka_PP-OCRv3_mobile_rec": [
652652
"openvino",
653653
"onnxruntime",
654-
"paddle"
654+
"paddle_mkldnn"
655655
],
656656
"korean_PP-OCRv3_mobile_rec": [
657657
"openvino",
658658
"onnxruntime",
659-
"paddle"
659+
"paddle_mkldnn"
660660
],
661661
"latin_PP-OCRv3_mobile_rec": [
662662
"openvino",
663663
"onnxruntime",
664-
"paddle"
664+
"paddle_mkldnn"
665665
],
666666
"ta_PP-OCRv3_mobile_rec": [
667667
"openvino",
668668
"onnxruntime",
669-
"paddle"
669+
"paddle_mkldnn"
670670
],
671671
"te_PP-OCRv3_mobile_rec": [
672672
"openvino",
673673
"onnxruntime",
674-
"paddle"
674+
"paddle_mkldnn"
675675
],
676676
"PP-LCNet_x0_25_textline_ori": [
677677
"openvino",
678678
"onnxruntime",
679-
"paddle"
679+
"paddle_mkldnn"
680680
],
681681
"AutoEncoder_ad": [
682682
"onnxruntime",
@@ -815,42 +815,42 @@
815815
"PP-DocLayout-M": [
816816
"openvino",
817817
"onnxruntime",
818-
"paddle"
818+
"paddle_mkldnn"
819819
],
820820
"PP-DocLayout-S": [
821821
"openvino",
822822
"onnxruntime",
823-
"paddle"
823+
"paddle_mkldnn"
824824
],
825825
"PicoDet-L_layout_17cls": [
826826
"openvino",
827827
"onnxruntime",
828-
"paddle"
828+
"paddle_mkldnn"
829829
],
830830
"PicoDet-L_layout_3cls": [
831831
"openvino",
832832
"onnxruntime",
833-
"paddle"
833+
"paddle_mkldnn"
834834
],
835835
"PicoDet-S_layout_17cls": [
836836
"openvino",
837837
"onnxruntime",
838-
"paddle"
838+
"paddle_mkldnn"
839839
],
840840
"PicoDet-S_layout_3cls": [
841841
"openvino",
842842
"onnxruntime",
843-
"paddle"
843+
"paddle_mkldnn"
844844
],
845845
"PicoDet_layout_1x_table": [
846846
"openvino",
847847
"onnxruntime",
848-
"paddle"
848+
"paddle_mkldnn"
849849
],
850850
"PicoDet_layout_1x": [
851851
"openvino",
852852
"onnxruntime",
853-
"paddle"
853+
"paddle_mkldnn"
854854
],
855855
"Cascade-FasterRCNN-ResNet50-FPN": [
856856
"paddle"
@@ -1146,24 +1146,24 @@
11461146
"paddle"
11471147
],
11481148
"PP-OCRv5_server_rec": [
1149-
"paddle",
1149+
"paddle_mkldnn",
11501150
"openvino",
11511151
"onnxruntime"
11521152
],
11531153
"PP-OCRv5_mobile_rec": [
11541154
"openvino",
11551155
"onnxruntime",
1156-
"paddle"
1156+
"paddle_mkldnn"
11571157
],
11581158
"PP-OCRv5_server_det": [
11591159
"openvino",
11601160
"onnxruntime",
1161-
"paddle"
1161+
"paddle_mkldnn"
11621162
],
11631163
"PP-OCRv5_mobile_det": [
11641164
"openvino",
11651165
"onnxruntime",
1166-
"paddle"
1166+
"paddle_mkldnn"
11671167
],
11681168
"PP-FormulaNet_plus-L": [
11691169
"onnxruntime",
@@ -1176,6 +1176,11 @@
11761176
"PP-FormulaNet_plus-S": [
11771177
"onnxruntime",
11781178
"paddle"
1179+
],
1180+
"PP-LCNet_x1_0_textline_ori": [
1181+
"openvino",
1182+
"onnxruntime",
1183+
"paddle_mkldnn"
11791184
]
11801185
},
11811186
"gpu_cuda118_cudnn89": {
@@ -2326,6 +2331,11 @@
23262331
],
23272332
"PP-FormulaNet_plus-S": [
23282333
"paddle"
2334+
],
2335+
"PP-LCNet_x1_0_textline_ori": [
2336+
"tensorrt_fp16",
2337+
"paddle_tensorrt",
2338+
"onnxruntime"
23292339
]
23302340
}
23312341
}

‎paddlex/inference/utils/mkldnn_blocklist.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222
"PP-FormulaNet_plus-L",
2323
"PP-FormulaNet_plus-M",
2424
"PP-FormulaNet_plus-S",
25+
"SLANet",
26+
"SLANet_plus",
2527
]

0 commit comments

Comments
 (0)