diff --git a/doc/doc_en/multi_languages_en.md b/doc/doc_en/multi_languages_en.md index 3d786832080a885b57bb2deae838986c3c86f772..3f4f02266f4708efb7fdd3e9211678af7028c9df 100644 --- a/doc/doc_en/multi_languages_en.md +++ b/doc/doc_en/multi_languages_en.md @@ -2,8 +2,8 @@ **Recent Update** --2021.4.9 supports the detection and recognition of 80 languages --2021.4.9 supports **lightweight high-precision** English model detection and recognition +- 2021.4.9 supports the detection and recognition of 80 languages +- 2021.4.9 supports **lightweight high-precision** English model detection and recognition PaddleOCR aims to create a rich, leading, and practical OCR tool library, which not only provides Chinese and English models in general scenarios, but also provides models specifically trained @@ -25,21 +25,21 @@ The multilingual models cover Latin, Arabic, Traditional Chinese, Korean, Japane This document will briefly introduce how to use the multilingual model. --[1 Installation](#Install) - -[1.1 paddle installation](#paddleinstallation) - -[1.2 paddleocr package installation](#paddleocr_package_install) - --[2 Quick Use](#Quick_Use) - -[2.1 Command line operation](#Command_line_operation) - -[2.1.1 Prediction of the whole image](#bash_detection+recognition) - -[2.1.2 Recognition](#bash_Recognition) - -[2.1.3 Detection](#bash_detection) - -[2.2 python script running](#python_Script_running) - -[2.2.1 Whole image prediction](#python_detection+recognition) - -[2.2.2 Recognition](#python_Recognition) - -[2.2.3 Detection](#python_detection) --[3 Custom Training](#Custom_Training) --[4 Supported languages and abbreviations](#language_abbreviations) +- [1 Installation](#Install) + - [1.1 paddle installation](#paddleinstallation) + - [1.2 paddleocr package installation](#paddleocr_package_install) + +- [2 Quick Use](#Quick_Use) + - [2.1 Command line operation](#Command_line_operation) + - [2.1.1 Prediction of the whole image](#bash_detection+recognition) + - [2.1.2 Recognition](#bash_Recognition) + - [2.1.3 Detection](#bash_detection) + - [2.2 python script running](#python_Script_running) + - [2.2.1 Whole image prediction](#python_detection+recognition) + - [2.2.2 Recognition](#python_Recognition) + - [2.2.3 Detection](#python_detection) +- [3 Custom Training](#Custom_Training) +- [4 Supported languages and abbreviations](#language_abbreviations) ## 1 Installation @@ -89,7 +89,7 @@ The specific supported [language] (#language_abbreviations) can be viewed in the paddleocr --image_dir doc/imgs/japan_2.jpg --lang=japan ``` -![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.0/doc/imgs/japan_2.jpg) +![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.1/doc/imgs/japan_2.jpg) The result is a list, each item contains a text box, text and recognition confidence ```text @@ -106,7 +106,7 @@ The result is a list, each item contains a text box, text and recognition confid paddleocr --image_dir doc/imgs_words/japan/1.jpg --det false --lang=japan ``` -![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.0/doc/imgs_words/japan/1.jpg) +![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.1/doc/imgs_words/japan/1.jpg) The result is a tuple, which returns the recognition result and recognition confidence @@ -159,7 +159,7 @@ im_show.save('result.jpg') ``` Visualization of results: -![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.0/doc/imgs_results/korean.jpg) +![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.1/doc/imgs_results/korean.jpg) * Recognition @@ -173,7 +173,7 @@ for line in result: print(line) ``` -![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.0/doc/imgs_words/german/1.jpg) +![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.1/doc/imgs_words/german/1.jpg) The result is a tuple, which only contains the recognition result and recognition confidence @@ -208,7 +208,7 @@ The result is a list, each item contains only text boxes ``` Visualization of results: -![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.0/doc/imgs_results/whl/12_det.jpg) +![](https://raw.githubusercontent.com/PaddlePaddle/PaddleOCR/release/2.1/doc/imgs_results/whl/12_det.jpg) ppocr also supports direction classification. For more usage methods, please refer to: [whl package instructions](https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.0/doc/doc_ch/whl.md). diff --git a/tools/infer/predict_e2e.py b/tools/infer/predict_e2e.py index a5c57914173b7d44c9479f7bb120e4ff409b91e3..8b94f24a9ffa16ca5683795afa6392fa23c24a94 100755 --- a/tools/infer/predict_e2e.py +++ b/tools/infer/predict_e2e.py @@ -66,6 +66,7 @@ class TextE2E(object): postprocess_params["score_thresh"] = args.e2e_pgnet_score_thresh postprocess_params["character_dict_path"] = args.e2e_char_dict_path postprocess_params["valid_set"] = args.e2e_pgnet_valid_set + postprocess_params["mode"] = args.e2e_pgnet_mode self.e2e_pgnet_polygon = args.e2e_pgnet_polygon else: logger.info("unknown e2e_algorithm:{}".format(self.e2e_algorithm)) diff --git a/tools/infer/utility.py b/tools/infer/utility.py index b273eaf3258421d5c5c30c132f99e78f9f0999ba..9fa51d80b41ae80abe206ee779accd44d49cebba 100755 --- a/tools/infer/utility.py +++ b/tools/infer/utility.py @@ -86,6 +86,7 @@ def parse_args(): "--e2e_char_dict_path", type=str, default="./ppocr/utils/ic15_dict.txt") parser.add_argument("--e2e_pgnet_valid_set", type=str, default='totaltext') parser.add_argument("--e2e_pgnet_polygon", type=bool, default=True) + parser.add_argument("--e2e_pgnet_mode", type=str, default='fast') # params for text classifier parser.add_argument("--use_angle_cls", type=str2bool, default=False)