Merge pull request #1320 from ninetailskim/devddd

avoiding conflicts when thirdparty set parameters which not in paddleocr

paddleocr.py

@@ -117,12 +117,15 @@ def maybe_download(model_storage_directory, url):
         os.remove(tmp_path)
 
 
-def parse_args(add_help=True):
+
+def parse_args(mMain=True,add_help=True):
+
     import argparse
 
     def str2bool(v):
         return v.lower() in ("true", "t", "1")
 
+    if mMain:
         parser = argparse.ArgumentParser(add_help=add_help)
         # params for prediction engine
         parser.add_argument("--use_gpu", type=str2bool, default=True)
@@ -170,8 +173,45 @@ def parse_args(add_help=True):
         parser.add_argument("--lang", type=str, default='ch')
         parser.add_argument("--det", type=str2bool, default=True)
         parser.add_argument("--rec", type=str2bool, default=True)
-    parser.add_argument("--use_angle_cls", type=str2bool, default=False)
+        parser.add_argument("--use_angle_cls", type=str2bool, default=True)
         return parser.parse_args()
+    else:
+        return argparse.Namespace(  use_gpu=True,
+                                    ir_optim=True, 
+                                    use_tensorrt=False, 
+                                    gpu_mem=8000, 
+                                    image_dir='',
+                                    det_algorithm='DB',
+                                    det_model_dir=None,
+                                    det_max_side_len=960,
+                                    det_db_thresh=0.3,
+                                    det_db_box_thresh=0.5,
+                                    det_db_unclip_ratio=2.0,
+                                    det_east_score_thresh=0.8,
+                                    det_east_cover_thresh=0.1,
+                                    det_east_nms_thresh=0.2,
+                                    rec_algorithm='CRNN',
+                                    rec_model_dir=None,
+                                    rec_image_shape="3, 32, 320",
+                                    rec_char_type='ch',
+                                    rec_batch_num=30,
+                                    max_text_length=25,
+                                    rec_char_dict_path=None,
+                                    use_space_char=True,
+                                    cls_model_dir=None,
+                                    cls_image_shape="3, 48, 192",
+                                    label_list=['0', '180'],
+                                    cls_batch_num=30,
+                                    cls_thresh=0.9,
+                                    enable_mkldnn=False,
+                                    use_zero_copy_run=False,
+                                    use_pdserving=False,
+                                    lang='ch',
+                                    det=True,
+                                    rec=True,
+                                    use_angle_cls=True
+                                    )
+
 
 
 class PaddleOCR(predict_system.TextSystem):
@@ -181,7 +221,7 @@ class PaddleOCR(predict_system.TextSystem):
         args:
             **kwargs: other params show in paddleocr --help
         """
-        postprocess_params = parse_args(add_help=False)
+        postprocess_params = parse_args(mMain=False, add_help=False)
         postprocess_params.__dict__.update(**kwargs)
         self.use_angle_cls = postprocess_params.use_angle_cls
         lang = postprocess_params.lang
@@ -259,12 +299,13 @@ class PaddleOCR(predict_system.TextSystem):
 
 def main():
     # for com
-    args = parse_args()
+    args = parse_args(mMain=True)
     image_file_list = get_image_file_list(args.image_dir)
     if len(image_file_list) == 0:
         logger.error('no images find in {}'.format(args.image_dir))
         return
-    ocr_engine = PaddleOCR()
+
+    ocr_engine = PaddleOCR(**(args.__dict__))
     for img_path in image_file_list:
         print(img_path)
         result = ocr_engine.ocr(img_path,