From 3ebb7e4dfce9c6a0fc70fed16607a2684388861a Mon Sep 17 00:00:00 2001
From: YuanRisheng <yuanrisheng@baidu.com>
Date: Fri, 31 Mar 2023 15:24:40 +0800
Subject: [PATCH] fix bugs (#52377)

---
 cmake/inference_lib.cmake             | 4 ++++
 cmake/phi_header.cmake                | 5 +++++
 paddle/fluid/inference/CMakeLists.txt | 1 +
 3 files changed, 10 insertions(+)

diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake
index d0af307ec59..505cfd1cab4 100644
--- a/cmake/inference_lib.cmake
+++ b/cmake/inference_lib.cmake
@@ -315,6 +315,10 @@ copy(
   inference_lib_dist
   SRCS ${PADDLE_SOURCE_DIR}/paddle/phi/core/hostdevice.h
   DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/phi/core/)
+copy(
+  inference_lib_dist
+  SRCS ${PADDLE_SOURCE_DIR}/paddle/fluid/platform/init_phi.h
+  DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/phi/)
 copy(
   inference_lib_dist
   SRCS ${PADDLE_SOURCE_DIR}/paddle/utils/any.h
diff --git a/cmake/phi_header.cmake b/cmake/phi_header.cmake
index 7596b59e71c..d5000eadbd1 100644
--- a/cmake/phi_header.cmake
+++ b/cmake/phi_header.cmake
@@ -25,6 +25,9 @@ function(phi_header_path_compat TARGET_PATH)
         file(READ ${header} HEADER_CONTENT)
         string(REPLACE "paddle/phi/" "paddle/include/experimental/phi/"
                        HEADER_CONTENT "${HEADER_CONTENT}")
+        string(REPLACE "paddle/fluid/platform/"
+                       "paddle/include/experimental/phi/" HEADER_CONTENT
+                       "${HEADER_CONTENT}")
         string(REPLACE "paddle/utils/" "paddle/include/experimental/utils/"
                        HEADER_CONTENT "${HEADER_CONTENT}")
         file(WRITE ${header} "${HEADER_CONTENT}")
@@ -36,6 +39,8 @@ endfunction()
 
 phi_header_path_compat(
   ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental)
+phi_header_path_compat(
+  ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/phi)
 phi_header_path_compat(
   ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/phi/api)
 phi_header_path_compat(
diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt
index b5e8450f35f..d7170686650 100644
--- a/paddle/fluid/inference/CMakeLists.txt
+++ b/paddle/fluid/inference/CMakeLists.txt
@@ -100,6 +100,7 @@ set(SHARED_INFERENCE_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/../framework/data_feed.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../framework/data_feed_factory.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../framework/dataset_factory.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../platform/init_phi.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/api/api.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/api/api_impl.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/api/analysis_predictor.cc
-- 
GitLab