replace path.join for windows

PaddlePaddle · Apr 14, 2021 · dda96fc · dda96fc
1 parent 579b66b
commit dda96fc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git 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)
 
 
 <a name="文本方向分类模型"></a>

diff --git 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)
 
 
 <a name="Angle"></a>

diff --git a/doc/imgs_results/multi_lang/img_01.jpg b/doc/imgs_results/multi_lang/img_01.jpg
diff --git a/doc/imgs_results/multi_lang/img_02.jpg b/doc/imgs_results/multi_lang/img_02.jpg
diff --git a/paddleocr.py b/paddleocr.py
@@ -117,7 +117,7 @@
 }
 
 SUPPORT_DET_MODEL = ['DB']
-VERSION = 2.1
+VERSION = '2.1'
 SUPPORT_REC_MODEL = ['CRNN']
 BASE_DIR = os.path.expanduser("~/.paddleocr/")
 
@@ -315,14 +315,13 @@ def __init__(self, **kwargs):
 
  # 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,