Refine the generation process of swig's python wrapper #1099
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,3 @@ | ||
| set(API_SOURCES | ||
| Arguments.cpp | ||
| ConfigParser.cpp | ||
|
|
@@ -33,65 +15,85 @@ set(API_HEADER | |
| PaddleAPI.h | ||
| Internal.h) | ||
|
|
||
| add_library(paddle_api STATIC ${API_SOURCES}) | ||
| add_dependencies(paddle_api gen_proto_cpp) | ||
|
|
||
| INCLUDE(${SWIG_USE_FILE}) | ||
| INCLUDE_DIRECTORIES(${PROJ_ROOT}/paddle) | ||
|
|
||
| FILE(GLOB PY_PADDLE_PYTHON_FILES ${PROJ_ROOT}/paddle/py_paddle/*.py) | ||
|
There was a problem hiding this comment. GLOB => GLOB_RECURSE 因为我们可能会在这个包里面加一些其他的子目录，子目录下面也有PY文件。 There was a problem hiding this comment. 删掉了 好像这里没起什么作用 以后新增的py,直接在https://github.com/PaddlePaddle/Paddle/pull/1099/files#diff-409abc2eda4ed1dba2c69defc807748dR22 里面加，直观一些。 |
||
|
|
||
| SET_SOURCE_FILES_PROPERTIES(Paddle.i PROPERTIES CPLUSPLUS ON) | ||
|
|
||
| SET(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}) | ||
| SET(CMAKE_CXX_FLAGS "-std=c++11 -fPIC -Wall") | ||
| IF(WITH_COVERAGE) | ||
| SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") | ||
| ENDIF(WITH_COVERAGE) | ||
|
|
||
| SET(SWIG_MODULE_swig_paddle_EXTRA_DEPS | ||
| paddle_parameter | ||
| paddle_function | ||
| paddle_math | ||
| paddle_utils | ||
| paddle_gserver | ||
| paddle_pserver | ||
| paddle_api | ||
| paddle_cuda | ||
| paddle_trainer_lib | ||
| paddle_network | ||
| paddle_proto | ||
| ${PY_PADDLE_PYTHON_FILES} | ||
| ${external_project_dependencies} | ||
| ) | ||
|
|
||
| IF(APPLE) | ||
| SET(ARCHIVE_START "-undefined dynamic_lookup -Wl,-all_load") | ||
|
There was a problem hiding this comment. 记得 -all_load 不太等于ARCHIVE_START... |
||
| ELSE(APPLE) | ||
| SET(START_GROUP "-Xlinker -start-group") | ||
| SET(END_GROUP "-Xlinker -end-group") | ||
| SET(ARCHIVE_START "-Wl,--whole-archive") | ||
| SET(ARCHIVE_END "-Wl,--no-whole-archive") | ||
| ENDIF(APPLE) | ||
|
|
||
| SWIG_ADD_MODULE(swig_paddle python Paddle.i) | ||
| SWIG_LINK_LIBRARIES(swig_paddle | ||
| ${START_GROUP} | ||
| ${ARCHIVE_START} | ||
| paddle_gserver | ||
| paddle_function | ||
| ${METRIC_LIBS} | ||
| ${ARCHIVE_END} | ||
| paddle_pserver | ||
| paddle_trainer_lib | ||
| paddle_network | ||
| paddle_parameter | ||
| paddle_math | ||
| paddle_utils | ||
| paddle_proto | ||
| paddle_cuda | ||
| paddle_api | ||
| ${CMAKE_DL_LIBS} | ||
| ${EXTERNAL_LIBS} | ||
| ${CMAKE_THREAD_LIBS_INIT} | ||
| ${RDMA_LD_FLAGS} | ||
| ${RDMA_LIBS} | ||
| ${START_END} | ||
| ) | ||
|
|
||
|
There was a problem hiding this comment.
这个事情其实还是没有fix |
||
| add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/dist/.timestamp | ||
| COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/swig_paddle.py ${PROJ_ROOT}/paddle/py_paddle | ||
|
There was a problem hiding this comment. 这个可以重新搞一下。 1、应该用cp而不是用 mv，否则，${CMAKE_CURRENT_BINARY_DIR}/swig_paddle.py 会永远不存在，然后每次make的时候都会编译。 2、之前用timestamp来标记这个OUTPUT其实是个trick
|
||
| && mv ${CMAKE_CURRENT_BINARY_DIR}/_swig_paddle.so ${PROJ_ROOT}/paddle/py_paddle | ||
| COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel | ||
| COMMAND ${CMAKE_COMMAND} -E touch dist/.timestamp | ||
| COMMAND rm -rf py_paddle.egg-info build | ||
| WORKING_DIRECTORY ${PROJ_ROOT}/paddle | ||
| DEPENDS _swig_paddle | ||
| ) | ||
|
|
||
| add_custom_target(python_api_wheel ALL DEPENDS ${PROJ_ROOT}/paddle/dist/.timestamp) | ||
|
|
||
| install(DIRECTORY ${PROJ_ROOT}/paddle/dist/ DESTINATION opt/paddle/share/wheels) | ||
|
|
||
| if(WITH_TESTING) | ||
| IF(NOT PY_PIP_FOUND) | ||
|
|
||
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
重复