Commit Graph

440 Commits (1e11f254094305c593d4c734a5c4148f945accaa)

Author SHA1 Message Date
WenmuZhou ac98415b48 merge dygraph 2021-09-14 14:51:04 +08:00
Topdu 469e76cc28 comment review 2021-09-14 05:06:53 +00:00
Topdu f688909b8e fix nrtr export inference model 2021-09-13 13:10:10 +00:00
Double_V f09a28c624
Merge pull request #3952 from LDOUBLEV/dygraph
update results for opencv 4.4
2021-09-08 11:03:24 +08:00
Double_V ded97737f0
Merge pull request #3868 from before31/dygraph
修复 端到端算法调用inference模型时与训练模型结果不一致的问题,由rgb3个通道的顺序不一致引起
2021-09-08 10:40:26 +08:00
LDOUBLEV 0368e7a678 set batch dim dynamic 2021-09-07 12:54:10 +00:00
MissPenguin 727febd4e9
Merge pull request #3833 from LDOUBLEV/test_v7
add multi_predictor test
2021-09-07 14:59:47 +08:00
WenmuZhou af34d7852e merge dygraph 2021-09-07 10:30:14 +08:00
before31 97987978cf 修复 端到端算法调用inference模型时与训练模型结果不一致的问题,由rgb3个通道的顺序不一致引起 2021-08-31 22:56:08 +08:00
Double_V b38a828b32
Merge pull request #3815 from LDOUBLEV/fix_ci_
add comparion script
2021-08-31 20:58:01 +08:00
WenmuZhou 835e717832 merge dygraph 2021-08-31 19:13:15 +08:00
LDOUBLEV cf16859919 set benchmark in predict_system 2021-08-27 06:48:27 +00:00
LDOUBLEV eb96c623b8 set benchmark in predict_system 2021-08-27 06:46:40 +00:00
LDOUBLEV 6b8d6cc3b7 fix log 2021-08-26 02:22:32 +00:00
LDOUBLEV d7cbe52697 adjust the min_subgraph_size to 15 2021-08-26 02:21:22 +00:00
LDOUBLEV 71ed68c9a8 add comparion script 2021-08-25 13:38:20 +00:00
tink2123 22b57d632d fix infer shape 2021-08-25 09:41:16 +00:00
tink2123 7488bc1db5 fix infer shape 2021-08-25 07:34:23 +00:00
Double_V 68e52250f3
Merge pull request #3751 from LDOUBLEV/fix_pgnet
fix predict_e2e.py
2021-08-25 14:55:26 +08:00
LDOUBLEV 3691291ae1 Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into fix_trt_res 2021-08-23 09:14:36 +00:00
LDOUBLEV 1bf24676c2 fix rec trt 2021-08-23 09:13:22 +00:00
LDOUBLEV 5f7d4b9fe1 fix trt dynamic shape 2021-08-23 08:52:42 +00:00
LDOUBLEV 8587b40c92 fix predict_e2e.py 2021-08-19 12:23:05 +00:00
LDOUBLEV 30b10d2933 raise error when run on cpu but set use_gpu as True 2021-08-18 07:01:13 +00:00
LDOUBLEV 49c4a3a7ed gpu_id is None when args.use_gpu as False 2021-08-17 02:46:18 +00:00
LDOUBLEV 5bb6ae05c4 add rec get_gpu_id 2021-08-17 02:45:26 +00:00
LDOUBLEV d83b1de17e mv get_gpu_id func to utility 2021-08-17 02:43:15 +00:00
LDOUBLEV 96a3f90ced add gpu check 2021-08-17 02:29:41 +00:00
WenmuZhou 55f6a634fa Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into fx_pse 2021-08-09 12:49:16 +08:00
WenmuZhou 915d06324d merge dygraph 2021-08-09 11:11:29 +08:00
littletomatodonkey af47617493 rename bool to str2bool 2021-08-07 15:43:05 +08:00
MissPenguin 5487ab7a77
Merge pull request #3333 from LDOUBLEV/test_v7
add new ci shell
2021-08-04 19:28:43 +08:00
LDOUBLEV dad8397fd3 Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into test_v7 2021-08-04 02:54:45 +00:00
fengshuai03 fdc808ba6a add dynamic_input for pact 2021-08-03 20:43:01 +08:00
WenmuZhou 22d81cebac Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into fx_pse 2021-08-03 18:59:15 +08:00
Double_V da5d7ee397
Merge pull request #3496 from fengxiaoshuai/dynameic_shape_change
change dynameic shape
2021-08-03 16:58:39 +08:00
LDOUBLEV 44826b515a cherry-pick 3505 2021-08-02 12:18:49 +00:00
fengshuai03 ef103a5956 change dynameic shape 2021-08-02 07:24:37 +00:00
WenmuZhou 026f96b657 add export model of pse 2021-07-29 19:33:47 +08:00
WenmuZhou a6a44ea124 add export model of pse 2021-07-29 19:31:30 +08:00
LDOUBLEV 09e7211082 fix bugs and adjust warmup times from 10 to 2 to speed up 2021-07-20 06:47:18 +00:00
zhoujun 07026825ea
Merge pull request #3289 from WenmuZhou/fx_pse
fix a bug of train log not save and add filepath check to dataset
2021-07-19 17:11:55 +08:00
zhoujun 4dbbfd6739
Merge pull request #3338 from WenmuZhou/fx_bug
fix bug
2021-07-19 11:13:13 +08:00
WenmuZhou 57556882ff fix bug 2021-07-14 18:19:52 +08:00
zhoujun 180f7d0051
Merge pull request #3325 from WenmuZhou/fx_bug
fix starttime no define error
2021-07-14 18:17:43 +08:00
LDOUBLEV 9d5d552b79 delete save_log_path and set logger 2021-07-14 06:18:29 +00:00
WenmuZhou 41f73e31bc fix starttime noe define error 2021-07-13 12:23:41 +08:00
xiaoting fddef3912f
Merge branch 'dygraph' into autolog_rec 2021-07-09 14:14:24 +08:00
tink2123 7c9a5bd68c fix args 2021-07-08 16:34:05 +08:00
Double_V 4066478ea4
fix precision 2021-07-08 11:56:52 +08:00
WenmuZhou 61e77849f2 fix a bug of train log not save 2021-07-07 18:59:52 +08:00
LDOUBLEV 10e3729fd5 minsubgraph_size 3 to 10 2021-07-06 14:49:38 +08:00
littletomatodonkey 51193f8820 fix bug of inference 2021-07-06 14:03:03 +08:00
tink2123 e51e2b2bb9 add autolog for infer_rec 2021-07-06 13:11:27 +08:00
LDOUBLEV 902ee2c483 fix comment and delete shrink memory 2021-07-05 06:04:41 +00:00
LDOUBLEV 4042247c97 fix ci and output 2021-07-05 03:51:14 +00:00
LDOUBLEV 65118f3099 fix trt dynamic shape 2021-07-05 03:33:10 +00:00
MissPenguin 9c813bb332
Merge pull request #3218 from WenmuZhou/copy_paste
add copy paste
2021-07-01 15:45:00 +08:00
WenmuZhou 7d4805468e add get_rotate_crop_image 2021-07-01 14:36:33 +08:00
Double_V 5661c6865c
Merge pull request #3182 from LDOUBLEV/autolog
enhance auto_log
2021-07-01 11:52:56 +08:00
WenmuZhou f1f5a4d255 merge dygraph 2021-06-30 18:04:50 +08:00
WenmuZhou ac8c2a8946 merge dygraph 2021-06-30 10:55:05 +08:00
WenmuZhou 88a8be1297 add assert 2021-06-30 10:50:13 +08:00
WenmuZhou fdaf1f1577 Extraction get_rotate_crop_image 2021-06-30 10:45:27 +08:00
Double_V cdd98d085f
Update predict_det.py 2021-06-29 10:01:24 +08:00
LDOUBLEV 602b6c1878 Merge branch 'fix_infer_mode' of https://github.com/LDOUBLEV/PaddleOCR into fix_infer_mode 2021-06-28 21:57:47 +08:00
LDOUBLEV d87be123d2 delete benchmark_util 2021-06-28 21:56:59 +08:00
Double_V ade33ef3d1
Merge branch 'dygraph' into fix_infer_mode 2021-06-28 20:35:14 +08:00
Double_V e4d49819e2
Merge branch 'dygraph' into autolog 2021-06-28 20:34:37 +08:00
LDOUBLEV 586775a945 delete benchmark 2021-06-28 20:19:10 +08:00
LDOUBLEV 729ff65f68 Merge branch 'autolog' of https://github.com/LDOUBLEV/PaddleOCR into autolog 2021-06-28 09:11:06 +00:00
LDOUBLEV b37c597d17 fix subprocess error 2021-06-28 09:10:10 +00:00
LDOUBLEV fa2d08f211 add elapse to cls 2021-06-28 13:50:29 +08:00
LDOUBLEV b88349335b delete benchmark 2021-06-28 13:47:25 +08:00
Double_V 465ef3bffd
Merge branch 'dygraph' into bm_dyg 2021-06-28 11:05:24 +08:00
xiaoting bc99998693
Merge pull request #3185 from LDOUBLEV/fix_vis
save visualized image
2021-06-25 10:13:12 +08:00
LDOUBLEV 42853ff0de save visualized image 2021-06-24 12:00:58 +00:00
Double_V f8441cffa4
Update predict_det.py 2021-06-24 17:48:58 +08:00
Double_V 4c52e3857d
Update predict_det.py 2021-06-24 17:48:36 +08:00
LDOUBLEV ea60a03487 enhance auto_log 2021-06-24 07:18:08 +00:00
WenmuZhou bf1a716855 rename structure 2 table 2021-06-23 12:28:32 +08:00
MissPenguin 6e1cfb0525 fix cpu infer error for table structure 2021-06-22 08:39:03 +00:00
xiaoting 8fbc59d233
Merge pull request #3061 from LDOUBLEV/warmup
add warmup
2021-06-18 16:52:31 +08:00
LDOUBLEV 7588fc082a delete benchmark utils 2021-06-17 02:24:00 +00:00
LDOUBLEV 13f5ee1e93 revert mp process, test=develop 2021-06-16 10:04:27 +08:00
WenmuZhou 5cce398ebb fix structure pipeline infer bug 2021-06-10 17:12:14 +08:00
LDOUBLEV ab0b1ace8f add params min_subgraph_size 2021-06-10 14:29:56 +08:00
LDOUBLEV 96a53fb4be add params min_subgraph_size 2021-06-10 14:29:06 +08:00
WenmuZhou 037e17fc82 merge dygraph 2021-06-10 14:24:59 +08:00
LDOUBLEV 616ad6a179 fix tps and fix trt 2021-06-09 19:15:57 +08:00
zhoujun 3302a0b1ad
Revert "add table eval and predict script" (#3062) 2021-06-09 19:06:44 +08:00
LDOUBLEV 796898e0f8 adjust the min_subgraph_size for trt 2021-06-09 18:22:29 +08:00
LDOUBLEV 7ad663119a fix save_log_path as null 2021-06-09 18:20:36 +08:00
Double_V 7f102639b6
Merge branch 'dygraph' into warmup 2021-06-09 14:54:08 +08:00
LDOUBLEV 1de1f30a97 add warmup 2021-06-09 13:27:13 +08:00
Double_V aa1d40b1d9
Merge branch 'dygraph' into bm_dyg 2021-06-09 13:09:07 +08:00
WenmuZhou 0ee6137d75 del pad 2021-06-08 15:28:40 +08:00
WenmuZhou dec76eb75d add pad for small image in det 2021-06-08 10:52:47 +08:00
Double_V b796c91649
Merge branch 'dygraph' into bm_dyg 2021-06-07 13:50:36 +08:00
WenmuZhou bc0d766425 init commit for paddlestructure 2021-06-05 22:00:17 +08:00
WenmuZhou 794362481e add table eval and predict script 2021-06-03 16:39:31 +08:00
WenmuZhou bb5c6f3b2c slim code 2021-06-02 20:10:59 +08:00
WenmuZhou f896d5afa4 merge upstream 2021-06-01 19:09:24 +08:00
WenmuZhou 359d81e585 change infer args format from dict to list 2021-05-28 17:31:48 +08:00
LDOUBLEV c8cc0fb4b7 pre-commit 2021-05-26 10:55:53 +00:00
LDOUBLEV 0fd13fa410 process else 2021-05-26 10:54:54 +00:00
LDOUBLEV b8972b3675 add python benchmark for ocr 2021-05-26 10:40:16 +00:00
WenmuZhou eaf38b9b12 combine args in paddleocr and ppocr/infer/utility 2021-05-26 17:34:47 +08:00
LDOUBLEV 0707f74348 delete debug code 2021-05-26 07:36:44 +00:00
LDOUBLEV c946b386fd add trt min max opt shape 2021-05-26 07:18:40 +00:00
LDOUBLEV 9a68a6123a fix hub server error 2021-05-26 07:09:52 +00:00
LDOUBLEV 16d70fb74b add cpu_math_library_num_threads params 2021-05-26 07:08:56 +00:00
MissPenguin 64a3580f1b
Modify the resize operation to be consistent with the python version (#2651) 2021-04-27 00:08:53 +08:00
littletomatodonkey eafb157a05 add py impl of pr 2574 2021-04-23 08:23:24 +00:00
Jethong be5fdae573 fix config format 2021-04-14 15:02:54 +08:00
Jethong 84e25c556b fix dygraph infer post process 2021-04-12 18:59:05 +08:00
MissPenguin 3563c0f91f
Merge pull request #2429 from littletomatodonkey/dev/add_thread_pred
add supprt for multi process inference
2021-04-09 23:23:38 +08:00
littletomatodonkey 3de964a4b8 fix print 2021-04-09 12:30:42 +00:00
littletomatodonkey d6eb34f65c fix infer 2021-04-09 12:28:49 +00:00
littletomatodonkey 916cec34c6 unify predict mp and sp 2021-04-09 11:50:01 +00:00
littletomatodonkey 76320bf0db Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into dev/add_thread_pred 2021-04-09 10:29:21 +00:00
littletomatodonkey e19bedf523 fix infer 2021-04-09 10:28:06 +00:00
littletomatodonkey 86f4abf7d5 add supprt for multi process inference 2021-04-09 10:19:34 +00:00
zhoujun 52f45bc357
Merge branch 'dygraph' into dygraph_rc 2021-04-09 18:12:37 +08:00
Jethong a0d1f9236d add different post process 2021-04-09 16:04:02 +08:00
Jethong 6824db26e7 fix errors and add pretrain_model 2021-04-07 12:26:05 +08:00
Jethong f698142542 Merge branch 'pgnet-v1' of github.com:JetHong/PaddleOCR into pgnet-v1 2021-03-19 12:06:21 +08:00
Jethong 88964dc92f add visual png 2021-03-19 11:59:35 +08:00
Double_V 93c919e644
Merge branch 'dygraph' into pgnet-v1 2021-03-15 14:18:48 +08:00
Jethong 9711111270 fix error 2021-03-15 13:58:53 +08:00
WenmuZhou a0fd1a48a1 fix srn infer error when use custom max_text_length 2021-03-12 17:15:48 +08:00
Double_V e0908dd523
Merge branch 'dygraph' into fix_mem 2021-03-12 11:07:04 +08:00
LDOUBLEV 4c9d141c6f enable memory optim 2021-03-11 16:44:24 +08:00
WenmuZhou 1271db6d7c fix mem 2021-03-11 15:24:49 +08:00
LDOUBLEV 87f0aeed70 fix gap between train_model predict and inference 2021-02-24 15:09:37 +08:00
littletomatodonkey 3ce97f18ec
fix predict rec (#2065)
* fix predict rec

* fix lopp
2021-02-22 15:12:32 +08:00
LDOUBLEV cf550d0524 set dilation as False 2021-02-18 19:00:30 +08:00
LDOUBLEV bbd7665c47 fix commit 2021-02-18 18:53:28 +08:00
LDOUBLEV 5fc33c1213 keep dilation as False 2021-02-18 18:45:53 +08:00
LDOUBLEV bbdbf598d4 keep dilation as False 2021-02-18 18:42:47 +08:00
LDOUBLEV 6ec9aa4def Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into trt_cpp 2021-02-18 13:44:13 +08:00
WenmuZhou 4eb351866c predict_rec support rare 2021-02-08 14:05:48 +08:00
LDOUBLEV adc83ca9ae opt deploy doc 2021-02-02 21:08:13 +08:00
LDOUBLEV 56cbbdfb01 fix conflict 2021-02-01 03:19:56 +00:00
LDOUBLEV f896032255 pre-commit 2021-02-01 03:12:38 +00:00
xiaoting 6ebbbfe46c
Merge branch 'dygraph' into dygraph_for_srn 2021-01-29 11:37:19 +08:00
tink2123 8f52a73718 polish code 2021-01-26 15:24:13 +08:00
zhoujun 499ae66003 update utility 2021-01-01 21:53:15 +08:00
zhoujun c03b0b0604
Update utility.py 2020-12-31 16:31:21 +08:00
tink2123 c1fd46641e add srn for dygraph 2020-12-30 16:15:49 +08:00
LDOUBLEV 2a04e1a12a add export to limit GPU-memory-usage 2020-12-22 15:57:21 +08:00
WenmuZhou 3a0090dc00 delete fluid 2020-12-21 17:13:32 +08:00
WenmuZhou 59af7359be inference adaptation 2.0 2020-12-21 17:10:00 +08:00
WenmuZhou 7f76986c28 Remove duplicate definitions 2020-12-18 18:29:13 +08:00
zhoujun 0492ba4f86
Merge pull request #1503 from LDOUBLEV/dyg_db
add tensorrt args
2020-12-18 15:39:48 +08:00
LDOUBLEV 9039cca26d add tensorrt args 2020-12-18 15:27:44 +08:00
MissPenguin 263a9fc5d4
Merge pull request #1498 from MissPenguin/dygraph
fix sast inference bug
2020-12-18 14:12:11 +08:00
MissPenguin d489d3c27d fix sast inference bug 2020-12-18 03:40:22 +00:00
LDOUBLEV a6fd8f8066 adjust cls_batch_num to 6 for speed-up 2020-12-18 11:11:02 +08:00
LDOUBLEV 65b4cc0cf3 adjust rec_batch_num as 1 2020-12-17 20:58:23 +08:00
WenmuZhou 41c2af4924 update predict_det 2020-12-16 00:03:50 +08:00
WenmuZhou d3b609ee09 change DBHead output to dict 2020-12-15 23:49:50 +08:00
MissPenguin c9a8cd83b1 fix db eval 2020-12-15 14:13:04 +00:00
MissPenguin b596e70f14 fix db eval 2020-12-15 14:11:02 +00:00
MissPenguin 3f64d27b71 update inference for east & sast 2020-12-15 12:54:02 +00:00
MissPenguin edc0fd0ccd fix predict_det 2020-12-13 06:18:26 +00:00
WenmuZhou c12259091e Fix printing problem when multi-image prediction 2020-12-12 20:10:19 +08:00
WenmuZhou 4fd696ccdf update inference model name 2020-12-09 23:55:38 +08:00
MissPenguin 055f207fcf
Merge pull request #1371 from tink2123/update_multi
update multi dic and export
2020-12-09 20:37:35 +08:00
tink2123 7eeef5933c update multi dic and export 2020-12-09 11:56:37 +00:00
MissPenguin 45f90e9431
Merge pull request #1338 from WenmuZhou/dygraph_rc
[Dygraph] add hub serving
2020-12-09 15:46:53 +08:00
WenmuZhou 28b2d43e57 paddleocr whl adaptation dygraph 2020-12-07 19:10:19 +08:00
WenmuZhou 5d9c03890b merge upstream 2020-12-07 13:10:12 +08:00
WenmuZhou 2c8ba6a961 merge upstream 2020-12-07 12:51:40 +08:00
WenmuZhou 38f27a5339 merge upstream 2020-12-07 12:38:44 +08:00
zhoujun 99ee41d8db
Merge pull request #1299 from WenmuZhou/fix_predict_system
add predict_cls to predict_system
2020-12-06 20:28:37 -06:00
WenmuZhou 34cd39194d use logger.info replace print 2020-12-02 15:55:28 +08:00
WenmuZhou a804a97c92 add drop_score to args 2020-12-02 15:55:15 +08:00
WenmuZhou e696c7906d delete debug code 2020-12-02 15:53:55 +08:00
zhoujun 2985e7b897
use cls_batch_num replace rec_batch_num (#1298) 2020-12-02 12:22:41 +08:00
WenmuZhou a621bef893 add predict_cls to predict_system 2020-12-01 16:45:45 +08:00
WenmuZhou 902606499b add predict_cls to predict_system 2020-12-01 16:42:10 +08:00
WenmuZhou 1c43e8bbb4 Adapt to windows 2020-11-30 16:54:18 +08:00
WenmuZhou a44c2a699f Adapt to windows 2020-11-30 16:48:51 +08:00
WenmuZhou 835bfa456c Remove the channel conversion of the image and keep it consistent with the training phase 2020-11-27 15:29:14 +08:00
WenmuZhou 05dcfdec68 Fix the bug that the predict time is calculated incorrectly 2020-11-27 15:28:31 +08:00
WenmuZhou 0c287c41ea python端预测完成 2020-11-17 17:28:28 +08:00
WenmuZhou 4950c8458d 添加方向分类器 2020-11-17 12:54:24 +08:00
WenmuZhou 453c6f68bd 识别模型inference 2020-11-12 12:07:41 +08:00
WenmuZhou 4402e62959 修正export_model里的bug,添加predict_det 2020-11-09 18:19:30 +08:00
WenmuZhou 6241b8f9ca 添加静态图的create_predictor 2020-10-22 19:03:24 +08:00
WenmuZhou 60711bafe2 添加静态图的create_predictor 2020-10-22 18:24:42 +08:00
WenmuZhou aad3093a91 dygraph first commit 2020-10-13 17:13:33 +08:00
dyning 0791714b91
Merge pull request #594 from WenmuZhou/whl1
添加whl包的构建方式
2020-08-24 18:45:50 +08:00
littletomatodonkey 0a011e564a add python interface 2020-08-24 02:11:17 +00:00
zhoujun 3b1ecb1339
Update predict_system.py 2020-08-22 20:15:56 +08:00
WenmuZhou 684676f611 init commit for build whl 2020-08-22 19:42:14 +08:00
littletomatodonkey 3ebebae3e5 replace zero_copy_run to run for memory leak 2020-08-22 07:13:06 +00:00
MissPenguin 75cdc7dc9a
Merge pull request #519 from ZhangXinNan/zxdev
修改路径为绝对问题
2020-08-19 13:52:47 +08:00
licx 0c3b5d8e76 fix bug in predict_det for sast & update docs 2020-08-18 20:32:00 +08:00