Fixed merge conflict in README.md

112ad00d · Manan Goel · b7aa10e5 · 95ac9c0e · 112ad00d · 112ad00d
Commit 112ad00d authored Apr 23, 2022 by Manan Goel
19 changed files
--- a/doc/table/tableocr_pipeline_en.jpg
+++ b/doc/table/tableocr_pipeline_en.jpg
--- a/doc/vqa/input/zh_val_0.jpg
+++ b/doc/vqa/input/zh_val_0.jpg
--- a/doc/vqa/input/zh_val_21.jpg
+++ b/doc/vqa/input/zh_val_21.jpg
--- a/doc/vqa/input/zh_val_40.jpg
+++ b/doc/vqa/input/zh_val_40.jpg
--- a/doc/vqa/input/zh_val_42.jpg
+++ b/doc/vqa/input/zh_val_42.jpg
--- a/doc/vqa/result_re/zh_val_21_re.jpg
+++ b/doc/vqa/result_re/zh_val_21_re.jpg
--- a/doc/vqa/result_re/zh_val_40_re.jpg
+++ b/doc/vqa/result_re/zh_val_40_re.jpg
--- a/doc/vqa/result_ser/zh_val_0_ser.jpg
+++ b/doc/vqa/result_ser/zh_val_0_ser.jpg
--- a/doc/vqa/result_ser/zh_val_42_ser.jpg
+++ b/doc/vqa/result_ser/zh_val_42_ser.jpg
--- a/ppstructure/layout/README_ch.md
+++ b/ppstructure/layout/README_ch.md
--- a/ppstructure/table/README_ch.md
+++ b/ppstructure/table/README_ch.md
--- a/ppstructure/vqa/README.md
+++ b/ppstructure/vqa/README.md
--- a/test_tipc/configs/ch_PP-OCRv2_det_PACT/train_infer_python.txt
+++ b/test_tipc/configs/ch_PP-OCRv2_det_PACT/train_infer_python.txt
@@ -6,7 +6,7 @@ Global.use_gpu:True|True
 Global.auto_cast:fp32
 Global.epoch_num:lite_train_lite_infer=1|whole_train_whole_infer=500
 Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:lite_train_lite_infer=2|whole_train_whole_infer=4
+Train.loader.batch_size_per_card:lite_train_lite_infer=1|whole_train_whole_infer=4
 Global.pretrained_model:null
 train_model_name:latest
 train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/

--- a/test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt
+++ b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt
--- a/test_tipc/configs/rec_mv3_tps_bilstm_att_v2.0/train_infer_python.txt
+++ b/test_tipc/configs/rec_mv3_tps_bilstm_att_v2.0/train_infer_python.txt
--- a/test_tipc/configs/rec_r34_vd_tps_bilstm_att_v2.0/train_infer_python.txt
+++ b/test_tipc/configs/rec_r34_vd_tps_bilstm_att_v2.0/train_infer_python.txt
--- a/test_tipc/configs/rec_r50_fpn_vd_none_srn/train_infer_python.txt
+++ b/test_tipc/configs/rec_r50_fpn_vd_none_srn/train_infer_python.txt
--- a/test_tipc/test_inference_cpp.sh
+++ b/test_tipc/test_inference_cpp.sh
--- a/tools/infer/predict_rec.py
+++ b/tools/infer/predict_rec.py