From 5be223ba5265cda8615a9598df5f77a96eacb665 Mon Sep 17 00:00:00 2001 From: "shaohua.zhang" Date: Mon, 20 Jul 2020 17:32:25 +0800 Subject: [PATCH] remove the duplication code remove the duplication code --- tools/export_model.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/tools/export_model.py b/tools/export_model.py index 4415eda8..720599c9 100644 --- a/tools/export_model.py +++ b/tools/export_model.py @@ -41,27 +41,11 @@ from paddle import fluid from ppocr.utils.utility import initial_logger logger = initial_logger() from ppocr.utils.save_load import init_model -from ppocr.utils.character import CharacterOps -from ppocr.utils.utility import create_module -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'] - 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() +def main(): + startup_prog, eval_program, place, config = program.preProcess() feeded_var_names, target_vars, fetches_var_name = program.build_export( config, eval_program, startup_prog) @@ -88,6 +72,4 @@ def main(): if __name__ == '__main__': - parser = program.ArgsParser() - FLAGS = parser.parse_args() main() -- GitLab