diff --git a/fastdeploy/runtime/runtime.cc b/fastdeploy/runtime/runtime.cc index 2a00dfda4..67774a306 100644 --- a/fastdeploy/runtime/runtime.cc +++ b/fastdeploy/runtime/runtime.cc @@ -104,30 +104,32 @@ bool AutoSelectBackend(RuntimeOption& option) { bool Runtime::Init(const RuntimeOption& _option) { option = _option; + // decrypt encrypted model if ("" != option.encryption_key_) { - #ifdef ENABLE_ENCRYPTION - if (option.model_from_memory_) { - option.model_file = Decrypt(option.model_file, option.encryption_key_); - if (!(option.params_file.empty())) { - option.params_file = Decrypt(option.params_file, option.encryption_key_); - } - } else { - std::string model_buffer = ""; - FDASSERT(ReadBinaryFromFile(option.model_file, &model_buffer), - "Fail to read binary from model file"); - option.model_file = Decrypt(model_buffer, option.encryption_key_); - if (!(option.params_file.empty())) { - std::string params_buffer = ""; - FDASSERT(ReadBinaryFromFile(option.params_file, ¶ms_buffer), - "Fail to read binary from parameter file"); - option.params_file = Decrypt(params_buffer, option.encryption_key_); - } - option.model_from_memory_ = true; +#ifdef ENABLE_ENCRYPTION + if (option.model_from_memory_) { + option.model_file = Decrypt(option.model_file, option.encryption_key_); + if (!(option.params_file.empty())) { + option.params_file = + Decrypt(option.params_file, option.encryption_key_); } - #else - FDERROR << "The FastDeploy didn't compile with encryption function." - << std::endl; - #endif + } else { + std::string model_buffer = ""; + FDASSERT(ReadBinaryFromFile(option.model_file, &model_buffer), + "Fail to read binary from model file"); + option.model_file = Decrypt(model_buffer, option.encryption_key_); + if (!(option.params_file.empty())) { + std::string params_buffer = ""; + FDASSERT(ReadBinaryFromFile(option.params_file, ¶ms_buffer), + "Fail to read binary from parameter file"); + option.params_file = Decrypt(params_buffer, option.encryption_key_); + } + option.model_from_memory_ = true; + } +#else + FDERROR << "The FastDeploy didn't compile with encryption function." + << std::endl; +#endif } // Choose default backend by model format and device if backend is not // specified diff --git a/fastdeploy/runtime/runtime.h b/fastdeploy/runtime/runtime.h index 772773007..fa8b8f198 100755 --- a/fastdeploy/runtime/runtime.h +++ b/fastdeploy/runtime/runtime.h @@ -24,7 +24,7 @@ #include "fastdeploy/runtime/runtime_option.h" #include "fastdeploy/utils/perf.h" #ifdef ENABLE_ENCRYPTION - #include "fastdeploy/encryption/include/decrypt.h" +#include "fastdeploy/encryption/include/decrypt.h" #endif /** \brief All C++ FastDeploy APIs are defined inside this namespace @@ -102,7 +102,7 @@ struct FASTDEPLOY_DECL Runtime { */ double GetProfileTime() { return backend_->benchmark_result_.time_of_runtime; - } + } private: void CreateOrtBackend(); diff --git a/fastdeploy/runtime/runtime_option.cc b/fastdeploy/runtime/runtime_option.cc index 8568b3b7f..d074a9603 100644 --- a/fastdeploy/runtime/runtime_option.cc +++ b/fastdeploy/runtime/runtime_option.cc @@ -37,12 +37,12 @@ void RuntimeOption::SetModelBuffer(const std::string& model_buffer, } void RuntimeOption::SetEncryptionKey(const std::string& encryption_key) { - #ifdef ENABLE_ENCRYPTION - encryption_key_ = encryption_key; - #else - FDERROR << "The FastDeploy didn't compile with encryption function." - << std::endl; - #endif +#ifdef ENABLE_ENCRYPTION + encryption_key_ = encryption_key; +#else + FDERROR << "The FastDeploy didn't compile with encryption function." + << std::endl; +#endif } void RuntimeOption::UseGpu(int gpu_id) { diff --git a/fastdeploy/runtime/runtime_option.h b/fastdeploy/runtime/runtime_option.h index b263f4ad3..a10ed9845 100644 --- a/fastdeploy/runtime/runtime_option.h +++ b/fastdeploy/runtime/runtime_option.h @@ -207,7 +207,7 @@ struct FASTDEPLOY_DECL RuntimeOption { // *** The belowing api are deprecated, will be removed in v1.2.0 // *** Do not use it anymore - void SetPaddleMKLDNN(bool pd_mkldnn = true); + void SetPaddleMKLDNN(bool pd_mkldnn = true); void EnablePaddleToTrt(); void DeletePaddleBackendPass(const std::string& delete_pass_name); void EnablePaddleLogInfo(); diff --git a/python/fastdeploy/runtime.py b/python/fastdeploy/runtime.py index 1d2fc1c1d..a9004a15a 100644 --- a/python/fastdeploy/runtime.py +++ b/python/fastdeploy/runtime.py @@ -187,8 +187,7 @@ class RuntimeOption: return self._option.set_model_buffer(model_buffer, params_buffer, model_format) - def set_encryption_key(self, - encryption_key): + def set_encryption_key(self, encryption_key): """When loading encrypted model, encryption_key is required to decrypte model :param encryption_key: (str)The key for decrypting model """ @@ -590,10 +589,12 @@ class RuntimeOption: replica_num=1, available_memory_proportion=1.0, enable_half_partial=False): - logging.warning("`RuntimeOption.set_ipu_config` will be deprecated in v1.2.0, please use `RuntimeOption.paddle_infer_option.set_ipu_config()` instead.") - self._option.paddle_infer_option.set_ipu_config(enable_fp16, replica_num, - available_memory_proportion, - enable_half_partial) + logging.warning( + "`RuntimeOption.set_ipu_config` will be deprecated in v1.2.0, please use `RuntimeOption.paddle_infer_option.set_ipu_config()` instead." + ) + self._option.paddle_infer_option.set_ipu_config( + enable_fp16, replica_num, available_memory_proportion, + enable_half_partial) @property def poros_option(self): @@ -664,7 +665,8 @@ class RuntimeOption: continue if hasattr(getattr(self._option, attr), "__call__"): continue - message += " {} : {}\t\n".format(attr, getattr(self._option, attr)) + message += " {} : {}\t\n".format(attr, + getattr(self._option, attr)) message.strip("\n") message += ")" return message