diff --git a/configs/det/det_mv3_east.yml b/configs/det/det_mv3_east.yml index b1129ce999ce7bad29604463a501fa0beed3fff5..b6f37256291912757cd1d5b98d1f745d08452fd6 100755 --- a/configs/det/det_mv3_east.yml +++ b/configs/det/det_mv3_east.yml @@ -11,7 +11,7 @@ Global: test_batch_size_per_card: 16 image_shape: [3, 512, 512] reader_yml: ./configs/det/det_east_icdar15_reader.yml - pretrain_weights: ./pretrain_models/MobileNetV3_pretrained/MobileNetV3_large_x0_5_pretrained/ + pretrain_weights: ./pretrain_models/MobileNetV3_large_x0_5_pretrained/ checkpoints: save_res_path: ./output/det_east/predicts_east.txt save_inference_dir: @@ -42,4 +42,4 @@ PostProcess: score_thresh: 0.8 cover_thresh: 0.1 nms_thresh: 0.2 - \ No newline at end of file + diff --git a/configs/det/det_r50_vd_db.yml b/configs/det/det_r50_vd_db.yml index 78550411ad1746833a46a6bad1fd68e0a65d4754..6e3b3b9e264b29fcac2b2b9b20ee2f88d5c975f3 100755 --- a/configs/det/det_r50_vd_db.yml +++ b/configs/det/det_r50_vd_db.yml @@ -11,7 +11,7 @@ Global: test_batch_size_per_card: 16 image_shape: [3, 640, 640] reader_yml: ./configs/det/det_db_icdar15_reader.yml - pretrain_weights: ./pretrain_models/ResNet50_vd_pretrained/ + pretrain_weights: ./pretrain_models/ResNet50_vd_ssld_pretrained/ save_res_path: ./output/det_db/predicts_db.txt checkpoints: save_inference_dir: @@ -50,4 +50,4 @@ PostProcess: box_thresh: 0.7 max_candidates: 1000 unclip_ratio: 1.5 - \ No newline at end of file + diff --git a/configs/det/det_r50_vd_east.yml b/configs/det/det_r50_vd_east.yml index f0f6e4a47dd28ec7535f8c4b27d107083eeebd6c..bb16f9fa12424db293ba498e78b00f279f1a7ff6 100755 --- a/configs/det/det_r50_vd_east.yml +++ b/configs/det/det_r50_vd_east.yml @@ -11,7 +11,7 @@ Global: test_batch_size_per_card: 16 image_shape: [3, 512, 512] reader_yml: ./configs/det/det_east_icdar15_reader.yml - pretrain_weights: ./pretrain_models/ResNet50_vd_pretrained/ + pretrain_weights: ./pretrain_models/ResNet50_vd_ssld_pretrained/ save_res_path: ./output/det_east/predicts_east.txt checkpoints: save_inference_dir: @@ -41,4 +41,4 @@ PostProcess: score_thresh: 0.8 cover_thresh: 0.1 nms_thresh: 0.2 - \ No newline at end of file + diff --git a/doc/detection.md b/doc/detection.md index 71034876b42efff5053f36e5ea21f6652356063e..fce534d1b406d9fb06d94d12c831de22ff70a481 100644 --- a/doc/detection.md +++ b/doc/detection.md @@ -16,7 +16,7 @@ wget -P ./train_data/ https://paddleocr.bj.bcebos.com/dataset/test_icdar2015_la 解压数据集和下载标注文件后,PaddleOCR/train_data/ 有两个文件夹和两个文件,分别是: ``` -/PaddleOCR/train_data/ +/PaddleOCR/train_data/icdar2015/text_localization/ └─ icdar_c4_train_imgs/ icdar数据集的训练数据 └─ ch4_test_images/ icdar数据集的测试数据 └─ train_icdar2015_label.txt icdar数据集的训练标注 @@ -79,10 +79,10 @@ python3 tools/eval.py -c configs/det/det_mv3_db.yml -o Global.checkpoints="./ou 测试单张图像的检测效果 ``` -python3 tools/infer_det.py -c config/det/det_mv3_db.yml -o TestReader.single_img_path="./doc/imgs_en/img_10.jpg" Global.checkpoints="./output/det_db/best_accuracy" +python3 tools/infer_det.py -c configs/det/det_mv3_db.yml -o TestReader.single_img_path="./doc/imgs_en/img_10.jpg" Global.checkpoints="./output/det_db/best_accuracy" ``` 测试文件夹下所有图像的检测效果 ``` -python3 tools/infer_det.py -c config/det/det_mv3_db.yml -o TestReader.single_img_path="./doc/imgs_en/" Global.checkpoints="./output/det_db/best_accuracy" +python3 tools/infer_det.py -c configs/det/det_mv3_db.yml -o TestReader.single_img_path="./doc/imgs_en/" Global.checkpoints="./output/det_db/best_accuracy" ``` diff --git a/doc/installation.md b/doc/installation.md index 8f4f3c3752bbf464a75f3c6d4e2fd5b7aeffce04..1c6fead80d1d69dd3bddd8ef3af2c8111b0412ca 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -20,7 +20,7 @@ sudo nvidia-docker run --name ppocr -v $PWD:/paddle --network=host -it hub.baidu sudo nvidia-docker container exec -it ppocr /bin/bash ``` -2. 安装PaddlePaddle Fluid v1.7或更高版本 +2. 安装PaddlePaddle Fluid v1.7(暂不支持更高版本,适配工作进行中) ``` pip3 install --upgrade pip diff --git a/tools/program.py b/tools/program.py index a114b1cbffa21358202c657caf90a107609ff9d1..67cef9bc259a18bf0ca514c95e731506302ed493 100755 --- a/tools/program.py +++ b/tools/program.py @@ -269,7 +269,9 @@ def train_eval_det_run(config, exe, train_info_dict, eval_info_dict): except fluid.core.EOFException: train_loader.reset() - + if epoch == 0 and save_epoch_step == 1: + save_path = save_model_dir + "/iter_epoch_0" + save_model(train_info_dict['train_program'],save_path) if epoch > 0 and epoch % save_epoch_step == 0: save_path = save_model_dir + "/iter_epoch_%d" % (epoch) save_model(train_info_dict['train_program'], save_path) @@ -346,7 +348,9 @@ def train_eval_rec_run(config, exe, train_info_dict, eval_info_dict): except fluid.core.EOFException: train_loader.reset() - + if epoch == 0 and save_epoch_step == 1: + save_path = save_model_dir + "/iter_epoch_0" + save_model(train_info_dict['train_program'],save_path) if epoch > 0 and epoch % save_epoch_step == 0: save_path = save_model_dir + "/iter_epoch_%d" % (epoch) save_model(train_info_dict['train_program'], save_path)