diff --git a/deploy/slim/prune/export_prune_model.py b/deploy/slim/prune/export_prune_model.py index b3ca4abc5e34830d86da8b12652a262fee7c4a56..0603966f8eeb9a59fa8c4494bf47de9cdaf53774 100644 --- a/deploy/slim/prune/export_prune_model.py +++ b/deploy/slim/prune/export_prune_model.py @@ -23,20 +23,6 @@ sys.path.append(__dir__) sys.path.append(os.path.join(__dir__, '..', '..', '..')) sys.path.append(os.path.join(__dir__, '..', '..', '..', 'tools')) - -def set_paddle_flags(**kwargs): - for key, value in kwargs.items(): - if os.environ.get(key, None) is None: - os.environ[key] = str(value) - - -# NOTE(paddle-dev): All of these flags should be -# set before `import paddle`. Otherwise, it would -# not take any effect. -set_paddle_flags( - FLAGS_eager_delete_tensor_gb=0, # enable GC to save memory -) - import program from paddle import fluid from ppocr.utils.utility import initial_logger diff --git a/deploy/slim/prune/pruning_and_finetune.py b/deploy/slim/prune/pruning_and_finetune.py index d0b657240270816ca4d4d1aed1849ce516d3afeb..0a03cb449523232dbeedf1d7066b4ea4ba01f31f 100644 --- a/deploy/slim/prune/pruning_and_finetune.py +++ b/deploy/slim/prune/pruning_and_finetune.py @@ -24,20 +24,6 @@ sys.path.append(__dir__) sys.path.append(os.path.join(__dir__, '..', '..', '..')) sys.path.append(os.path.join(__dir__, '..', '..', '..', 'tools')) - -def set_paddle_flags(**kwargs): - for key, value in kwargs.items(): - if os.environ.get(key, None) is None: - os.environ[key] = str(value) - - -# NOTE(paddle-dev): All of these flags should be -# set before `import paddle`. Otherwise, it would -# not take any effect. -set_paddle_flags( - FLAGS_eager_delete_tensor_gb=0, # enable GC to save memory -) - import tools.program as program from paddle import fluid from ppocr.utils.utility import initial_logger diff --git a/deploy/slim/prune/sensitivity_anal.py b/deploy/slim/prune/sensitivity_anal.py index 4a55e066687507030f7553d32b1c3a071c34fff0..b416f09a3a17527eccbd131917ca257b39bc7884 100644 --- a/deploy/slim/prune/sensitivity_anal.py +++ b/deploy/slim/prune/sensitivity_anal.py @@ -23,20 +23,6 @@ sys.path.append(__dir__) sys.path.append(os.path.join(__dir__, '..', '..', '..')) sys.path.append(os.path.join(__dir__, '..', '..', '..', 'tools')) - -def set_paddle_flags(**kwargs): - for key, value in kwargs.items(): - if os.environ.get(key, None) is None: - os.environ[key] = str(value) - - -# NOTE(paddle-dev): All of these flags should be -# set before `import paddle`. Otherwise, it would -# not take any effect. -set_paddle_flags( - FLAGS_eager_delete_tensor_gb=0, # enable GC to save memory -) - import json import cv2 from paddle import fluid diff --git a/tools/program.py b/tools/program.py index 7c0177336a3161d6039248f3bad6b63b47406878..621924311305867b403893fd6e12f51c24341b81 100755 --- a/tools/program.py +++ b/tools/program.py @@ -33,7 +33,6 @@ 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, cal_predicts_accuracy_srn, CharacterOps -import paddleslim as slim class ArgsParser(ArgumentParser): @@ -300,6 +299,7 @@ def train_eval_det_run(config, best_epoch = epoch save_path = save_model_dir + "/best_accuracy" if is_pruning: + import paddleslim as slim slim.prune.save_model( exe, train_info_dict['train_program'], save_path) @@ -317,6 +317,7 @@ def train_eval_det_run(config, if epoch == 0 and save_epoch_step == 1: save_path = save_model_dir + "/iter_epoch_0" if is_pruning: + import paddleslim as slim slim.prune.save_model(exe, train_info_dict['train_program'], save_path) else: @@ -324,6 +325,7 @@ def train_eval_det_run(config, if epoch > 0 and epoch % save_epoch_step == 0: save_path = save_model_dir + "/iter_epoch_%d" % (epoch) if is_pruning: + import paddleslim as slim slim.prune.save_model(exe, train_info_dict['train_program'], save_path) else: