refine operators/math/CMakeLists.txt #8682
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
Contributor
luotao1
commented
Mar 1, 2018
•
luotao1
commented
- fix refine operators/math/CMakeLists.txt #8611
- separate im2col from math_function
Xreki
reviewed
Mar 2, 2018
| # But it handle split GPU/CPU code and link some common library. | ||
| set(cc_srcs) | ||
| set(cu_srcs) | ||
| set(math_common_deps device_context framework_proto) |
There was a problem hiding this comment.
好像只有math_function依赖framework_proto？
There was a problem hiding this comment.
- 原来都是依赖
math_function，从而依赖framework_proto。 - 如果现在去掉依赖
framework_proto，会出现https://paddleci.ngrok.io/viewLog.html?buildId=29829&buildTypeId=Paddle_PrCi&tab=buildLog&_focus=1362
[18:22:58] In file included from /paddle/paddle/fluid/framework/tensor_util.h:16:0,
[18:22:58] from /paddle/paddle/fluid/operators/math/im2col.h:18,
[18:22:58] from /paddle/paddle/fluid/operators/math/im2col.cc:15:
[18:22:58] /paddle/paddle/fluid/framework/data_type.h:17:49: fatal error: paddle/fluid/framework/framework.pb.h: No such file or directory
[18:22:58] compilation terminated.
[18:22:58] paddle/fluid/operators/math/CMakeFiles/im2col.dir/build.make:62: recipe for target 'paddle/fluid/operators/math/CMakeFiles/im2col.dir/im2col.cc.o' failed
[18:22:58] CMakeFiles/Makefile2:18030: recipe for target 'paddle/fluid/operators/math/CMakeFiles/im2col.dir/all' failed
[18:22:58] make[2]: *** [paddle/fluid/operators/math/CMakeFiles/im2col.dir/im2col.cc.o] Error 1
[18:22:58] make[1]: *** [paddle/fluid/operators/math/CMakeFiles/im2col.dir/all] Error 2
[18:22:58] make[1]: *** Waiting for unfinished jobs....
[18:22:58] [ 36%] Building CXX object CMakeFiles/libprotobuf.dir/paddle/build/third_party/protobuf/src/extern_protobuf/src/google/protobuf/struct.pb.cc.o
[18:22:58] [ 36%] Building CXX object CMakeFiles/libprotobuf.dir/paddle/build/third_party/protobuf/src/extern_protobuf/src/google/protobuf/source_context.pb.cc.o
[18:22:58] In file included from /paddle/paddle/fluid/framework/tensor_util.h:16:0,
[18:22:58] from /paddle/paddle/fluid/operators/math/vol2col.h:18,
[18:22:58] from /paddle/paddle/fluid/operators/math/vol2col.cc:15:
[18:22:58] /paddle/paddle/fluid/framework/data_type.h:17:49: fatal error: paddle/fluid/framework/framework.pb.h: No such file or directory
[18:22:58] compilation terminated.
[18:22:58] make[2]: *** [paddle/fluid/operators/math/CMakeFiles/vol2col.dir/vol2col.cc.o] Error 1
[18:22:58] make[1]: *** [paddle/fluid/operators/math/CMakeFiles/vol2col.dir/all] Error 2
| cc_test(sequence_padding_test SRCS sequence_padding_test.cc DEPS sequence_padding) | ||
| if(WITH_GPU) | ||
| nv_test(math_function_gpu_test SRCS math_function_test.cu) | ||
| nv_test(selected_rows_functor_gpu_test SRCS selected_rows_functor_test.cu DEPS selected_rows_functor) |
There was a problem hiding this comment.
话说我一直觉得这两个单测其实可以合并到math_function_test.cc和selected_rows_functor_test.cc里面，因为单测里面并没有CUDA kernel代码，并且测试的内容应该和CPU单测保持一致。
| set(cc_srcs) | ||
| set(cu_srcs) | ||
| set(math_common_deps device_context framework_proto) | ||
| set(multiValueArgs SRCS DEPS) |
| if (WITH_GPU) | ||
| nv_library(${TARGET} SRCS ${cc_srcs} ${cu_srcs} DEPS ${math_library_DEPS} ${math_common_deps}) | ||
| else() | ||
| cc_library(${TARGET} SRCS ${cc_srcs} DEPS ${math_library_DEPS} ${math_common_deps}) |
There was a problem hiding this comment.
这里加个${cc_srcs}是否为空的判断，depthwise_conv应该就不需要特殊处理。
| math_library(unpooling) | ||
| math_library(cos_sim_functor) | ||
| math_library(lstm_compute DEPS activation_functions) | ||
| math_library(gru_compute DEPS activation_functions) |
There was a problem hiding this comment.
原来sequence_pooling, context_project, sequence2batch, gru_compute对math_function是有依赖的，其中:
sequnce_pooling和gru_compute确实调用了math_function中的函数，恰巧这几个Functor都没有单测，不然不加math_function的依赖应该会出错。context_project和sequence2batch包含了math_function.h，但似乎没有函数调用，include语句应该可以移除。context_project依赖了im2col，应该也是因为没有单测，所以才没报错。
There was a problem hiding this comment.
DONE。
除了context_project需要依赖math_function，因为调用了axpy。
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.