Commit Graph

419 Commits

Author SHA1 Message Date
WenmuZhou b566bcbbaa add max_text_length to export model 2021-04-28 13:36:16 +08:00
littletomatodonkey 099957c907
fix eval laoder on win (#2654) 2021-04-27 10:32:17 +08:00
zhoujun c27022294e
add global_step to .states files (#2566)
Co-authored-by: littletomatodonkey <2120160898@bit.edu.cn>
2021-04-27 10:13:21 +08:00
MissPenguin 64a3580f1b
Modify the resize operation to be consistent with the python version (#2651) 2021-04-27 00:08:53 +08:00
littletomatodonkey 1b959e3eaa add save rec res 2021-04-25 12:53:29 +00:00
littletomatodonkey eafb157a05 add py impl of pr 2574 2021-04-23 08:23:24 +00:00
littletomatodonkey fb5f7f5eb4
fix loader cause it does not need to break (#2562)
* fix loader cause it does not need to be rebuild for each epoch

* fix loader for dynamic sample

* rm thin import
2021-04-20 23:47:40 +08: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
zhoujun 60ecbd0ba4
Merge branch 'dygraph' into fix_doc 2021-04-09 18:26:21 -05: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
zhoujun 3e289f6acf
Merge branch 'dygraph' into fix_doc 2021-04-09 18:12:00 +08:00
Jethong a0d1f9236d add different post process 2021-04-09 16:04:02 +08:00
Jethong 0cd48c35e5 Merge branch 'pgnet-v1' of github.com:JetHong/PaddleOCR into pgnet-v1 2021-04-07 12:27:53 +08:00
Jethong 6824db26e7 fix errors and add pretrain_model 2021-04-07 12:26:05 +08:00
zhoujun f5315349e7
Merge branch 'dygraph' into dygraph_rc 2021-03-30 16:27:03 +08:00
zhoujun d354020d2d
Merge branch 'dygraph' into fix_doc 2021-03-30 16:26:12 +08:00
Double_V 7171d78b31
Merge branch 'dygraph' into pgnet-v1 2021-03-30 16:21:41 +08:00
littletomatodonkey 9e7dc2b88e fix logger info for empty log 2021-03-24 06:32:38 +00:00
WenmuZhou 683cb55649 fix typo error 2021-03-22 12:54:17 +08:00
WenmuZhou ef620c2a20 remove unused func 2021-03-22 12:49:10 +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
Jethong 051fe64a0d fix config add e2e_ch.md e2e_res_img623_pg 2021-03-10 14:14:21 +08:00
Jethong bb49e1a53f ADD PGNet_v2 2021-03-08 15:11:57 +08:00
Jethong 1f76f449db Add PGNet 2021-03-08 14:55:49 +08:00
Double_V 08efbb9608
Merge branch 'dygraph' into dygraph 2021-03-02 17:01:49 +08:00
LDOUBLEV 85fd65c8f0 fix typo 2021-02-24 20:20:17 +08:00
tingquangao add9faa822 Fix the log about length of valid_dataloader 2021-02-24 07:42:20 +00: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
zhoujun 95a1c6176d
Merge pull request #1985 from WenmuZhou/fix_doc
fix rare export error and support rare infer
2021-02-08 14:23:35 +08:00
WenmuZhou 4eb351866c predict_rec support rare 2021-02-08 14:05:48 +08:00
tink2123 b658e10b35 fix srn for eval 2021-02-08 05:42:30 +00:00
xiaoting 895d44bc39
Merge pull request #1971 from tink2123/fix_eval_for_srn
polish code for srn eval
2021-02-07 15:32:56 +08:00
tink2123 ff6b193a61 polish code for srn eval 2021-02-07 07:31:24 +00:00
WenmuZhou 3b1703e3eb add dataset len check 2021-02-04 12:01:56 +08:00
WenmuZhou b9d3e8eeec add dataset len check 2021-02-04 11:33:48 +08:00
LDOUBLEV df1c97af80 fix bug 2021-02-02 21:27:48 +08:00
LDOUBLEV adc83ca9ae opt deploy doc 2021-02-02 21:08:13 +08:00
littletomatodonkey 077fcabcbc fix doc 2021-02-01 14:03:32 +00:00
MissPenguin dd6f6f5cf3
Merge pull request #1869 from LDOUBLEV/rare
upload rare code
2021-02-01 16:55:33 +08:00
iamyoyo be94977426
program.py 257行 变量名问题
PaddleOCR/tools/program.py的第254行的变量名原为cur_metirc,需要修改为cur_metric,如果不修改在运行是,会提示
The variable name of line 254 can be changed to cur_ Metric. If you do not modify it, you will be prompted when it is running
"E:\XXX\PaddleOCR\tools\program.py", line 257, in train
['{}: {}'.format(k, v) for k, v in cur_metric.items()]))
NameError: name 'cur_metric' is not defined
2021-02-01 15:27:56 +08:00
iamyoyo a92bb6d310
Update program.py
PaddleOCR/tools/program.py的第254行的变量名原为cur_metirc,需要修改为cur_metric,如果不修改在运行是,会提示
The variable name of line 254 can be changed to cur_ Metric. If you do not modify it, you will be prompted when it is running
"E:\XXX\PaddleOCR\tools\program.py", line 257, in train
    ['{}: {}'.format(k, v) for k, v in cur_metric.items()]))
