diff --git a/doc/doc_ch/models_list.md b/doc/doc_ch/models_list.md index 4842a8c57ba7893b5753cde04ae54399a45d8a56..0d0e287d311e4e057c5be2fb4cbc242e60041111 100644 --- a/doc/doc_ch/models_list.md +++ b/doc/doc_ch/models_list.md @@ -113,7 +113,7 @@ python3 generate_multi_language_configs.py -l it \ | cyrillic_mobile_v2.0_rec | 斯拉夫字母 | [rec_cyrillic_lite_train.yml](../../configs/rec/multi_language/rec_cyrillic_lite_train.yml) |2.6M|[推理模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/cyrillic_ppocr_mobile_v2.0_rec_infer.tar) / [训练模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/cyrillic_ppocr_mobile_v2.0_rec_train.tar) | | devanagari_mobile_v2.0_rec | 梵文字母 | [rec_devanagari_lite_train.yml](../../configs/rec/multi_language/rec_devanagari_lite_train.yml) |2.6M|[推理模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/devanagari_ppocr_mobile_v2.0_rec_infer.tar) / [训练模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/devanagari_ppocr_mobile_v2.0_rec_train.tar) | -更多支持语种请参考: [多语言模型](https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.1/doc/doc_ch/multi_languages.md#%E8%AF%AD%E7%A7%8D%E7%BC%A9%E5%86%99) +更多支持语种请参考: [多语言模型](./multi_languages.md) diff --git a/doc/doc_en/models_list_en.md b/doc/doc_en/models_list_en.md index 7d5b0d086fc7e8b329e4fba475bb36445d05d018..e45effdaf1468081ccb41b64816183fce973c84a 100644 --- a/doc/doc_en/models_list_en.md +++ b/doc/doc_en/models_list_en.md @@ -111,7 +111,7 @@ python3 generate_multi_language_configs.py -l it \ | cyrillic_mobile_v2.0_rec | Lightweight model for cyrillic recognition | [rec_cyrillic_lite_train.yml](../../configs/rec/multi_language/rec_cyrillic_lite_train.yml) |2.6M|[推理模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/cyrillic_ppocr_mobile_v2.0_rec_infer.tar) / [训练模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/cyrillic_ppocr_mobile_v2.0_rec_train.tar) | | devanagari_mobile_v2.0_rec | Lightweight model for devanagari recognition | [rec_devanagari_lite_train.yml](../../configs/rec/multi_language/rec_devanagari_lite_train.yml) |2.6M|[推理模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/devanagari_ppocr_mobile_v2.0_rec_infer.tar) / [训练模型](https://paddleocr.bj.bcebos.com/dygraph_v2.0/multilingual/devanagari_ppocr_mobile_v2.0_rec_train.tar) | -For more supported languages, please refer to : [Multi-language model](https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.1/doc/doc_en/multi_languages_en.md#4-support-languages-and-abbreviations) +For more supported languages, please refer to : [Multi-language model](./multi_languages_en.md) diff --git a/doc/imgs_results/multi_lang/img_01.jpg b/doc/imgs_results/multi_lang/img_01.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ee6ca69207f85bc3dac01a3b845462163d3cfd8d Binary files /dev/null and b/doc/imgs_results/multi_lang/img_01.jpg differ diff --git a/doc/imgs_results/multi_lang/img_02.jpg b/doc/imgs_results/multi_lang/img_02.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3e139c76bc101fc06a0eae85cc203f48c45c08e1 Binary files /dev/null and b/doc/imgs_results/multi_lang/img_02.jpg differ diff --git a/paddleocr.py b/paddleocr.py index d5b6a01ba1fa8b233652de9b972f88643e89c5d8..67ce202c5d75088a31202c2ae27f15160879f8c6 100644 --- a/paddleocr.py +++ b/paddleocr.py @@ -117,7 +117,7 @@ model_urls = { } SUPPORT_DET_MODEL = ['DB'] -VERSION = 2.1 +VERSION = '2.1' SUPPORT_REC_MODEL = ['CRNN'] BASE_DIR = os.path.expanduser("~/.paddleocr/") @@ -315,14 +315,13 @@ class PaddleOCR(predict_system.TextSystem): # init model dir if postprocess_params.det_model_dir is None: - postprocess_params.det_model_dir = os.path.join( - BASE_DIR, '{}/det/{}'.format(VERSION, det_lang)) + postprocess_params.det_model_dir = os.path.join(BASE_DIR, VERSION, + 'det', det_lang) if postprocess_params.rec_model_dir is None: - postprocess_params.rec_model_dir = os.path.join( - BASE_DIR, '{}/rec/{}'.format(VERSION, lang)) + postprocess_params.rec_model_dir = os.path.join(BASE_DIR, VERSION, + 'rec', lang) if postprocess_params.cls_model_dir is None: - postprocess_params.cls_model_dir = os.path.join( - BASE_DIR, '{}/cls'.format(VERSION)) + postprocess_params.cls_model_dir = os.path.join(BASE_DIR, 'cls') print(postprocess_params) # download model maybe_download(postprocess_params.det_model_dir,