From 6559229b7e56ecf1a59729d2eac34a3ca9a87a2a Mon Sep 17 00:00:00 2001
From: MRXLT <xlt2024@gmail.com>
Date: Mon, 10 Aug 2020 19:39:08 +0800
Subject: [PATCH] fix encryption infer (#25979)

* add encrypt for inference lib

* fix code;test=develop

* fix test; test=develop

* bug fix; test=develop

* add MakeCipher;test=develop

* fix bug;test=develop

* move MakeCipher to paddle space; test=develop

* fix include dir ;test=develop

* add include dir; test=develop

* move include; test=develop

* move include; test=develop

* fix for windows ci

* fix cmake; test=develop

* fix bug

bug fix
---
 paddle/fluid/framework/io/crypto/cipher.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/paddle/fluid/framework/io/crypto/cipher.cc b/paddle/fluid/framework/io/crypto/cipher.cc
index c258028e250..316f8f9c751 100644
--- a/paddle/fluid/framework/io/crypto/cipher.cc
+++ b/paddle/fluid/framework/io/crypto/cipher.cc
@@ -16,9 +16,6 @@
 #include "paddle/fluid/framework/io/crypto/aes_cipher.h"
 #include "paddle/fluid/framework/io/crypto/cipher_utils.h"
 #include "paddle/fluid/platform/enforce.h"
-#ifdef ON_INFER
-#include "paddle/fluid/inference/api/paddle_api.h"
-#endif
 namespace paddle {
 namespace framework {
 
@@ -59,7 +56,7 @@ std::shared_ptr<Cipher> CipherFactory::CreateCipher(
 }
 
 }  // namespace framework
-#ifdef ON_INFER
+#ifdef PADDLE_ON_INFERENCE
 std::shared_ptr<framework::Cipher> MakeCipher(const std::string& config_file) {
   return framework::CipherFactory::CreateCipher(config_file);
 }
-- 
GitLab