From da75ef8b9e673be1851fa4f1df8e3d1d163b9505 Mon Sep 17 00:00:00 2001
From: licx <lichenxia1991@163.com>
Date: Sat, 15 Aug 2020 21:54:59 +0800
Subject: [PATCH] fix conflict

---
 tools/eval.py    | 22 ++--------------------
 tools/program.py | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/tools/eval.py b/tools/eval.py
index 3c1d75c2..edd84a9d 100755
--- a/tools/eval.py
+++ b/tools/eval.py
@@ -45,26 +45,10 @@ from ppocr.utils.save_load import init_model
 from eval_utils.eval_det_utils import eval_det_run
 from eval_utils.eval_rec_utils import test_rec_benchmark
 from eval_utils.eval_rec_utils import eval_rec_run
-from ppocr.utils.character import CharacterOps
 
 
 def main():
-    config = program.load_config(FLAGS.config)
-    program.merge_config(FLAGS.opt)
-    logger.info(config)
-
-    # check if set use_gpu=True in paddlepaddle cpu version
-    use_gpu = config['Global']['use_gpu']
-    program.check_gpu(use_gpu)
-
-    alg = config['Global']['algorithm']
-    assert alg in ['EAST', 'DB', 'Rosetta', 'CRNN', 'STARNet', 'RARE', 'SAST']
-    if alg in ['Rosetta', 'CRNN', 'STARNet', 'RARE']:
-        config['Global']['char_ops'] = CharacterOps(config['Global'])
-
-    place = fluid.CUDAPlace(0) if use_gpu else fluid.CPUPlace()
-    startup_prog = fluid.Program()
-    eval_program = fluid.Program()
+    startup_prog, eval_program, place, config, train_alg_type = program.preprocess()
     eval_build_outputs = program.build(
         config, eval_program, startup_prog, mode='test')
     eval_fetch_name_list = eval_build_outputs[1]
@@ -75,7 +59,7 @@ def main():
 
     init_model(config, eval_program, exe)
 
-    if alg in ['EAST', 'DB', 'SAST']:
+    if train_alg_type == 'det':
         eval_reader = reader_main(config=config, mode="eval")
         eval_info_dict = {'program':eval_program,\
             'reader':eval_reader,\
@@ -101,6 +85,4 @@ def main():
 
 
 if __name__ == '__main__':
-    parser = program.ArgsParser()
-    FLAGS = parser.parse_args()
     main()
diff --git a/tools/program.py b/tools/program.py
index ff8743f1..ab210a86 100755
--- a/tools/program.py
+++ b/tools/program.py
@@ -22,6 +22,7 @@ import yaml
 import os
 from ppocr.utils.utility import create_module
 from ppocr.utils.utility import initial_logger
+
 logger = initial_logger()
 
 import paddle.fluid as fluid
@@ -31,8 +32,7 @@ from eval_utils.eval_det_utils import eval_det_run
 from eval_utils.eval_rec_utils import eval_rec_run
 from ppocr.utils.save_load import save_model
 import numpy as np
-from ppocr.utils.character import cal_predicts_accuracy
-
+from ppocr.utils.character import cal_predicts_accuracy, CharacterOps
 
 class ArgsParser(ArgumentParser):
     def __init__(self):
@@ -81,10 +81,8 @@ default_config = {'Global': {'debug': False, }}
 def load_config(file_path):
     """
     Load config from yml/yaml file.
-
     Args:
         file_path (str): Path of the config file to be loaded.
-
     Returns: global config
     """
     merge_config(default_config)
@@ -103,10 +101,8 @@ def load_config(file_path):
 def merge_config(config):
     """
     Merge config into global config.
-
     Args:
         config (dict): Config to be merged.
-
     Returns: global config
     """
     for key, value in config.items():
@@ -157,13 +153,11 @@ def build(config, main_prog, startup_prog, mode):
         3. create a model
         4. create fetchs
         5. create an optimizer
-
     Args:
         config(dict): config
         main_prog(): main program
         startup_prog(): startup program
         is_train(bool): train or valid
-
     Returns:
         dataloader(): a bridge between the model and the data
         fetchs(dict): dict of model outputs(included loss and measures)
@@ -374,3 +368,29 @@ def train_eval_rec_run(config, exe, train_info_dict, eval_info_dict):
             save_path = save_model_dir + "/iter_epoch_%d" % (epoch)
             save_model(train_info_dict['train_program'], save_path)
     return
+
+def preprocess():
+    FLAGS = ArgsParser().parse_args()
+    config = load_config(FLAGS.config)
+    merge_config(FLAGS.opt)
+    logger.info(config)
+
+    # check if set use_gpu=True in paddlepaddle cpu version
+    use_gpu = config['Global']['use_gpu']
+    check_gpu(use_gpu)
+
+    alg = config['Global']['algorithm']
+    assert alg in ['EAST', 'DB', 'SAST', 'Rosetta', 'CRNN', 'STARNet', 'RARE']
+    if alg in ['Rosetta', 'CRNN', 'STARNet', 'RARE']:
+        config['Global']['char_ops'] = CharacterOps(config['Global'])
+
+    place = fluid.CUDAPlace(0) if use_gpu else fluid.CPUPlace()
+    startup_program = fluid.Program()
+    train_program = fluid.Program()
+
+    if alg in ['EAST', 'DB', 'SAST']:
+        train_alg_type = 'det'
+    else:
+        train_alg_type = 'rec'
+
+    return startup_program, train_program, place, config, train_alg_type
-- 
GitLab