Merge remote-tracking branch 'origin/dygraph' into dygraph

test1/MANIFEST.in → ppstructure/MANIFEST.in

@@ -5,5 +5,5 @@ recursive-include ppocr/utils *.txt utility.py logging.py network.py
 recursive-include ppocr/data/ *.py
 recursive-include ppocr/postprocess *.py
 recursive-include tools/infer *.py
-recursive-include test1 *.py
+recursive-include ppstructure *.py
 

test1/api.md → ppstructure/README.md

@@ -10,7 +10,7 @@ pip3 install layoutparser-0.0.0-py3-none-any.whl
 
 PaddleStructure is a toolkit for complex layout text OCR, the process is as follows
 
-![pipeline](../doc/table/pipeline.png)
+![pipeline](../doc/table/pipeline.jpg)
 
 In PaddleStructure, the image will be analyzed by layoutparser first. In the layout analysis, the area in the image will be classified, and the OCR process will be carried out according to the category.
 

test1/api_ch.md → ppstructure/README_ch.md

@@ -9,7 +9,7 @@ pip3 install layoutparser-0.0.0-py3-none-any.whl
 ## 1. pipeline介绍
 
 PaddleStructure 是一个用于复杂板式文字OCR的工具包，流程如下
-![pipeline](../doc/table/pipeline.png)
+![pipeline](../doc/table/pipeline.jpg)
 
 在PaddleStructure中，图片会先经由layoutparser进行版面分析，在版面分析中，会对图片里的区域进行分类，根据根据类别进行对于的ocr流程。
 

test1/paddlestructure.py → ppstructure/paddlestructure.py

@@ -24,9 +24,9 @@ import numpy as np
 from pathlib import Path
 
 from ppocr.utils.logging import get_logger
-from test1.predict_system import OCRSystem, save_res
-from test1.table.predict_table import to_excel
-from test1.utility import init_args, draw_result
+from ppstructure.predict_system import OCRSystem, save_res
+from ppstructure.table.predict_table import to_excel
+from ppstructure.utility import init_args, draw_result
 
 logger = get_logger()
 from ppocr.utils.utility import check_and_read_gif, get_image_file_list
@@ -145,4 +145,4 @@ def main():
         for item in result:
             logger.info(item['res'])
         save_res(result, save_folder, img_name)
-        logger.info('result save to {}'.format(os.path.join(save_folder, img_name)))
+        logger.info('result save to {}'.format(os.path.join(save_folder, img_name)))
\ No newline at end of file

test1/predict_system.py → ppstructure/predict_system.py

@@ -31,8 +31,8 @@ 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 test1.table.predict_table import TableSystem, to_excel
-from test1.utility import parse_args, draw_result
+from ppstructure.table.predict_table import TableSystem, to_excel
+from ppstructure.utility import parse_args, draw_result
 
 logger = get_logger()
 

test1/setup.py → ppstructure/setup.py

@@ -23,14 +23,14 @@ with open('../requirements.txt', encoding="utf-8-sig") as f:
 
 
 def readme():
-    with open('api_ch.md', encoding="utf-8-sig") as f:
+    with open('README_ch.md', encoding="utf-8-sig") as f:
         README = f.read()
     return README
 
 
-shutil.copytree('./table', './test1/table')
-shutil.copyfile('./predict_system.py', './test1/predict_system.py')
-shutil.copyfile('./utility.py', './test1/utility.py')
+shutil.copytree('./table', './ppstructure/table')
+shutil.copyfile('./predict_system.py', './ppstructure/predict_system.py')
+shutil.copyfile('./utility.py', './ppstructure/utility.py')
 shutil.copytree('../ppocr', './ppocr')
 shutil.copytree('../tools', './tools')
 shutil.copyfile('../LICENSE', './LICENSE')
@@ -66,5 +66,5 @@ setup(
 
 shutil.rmtree('ppocr')
 shutil.rmtree('tools')
-shutil.rmtree('test1')
+shutil.rmtree('ppstructure')
 os.remove('LICENSE')

test1/table/eval_table.py → ppstructure/table/eval_table.py

@@ -20,9 +20,9 @@ sys.path.append(os.path.abspath(os.path.join(__dir__, '../..')))
 import cv2
 import json
 from tqdm import tqdm
-from test1.table.table_metric import TEDS
-from test1.table.predict_table import TableSystem
-from test1.utility import init_args
+from ppstructure.table.table_metric import TEDS
+from ppstructure.table.predict_table import TableSystem
+from ppstructure.utility import init_args
 from ppocr.utils.logging import get_logger
 
 logger = get_logger()

test1/table/predict_structure.py → ppstructure/table/predict_structure.py

@@ -22,17 +22,14 @@ os.environ["FLAGS_allocator_strategy"] = 'auto_growth'
 
 import cv2
 import numpy as np
-import math
 import time
-import traceback
-import paddle
 
 import tools.infer.utility as utility
 from ppocr.data import create_operators, transform
 from ppocr.postprocess import build_post_process
 from ppocr.utils.logging import get_logger
 from ppocr.utils.utility import get_image_file_list, check_and_read_gif
-from test1.utility import parse_args
+from ppstructure.utility import parse_args
 
 logger = get_logger()
 

test1/table/predict_table.py → ppstructure/table/predict_table.py

@@ -30,9 +30,9 @@ import tools.infer.predict_rec as predict_rec
 import tools.infer.predict_det as predict_det
 from ppocr.utils.utility import get_image_file_list, check_and_read_gif
 from ppocr.utils.logging import get_logger
-from test1.table.matcher import distance, compute_iou
-from test1.utility import parse_args
-import test1.table.predict_structure as predict_strture
+from ppstructure.table.matcher import distance, compute_iou
+from ppstructure.utility import parse_args
+import ppstructure.table.predict_structure as predict_strture
 
 logger = get_logger()