move MakeCipher to paddle space

paddle_inference/inferencer-fluid-cpu/include/fluid_cpu_engine.h

@@ -555,7 +555,7 @@ class FluidCpuAnalysisEncryptCore : public FluidFamilyCore {
 
     VLOG(2) << "prepare for encryption model";
 
-    auto cipher = paddle::framework::MakeCipher("");
+    auto cipher = paddle::MakeCipher("");
     std::string real_model_buffer = cipher->Decrypt(model_buffer, key_buffer);
     std::string real_params_buffer = cipher->Decrypt(params_buffer, key_buffer);
 

paddle_inference/inferencer-fluid-gpu/include/fluid_gpu_engine.h

@@ -21,8 +21,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "cipher.h"        // NOLINT
-#include "cipher_utils.h"  //NOLINT
 #include "core/configure/include/configure_parser.h"
 #include "core/configure/inferencer_configure.pb.h"
 #include "core/predictor/framework/infer.h"
@@ -563,7 +561,7 @@ class FluidGpuAnalysisEncryptCore : public FluidFamilyCore {
 
     VLOG(2) << "prepare for encryption model";
 
-    auto cipher = paddle::framework::CipherFactory::CreateCipher("");
+    auto cipher = paddle::MakeCipher("");
     std::string real_model_buffer = cipher->Decrypt(model_buffer, key_buffer);
     std::string real_params_buffer = cipher->Decrypt(params_buffer, key_buffer);