NameError: name 'cur_metric' is not defined
2021-02-01 15:09:14 +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 2a0c3d4dac
fix eval mode without srn (#1889)
* fix base model

* fix start time
2021-01-31 22:37:30 +08:00
xiaoting 6ebbbfe46c
Merge branch 'dygraph' into dygraph_for_srn 2021-01-29 11:37:19 +08:00
zhoujun b0d1dca688
fix starnet export (#1850)
* fix starnet export

* fix bug

* add note
2021-01-28 18:16:54 +08:00
Channingss cacf8f8a6c export_model support dynamic input shape 2021-01-26 11:44:52 +00:00
xiaoting 1888ca2793
Merge pull request #1826 from tink2123/multi_lan_doc
update multi-lang doc
2021-01-26 15:59:58 +08:00
tink2123 8f52a73718 polish code 2021-01-26 15:24:13 +08:00
LDOUBLEV 09fd94e781 fix typo 2021-01-26 15:16:02 +08:00
xiaoting f214437538
Merge branch 'dygraph' into dygraph_for_srn 2021-01-26 13:29:13 +08:00
littletomatodonkey 9f581156d9 fix data replication for multi-cards sampling 2021-01-24 12:32:22 +00:00
tink2123 ed2f0de95e mv model_average to incubate 2021-01-22 03:15:56 +00:00
tink2123 93670ab5a2 all ready 2021-01-19 06:48:52 +00: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 297871d4be fix bugs 2020-12-30 19:54:16 +08:00
tink2123 c1fd46641e add srn for dygraph 2020-12-30 16:15:49 +08:00
littletomatodonkey de3e2e7cd3
add CyclicalCosineDecay (#1599) 2020-12-29 13:49:43 +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 ae12459015 Save configuration files and logs only during training 2020-12-18 18:51:19 +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 0ba5e95cc0 update hubserving 2020-12-14 11:42:00 +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 b5f9a7ec5b update link in doc 2020-12-11 18:48:23 +08:00
WenmuZhou 042034b61d The parameters of export are consistent with the static image 2020-12-10 17:14:58 +08:00
WenmuZhou 0ff2aef299 rename inference model save path 2020-12-09 23:59:29 +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 bbc52fc993 Merge branch 'dygraph_rc' of https://github.com/WenmuZhou/PaddleOCR into dygraph_rc 2020-11-30 12:22:57 +08:00
WenmuZhou ef0880b9ae delete save_inference_mode fun, because the dev paddle has support export crnn model 2020-11-28 22:56:10 +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 40023f76a6 修复ips和batch_cost输出错误的bug 2020-11-24 15:47:12 +08:00
WenmuZhou 0c287c41ea python端预测完成 2020-11-17 17:28:28 +08:00
WenmuZhou 4950c8458d 添加方向分类器 2020-11-17 12:54:24 +08:00
WenmuZhou 21fca149b2 添加空格 2020-11-16 19:02:00 +08:00
WenmuZhou e822901522 日志符合benchmark规范 2020-11-16 19:00:27 +08:00
WenmuZhou 453c6f68bd 识别模型inference 2020-11-12 12:07:41 +08:00
WenmuZhou 4d44b23043 识别模型导出 2020-11-12 12:06:46 +08:00
WenmuZhou 4402e62959 修正export_model里的bug,添加predict_det 2020-11-09 18:19:30 +08:00
WenmuZhou 89e031f0e7 添加infer_det和infer_rec 2020-11-09 16:40:24 +08:00
WenmuZhou 672318256c 删除eval多余的参数 2020-11-09 13:28:46 +08:00
WenmuZhou 4eba6c0dce 修复一些导致不可用的bug 2020-11-09 13:28:15 +08:00
WenmuZhou a414dd8649 fix write error 2020-11-06 19:15:21 +08:00
WenmuZhou 91dee973da change log name to root 2020-11-06 19:11:35 +08:00
WenmuZhou 2aa92e6a64 fix bug 2020-11-06 18:56:53 +08:00
dyning 1ae379198e trans to paddle-rc 2020-11-05 15:13:36 +08:00
dyning fa675f8954 updata structure of dygraph 2020-11-04 20:43:27 +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 a75a614a43 修复test_loader函数不可用的问题 2020-10-16 16:37:44 +08:00
WenmuZhou aad3093a91 dygraph first commit 2020-10-13 17:13:33 +08:00
xiaoting e3fd6db0bf
Merge branch 'develop' into adaptation_ch 2020-08-26 20:24:42 +08:00
tink2123 1b19050391 Adaptation of Chinese and r34/18 2020-08-25 15:04:49 +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