Skip to content

Commit ee628a4

Browse files
committed
Change swig mv to cp
1 parent 29f9c0d commit ee628a4

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

paddle/api/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@ SET(SWIG_MODULE_swig_paddle_EXTRA_DEPS
4343
paddle_trainer_lib
4444
paddle_network
4545
paddle_proto
46-
${PY_PADDLE_PYTHON_FILES}
4746
${external_project_dependencies}
4847
)
4948

5049
IF(APPLE)
51-
SET(ARCHIVE_START "-undefined dynamic_lookup -Wl,-all_load")
50+
SET(MACOS_LD_FLAGS "-undefined dynamic_lookup -Wl,-all_load")
5251
ELSE(APPLE)
5352
SET(START_GROUP "-Xlinker -start-group")
5453
SET(END_GROUP "-Xlinker -end-group")
@@ -58,6 +57,7 @@ ENDIF(APPLE)
5857

5958
SWIG_ADD_MODULE(swig_paddle python Paddle.i)
6059
SWIG_LINK_LIBRARIES(swig_paddle
60+
${MACOS_LD_FLAGS}
6161
${START_GROUP}
6262
${ARCHIVE_START}
6363
paddle_gserver
@@ -81,17 +81,18 @@ SWIG_LINK_LIBRARIES(swig_paddle
8181
${START_END}
8282
)
8383

84-
add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/dist/.timestamp
85-
COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/swig_paddle.py ${PROJ_ROOT}/paddle/py_paddle
86-
&& mv ${CMAKE_CURRENT_BINARY_DIR}/_swig_paddle.so ${PROJ_ROOT}/paddle/py_paddle
84+
add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/py_paddle/_swig_paddle.so
85+
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/swig_paddle.py ${PROJ_ROOT}/paddle/py_paddle
86+
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/_swig_paddle.so ${PROJ_ROOT}/paddle/py_paddle
8787
COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel
8888
COMMAND ${CMAKE_COMMAND} -E touch dist/.timestamp
8989
COMMAND rm -rf py_paddle.egg-info build
9090
WORKING_DIRECTORY ${PROJ_ROOT}/paddle
9191
DEPENDS _swig_paddle
9292
)
9393

94-
add_custom_target(python_api_wheel ALL DEPENDS ${PROJ_ROOT}/paddle/dist/.timestamp)
94+
# TODO(yuyang18) : make wheel name calculated by cmake
95+
add_custom_target(python_api_wheel ALL DEPENDS ${PROJ_ROOT}/paddle/py_paddle/_swig_paddle.so)
9596

9697
install(DIRECTORY ${PROJ_ROOT}/paddle/dist/ DESTINATION opt/paddle/share/wheels)
9798

0 commit comments

Comments
 (0)