fix structure pipeline infer bug

paddleocr.py

@@ -151,8 +151,8 @@ def __init__(self, **kwargs):
  """
  params = parse_args(mMain=False)
  params.__dict__.update(**kwargs)
- if params.show_log:
- logger.setLevel(logging.DEBUG)
+ if not params.show_log:
+ logger.setLevel(logging.INFO)
  self.use_angle_cls = params.use_angle_cls
  lang = params.lang
  latin_lang = [

ppocr/utils/logging.py

@@ -22,7 +22,7 @@
 
 
 @functools.lru_cache()
-def get_logger(name='root', log_file=None, log_level=logging.INFO):
+def get_logger(name='root', log_file=None, log_level=logging.DEBUG):
  """Initialize and get a logger by name.
  If the logger has not been initialized, this method will initialize the
  logger by adding one or two handlers, otherwise the initialized logger will

ppstructure/paddlestructure.py

@@ -66,8 +66,8 @@ class PaddleStructure(OCRSystem):
  def __init__(self, **kwargs):
  params = parse_args(mMain=False)
  params.__dict__.update(**kwargs)
- if params.show_log:
- logger.setLevel(logging.DEBUG)
+ if not params.show_log:
+ logger.setLevel(logging.INFO)
  params.use_angle_cls = False
  # init model dir
  params.det_model_dir, det_url = confirm_model_dir_url(params.det_model_dir,

ppstructure/predict_system.py

@@ -24,14 +24,15 @@
 import cv2
 import numpy as np
 import time
+import logging
 
 import layoutparser as lp
 
 from ppocr.utils.utility import get_image_file_list, check_and_read_gif
 from ppocr.utils.logging import get_logger
 from tools.infer.predict_system import TextSystem
 from ppstructure.table.predict_table import TableSystem, to_excel
-from ppstructure.utility import parse_args,draw_result
+from ppstructure.utility import parse_args, draw_result
 
 logger = get_logger()
 
@@ -40,6 +41,8 @@ class OCRSystem(object):
  def __init__(self, args):
  args.det_limit_type = 'resize_long'
  args.drop_score = 0
+ if not args.show_log:
+ logger.setLevel(logging.INFO)
  self.text_system = TextSystem(args)
  self.table_system = TableSystem(args, self.text_system.text_detector, self.text_system.text_recognizer)
  self.table_layout = lp.PaddleDetectionLayoutModel("lp:https://PubLayNet/ppyolov2_r50vd_dcn_365e_publaynet/config",
@@ -67,6 +70,7 @@ def __call__(self, img):
  res_list.append({'type': region.type, 'bbox': [x1, y1, x2, y2], 'res': res})
  return res_list
 
+
 def save_res(res, save_folder, img_name):
  excel_save_folder = os.path.join(save_folder, img_name)
  os.makedirs(excel_save_folder, exist_ok=True)
@@ -105,7 +109,7 @@ def main(args):
  starttime = time.time()
  res = structure_sys(img)
  save_res(res, save_folder, img_name)
- draw_img = draw_result(img,res, args.vis_font_path)
+ draw_img = draw_result(img, res, args.vis_font_path)
  cv2.imwrite(os.path.join(save_folder, img_name, 'show.jpg'), draw_img)
  logger.info('result save to {}'.format(os.path.join(save_folder, img_name)))
  elapse = time.time() - starttime

tools/infer/predict_system.py

@@ -24,6 +24,7 @@
 import copy
 import numpy as np
 import time
+import logging
 from PIL import Image
 import tools.infer.utility as utility
 import tools.infer.predict_rec as predict_rec
@@ -38,6 +39,9 @@
 
 class TextSystem(object):
  def __init__(self, args):
+ if not args.show_log:
+ logger.setLevel(logging.INFO)
+
  self.text_detector = predict_det.TextDetector(args)
  self.text_recognizer = predict_rec.TextRecognizer(args)
  self.use_angle_cls = args.use_angle_cls
@@ -88,7 +92,7 @@ def __call__(self, img, cls=True):
  ori_im = img.copy()
  dt_boxes, elapse = self.text_detector(img)
 
- logger.info("dt_boxes num : {}, elapse : {}".format(
+ logger.debug("dt_boxes num : {}, elapse : {}".format(
 
  len(dt_boxes), elapse))
  if dt_boxes is None:
@@ -104,11 +108,11 @@ def __call__(self, img, cls=True):
  if self.use_angle_cls and cls:
  img_crop_list, angle_list, elapse = self.text_classifier(
  img_crop_list)
- logger.info("cls num : {}, elapse : {}".format(
+ logger.debug("cls num : {}, elapse : {}".format(
  len(img_crop_list), elapse))
 
  rec_res, elapse = self.text_recognizer(img_crop_list)
- logger.info("rec_res num : {}, elapse : {}".format(
+ logger.debug("rec_res num : {}, elapse : {}".format(
  len(rec_res), elapse))
  # self.print_draw_crop_rec_res(img_crop_list, rec_res)
  filter_boxes, filter_rec_res = [], []