From eb4981bce5627156ffce4e0163380959c3daa2d6 Mon Sep 17 00:00:00 2001 From: engineer <1292846099@qq.com> Date: Tue, 20 Sep 2022 14:57:03 +0800 Subject: [PATCH 1/2] Fix Python Link Order Error (#46259) --- cmake/generic.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index 6f74169e70b44..5c1f6908b22eb 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -388,7 +388,8 @@ function(cc_library TARGET_NAME) target_link_libraries(${TARGET_NAME} "-Wl,-undefined,dynamic_lookup") endif() endif() - target_link_libraries(${TARGET_NAME} ${cc_library_DEPS}) + target_link_libraries(${TARGET_NAME} ${cc_library_DEPS} + ${PYTHON_LIBRARIES}) common_link(${TARGET_NAME}) endif() From 48a164cc0fffef4bce89edde73775adaf829f26a Mon Sep 17 00:00:00 2001 From: wanghuancoder Date: Fri, 4 Nov 2022 09:38:41 +0800 Subject: [PATCH 2/2] fix cc_library link python lib (#47605) * fix cc_library link python lib --- cmake/generic.cmake | 3 +-- paddle/fluid/pybind/CMakeLists.txt | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index 5c1f6908b22eb..6f74169e70b44 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -388,8 +388,7 @@ function(cc_library TARGET_NAME) target_link_libraries(${TARGET_NAME} "-Wl,-undefined,dynamic_lookup") endif() endif() - target_link_libraries(${TARGET_NAME} ${cc_library_DEPS} - ${PYTHON_LIBRARIES}) + target_link_libraries(${TARGET_NAME} ${cc_library_DEPS}) common_link(${TARGET_NAME}) endif() diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt index 0a59caae2bbe8..652a835cbc807 100755 --- a/paddle/fluid/pybind/CMakeLists.txt +++ b/paddle/fluid/pybind/CMakeLists.txt @@ -262,6 +262,10 @@ if(WITH_PYTHON) list(APPEND OP_FUNCTION_GENERETOR_DEPS cncl_context) endif() + if(NOT ((NOT WITH_PYTHON) AND ON_INFER)) + list(APPEND OP_FUNCTION_GENERETOR_DEPS ${PYTHON_LIBRARIES}) + endif() + add_executable(op_function_generator op_function_generator.cc) target_link_libraries(op_function_generator ${OP_FUNCTION_GENERETOR_DEPS}) add_executable(eager_legacy_op_function_generator @@ -601,4 +605,6 @@ if(WITH_PYTHON) get_property(os_dependency_modules GLOBAL PROPERTY OS_DEPENDENCY_MODULES) target_link_libraries(${SHARD_LIB_NAME} ${os_dependency_modules}) add_dependencies(${SHARD_LIB_NAME} op_function_generator_cmd) + + target_link_libraries(${SHARD_LIB_NAME} ${PYTHON_LIBRARIES}) endif()