[cmake治理]Compile ddim as separate dynamic library #58899
Merged
Conversation
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
risemeup1
changed the title
risemeup1
force-pushed
the
compile_ddim_as_separate_dynamic_library
branch
from
b392caf to
d7ba4dd
Compare
risemeup1
force-pushed
the
compile_ddim_as_separate_dynamic_library
branch
from
d7ba4dd to
d901433
Compare
zhangbo9674
reviewed
Nov 14, 2023
paddle/common/dim.h
Outdated
| namespace framework { | ||
| template <int D> | ||
| using Dim = common::Dim<D>; | ||
|
|
There was a problem hiding this comment.
commom中为什么还要添加 paddle::framework::Dim?
paddle/common/ddim.h
Outdated
| namespace paddle { | ||
| namespace framework { | ||
|
|
||
| using DDim = common::DDim; |
There was a problem hiding this comment.
commom中为什么还要添加 paddle::framework::Dim?
paddle/common/enforce.h
Outdated
| __COMMON_BINARY_COMPARE(__VAL0, __VAL1, <=, >, __VA_ARGS__) | ||
|
|
||
| } // namespace enforce | ||
| using namespace enforce; // NOLINT |
paddle/common/exception.h
Outdated
| #include <sstream> | ||
| #include <string> | ||
|
|
||
| namespace paddle { |
| @@ -69,6 +69,11 @@ if(WIN32) | |||
| list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/ir.dll) | |||
| endif() | |||
|
|
|||
| add_custom_command( | |||
| OUTPUT ${eager_generator_path}/common.dll | |||
| COMMAND ${CMAKE_COMMAND} -E copy ${COMMON_LIB} ${eager_generator_path}) | |||
There was a problem hiding this comment.
有必要添加这个 dll 到eager_generator_path么？
risemeup1
force-pushed
the
compile_ddim_as_separate_dynamic_library
branch
from
6e38346 to
136a7bd
Compare
zhangbo9674
reviewed
Nov 15, 2023
paddle/fluid/pybind/CMakeLists.txt
Outdated
| @@ -361,6 +362,10 @@ if(WITH_PYTHON) | |||
| list(APPEND EAGER_OP_IMPL_DEPS ${op_impl_path}/ir.dll) | |||
| endif() | |||
|
|
|||
| add_custom_command( | |||
YuanRisheng
previously approved these changes
Nov 15, 2023
zhangbo9674
approved these changes
Nov 15, 2023
Aurelius84
approved these changes
Nov 15, 2023
YuanRisheng
approved these changes
Nov 15, 2023
SecretXV
pushed a commit
to SecretXV/Paddle
that referenced
this pull request
Nov 28, 2023
* refine * add common direcotry * fix codestyle * compile ddim.cc in common direcotry * fix windows compile bug * fix windows bug * fix windows bug * fix windows bug * fix windows bug * fix windows bug * fix bug * fix mac bug * fix windows test * fix bug * delete some invalid code * delete some unvalid code --------- Co-authored-by: Wang Huan <wanghuan29@baidu.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR types
Others
PR changes
Others
Description
在paddle下新建目录common，将一些基础组件放在此目录，并编译成libcommon.so/dll，此PR下沉ddim.cc和enforce.cc，解除pir依赖phi里的ddim。
To do：
彻底清除phi下的ddim.cc和enforce.cc，后续phi和pir均用paddle/common下的libcommon,so/dll，([cmake治理]fix can't find libcommon.so bug #58998)
最终状态
Pcard-67010