Support only compile but not package (#61501)

risemeup1 · web-flow · commit fbdc757396dd · 2024-02-04T15:34:50.000+08:00
* fix bug

* fix bug

* fix

* fix

* fix
diff --git a/cmake/generic.cmake b/cmake/generic.cmake
@@ -614,7 +614,8 @@ function(paddle_test_build TARGET_NAME)
       target_link_libraries(${TARGET_NAME} ${PYTHON_LIBRARIES})
     endif()
     if(WITH_CINN AND NOT CINN_ONLY)
-      target_link_libraries(${TARGET_NAME} $<TARGET_LINKER_FILE:cinnapi>)
+      target_link_libraries(${TARGET_NAME} $<TARGET_LINKER_FILE:cinnapi>
+                            cinn_transforms)
       add_dependencies(${TARGET_NAME} cinnapi)
     endif()
     if(WITH_XPU)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -150,11 +150,15 @@ if(WIN32)
         ${PADDLE_BINARY_DIR}/python/paddle/
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${PADDLE_SOURCE_DIR}/test
               ${PADDLE_BINARY_DIR}/test
+      DEPENDS copy_libpaddle ${FLUID_CORE} framework_py_proto profiler_py_proto
+              pass_desc_py_proto ${PY_FILES})
+
+    add_custom_command(
+      OUTPUT ${PADDLE_PYTHON_BUILD_DIR}/.timestamp_wheel
       COMMAND ${CMAKE_COMMAND} -E env ${py_env} ${PYTHON_EXECUTABLE} setup.py
               bdist_wheel
       COMMENT "Packing whl packages------>>>"
-      DEPENDS copy_libpaddle ${FLUID_CORE} framework_py_proto profiler_py_proto
-              pass_desc_py_proto ${PY_FILES})
+      DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp)
   endif()
 else()
   if(WITH_SETUP_INSTALL)
@@ -174,16 +178,23 @@ else()
       COMMAND cp -r ${PADDLE_SOURCE_DIR}/python/paddle
               ${PADDLE_BINARY_DIR}/python
       COMMAND cp -r ${PADDLE_SOURCE_DIR}/test ${PADDLE_BINARY_DIR}/
-      COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel
-      COMMENT "Packing whl packages------>>>"
       DEPENDS copy_libpaddle ${FLUID_CORE} framework_py_proto profiler_py_proto
               pass_desc_py_proto ${PY_FILES})
+
+    add_custom_command(
+      OUTPUT ${PADDLE_PYTHON_BUILD_DIR}/.timestamp_wheel
+      COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel
+      COMMENT "Packing whl packages------>>>"
+      DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp)
   endif()
 endif()
 
-if(BUILD_WHL_PACKAGE)
-  add_custom_target(paddle_python ALL
-                    DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp)
+add_custom_target(paddle_python ALL
+                  DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp)
+if(BUILD_WHL_PACKAGE AND NOT WITH_SETUP_INSTALL)
+  add_custom_target(
+    paddle_copy ALL DEPENDS paddle_python
+                            ${PADDLE_PYTHON_BUILD_DIR}/.timestamp_wheel)
 endif()
 
 set(PADDLE_PYTHON_PACKAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/dist/)
