[BUG FIX] Fix link flags of inference.so (#59755)

* fix inference.so with phi.so * update
PaddlePaddle · Dec 7, 2023 · bf0339b · bf0339b
1 parent ff9a5f6
commit bf0339b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt
@@ -142,20 +142,21 @@ if(WIN32)
                PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
   target_link_libraries(paddle_inference_shared phi common)
 endif()
-set_target_properties(paddle_inference_shared PROPERTIES LINK_FLAGS
-                                                         "-Wl,-rpath,'$ORIGIN'")
+set(INFERENCE_SHARED_LINKFLAGS "-Wl,-rpath,'$ORIGIN'")
+set_target_properties(paddle_inference_shared
+                      PROPERTIES LINK_FLAGS "${INFERENCE_SHARED_LINKFLAGS}")
 set_target_properties(paddle_inference_shared PROPERTIES OUTPUT_NAME
                                                          paddle_inference)
 if(NOT APPLE
    AND NOT WIN32
    AND NOT WITH_TESTING
    AND NOT WITH_INFERENCE_API_TEST)
   # TODO(liuyiqun): Temporarily disable the link flag because it is not support on Mac.
-  set(LINK_FLAGS
-      "-Wl,--version-script ${CMAKE_CURRENT_SOURCE_DIR}/paddle_inference.map")
-
-  set_target_properties(paddle_inference_shared PROPERTIES LINK_FLAGS
-                                                           "${LINK_FLAGS}")
+  set(INFERENCE_SHARED_LINKFLAGS
+      "${INFERENCE_SHARED_LINKFLAGS},--version-script=${CMAKE_CURRENT_SOURCE_DIR}/paddle_inference.map"
+  )
+  set_target_properties(paddle_inference_shared
+                        PROPERTIES LINK_FLAGS "${INFERENCE_SHARED_LINKFLAGS}")
   # check symbol hidden
   file(
     WRITE ${CMAKE_CURRENT_BINARY_DIR}/check_symbol.cmake

diff --git a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt
@@ -6,6 +6,7 @@ option(WITH_STATIC_LIB
        "Compile demo with static/shared library, default use static." ON)
 option(USE_TENSORRT "Compile demo with TensorRT." OFF)
 option(WITH_ONNXRUNTIME "Compile demo with ONNXRuntime" OFF)
+option(WITH_SHARED_PHI "Compile demo with phi shared lib" ON)
 
 if(NOT WITH_STATIC_LIB)
   add_definitions("-DPADDLE_WITH_SHARED_LIB")
@@ -177,9 +178,6 @@ if(WITH_STATIC_LIB)
   set(DEPS
       ${PADDLE_LIB}/paddle/lib/libpaddle_inference${CMAKE_STATIC_LIBRARY_SUFFIX}
   )
-  if(NOT WIN32)
-    set(DEPS ${DEPS} ${PADDLE_LIB}/paddle/lib/libphi.so)
-  endif()
 else()
   if(WIN32)
     set(DEPS
@@ -208,6 +206,10 @@ if(NOT WIN32)
       cryptopp
       utf8proc
       ${EXTERNAL_LIB})
+  if(WITH_SHARED_PHI)
+    set(DEPS ${DEPS}
+             ${PADDLE_LIB}/paddle/lib/libphi${CMAKE_SHARED_LIBRARY_SUFFIX})
+  endif()
 else()
   set(DEPS
       ${DEPS}