diff --git a/cmake/configure.cmake b/cmake/configure.cmake index 0a17f3945b808487e7de53de7b0c5e8b02b55951..f092607f9ad93398022be240947bc72d95a3ad75 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -241,7 +241,8 @@ set(WITH_PHI_SHARED CACHE BOOL "" FORCE) if(WIN32 OR WITH_ROCM - OR WITH_XPU_KP) + OR WITH_XPU_KP + OR ON_INFER) set(WITH_PHI_SHARED OFF CACHE BOOL "" FORCE) diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt index 598997360d533c49d1d4a65cc62c215567f6f7c8..083ef05968825ab492c44dfaa7b4f5723c15b413 100644 --- a/paddle/fluid/inference/CMakeLists.txt +++ b/paddle/fluid/inference/CMakeLists.txt @@ -33,7 +33,7 @@ endif() # fluid_modules exclude API-interface of inference/api and inference/capi_exp get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES) get_property(phi_modules GLOBAL PROPERTY PHI_MODULES) -set(utils_modules pretty_log string_helper benchmark utf8proc) +set(utils_modules pretty_log string_helper benchmark) add_subdirectory(api) diff --git a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt index e2c4b007c52cc724812918edaafc580e993712df..7a58b386ad6afb3714bc1f678a7883f9c8825b9b 100644 --- a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt +++ b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt @@ -199,7 +199,7 @@ if(NOT WIN32) ${MATH_LIB} ${MKLDNN_LIB} glog - phi + gflags protobuf xxhash cryptopp diff --git a/test/cpp/inference/infer_ut/CMakeLists.txt b/test/cpp/inference/infer_ut/CMakeLists.txt index a1e39ca142d51f0c4aba429f5f5729b491229ae3..e27cf7ffe1dc34ec5edafd9cf20a5c33b2a87cd3 100644 --- a/test/cpp/inference/infer_ut/CMakeLists.txt +++ b/test/cpp/inference/infer_ut/CMakeLists.txt @@ -224,7 +224,7 @@ if(NOT WIN32) ${MATH_LIB} ${MKLDNN_LIB} glog - phi + gflags protobuf xxhash cryptopp @@ -235,7 +235,7 @@ else() ${MATH_LIB} ${MKLDNN_LIB} glog - phi + gflags_static libprotobuf xxhash cryptopp-static