diff --git a/paddleslim/auto_compression/compressor.py b/paddleslim/auto_compression/compressor.py index 11b80573ccbc433197e29096cbf49e649c2ab1a1..b5459c76d791ed98beacbf29558ca73e2fa357bb 100644 --- a/paddleslim/auto_compression/compressor.py +++ b/paddleslim/auto_compression/compressor.py @@ -846,9 +846,12 @@ class AutoCompression: assert os.path.exists( infer_model_path), 'Not found {}, please check it.'.format( infer_model_path) + onnx_save_path = os.path.join(self.final_dir, 'ONNX') + if not os.path.exists(onnx_save_path): + os.makedirs(onnx_save_path) export_onnx( self.final_dir, model_filename=self.model_filename, params_filename=self.params_filename, - save_file_path=os.path.join(self.final_dir, model_name), + save_file_path=os.path.join(onnx_save_path, model_name), deploy_backend=deploy_backend) diff --git a/paddleslim/common/load_model.py b/paddleslim/common/load_model.py index cc545b316982279c10e0221e954ad8ec44b33405..1afa312f380ab278c4b7d15c9067456015ede8f2 100644 --- a/paddleslim/common/load_model.py +++ b/paddleslim/common/load_model.py @@ -210,7 +210,7 @@ def export_onnx(model_dir, pkg.require('paddle2onnx') except: from pip._internal import main - main(['install', 'paddle2onnx==1.0.0rc3']) + main(['install', 'paddle2onnx==1.0.0rc4']) import paddle2onnx paddle2onnx.command.c_paddle_to_onnx( model_file=os.path.join(model_dir, model_filename), @@ -218,5 +218,9 @@ def export_onnx(model_dir, save_file=save_file_path, opset_version=opset_version, enable_onnx_checker=True, - deploy_backend=deploy_backend) + deploy_backend=deploy_backend, + scale_file=os.path.join(model_dir, 'calibration_table.txt'), + calibration_file=os.path.join( + save_file_path.rstrip(os.path.split(save_file_path)[-1]), + 'calibration.cache')) _logger.info('Convert model to ONNX: {}'.format(save_file_path))