Merge pull request PaddlePaddle#2093 from WenmuZhou/fix_doc

Fix bug of use custom dict

paddleocr.py

@@ -236,7 +236,9 @@ def __init__(self, **kwargs):
  assert lang in model_urls[
  'rec'], 'param lang must in {}, but got {}'.format(
  model_urls['rec'].keys(), lang)
+ use_inner_dict = False
  if postprocess_params.rec_char_dict_path is None:
+ use_inner_dict = True
  postprocess_params.rec_char_dict_path = model_urls['rec'][lang][
  'dict_path']
 
@@ -263,9 +265,9 @@ def __init__(self, **kwargs):
  if postprocess_params.rec_algorithm not in SUPPORT_REC_MODEL:
  logger.error('rec_algorithm must in {}'.format(SUPPORT_REC_MODEL))
  sys.exit(0)
-
- postprocess_params.rec_char_dict_path = str(
- Path(__file__).parent / postprocess_params.rec_char_dict_path)
+ if use_inner_dict:
+  postprocess_params.rec_char_dict_path = str(
+  Path(__file__).parent / postprocess_params.rec_char_dict_path)
 
  # init det_model and rec_model
  super().__init__(postprocess_params)
@@ -282,8 +284,13 @@ def ocr(self, img, det=True, rec=True, cls=False):
  if isinstance(img, list) and det == True:
  logger.error('When input a list of images, det must be false')
  exit(0)
+ if cls == False:
+ self.use_angle_cls = False
+ elif cls == True and self.use_angle_cls == False:
+ logger.warning(
+ 'Since the angle classifier is not initialized, the angle classifier will not be uesd during the forward process'
+ )
 
- self.use_angle_cls = cls
  if isinstance(img, str):
  # download net image
  if img.startswith('http'):

setup.py

@@ -32,7 +32,7 @@ def readme():
  package_dir={'paddleocr': ''},
  include_package_data=True,
  entry_points={"console_scripts": ["paddleocr= paddleocr.paddleocr:main"]},
- version='2.0.2',
+ version='2.0.3',
  install_requires=requirements,
  license='Apache License 2.0',
  description='Awesome OCR toolkits based on PaddlePaddle （8.6M ultra-lightweight pre-trained model, support training and deployment among server, mobile, embeded and IoT devices',