Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

link C++ tests to libpaddle.so #56829

Merged
merged 5 commits into from
Sep 2, 2023
Merged

link C++ tests to libpaddle.so #56829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82bf7b4
link C++ tests to libpaddle.so except windows
risemeup1 Aug 31, 2023
112c4af
fix compile kill-9 bug
risemeup1 Sep 1, 2023
8ed7a3b
fix compile kill-9 bug
risemeup1 Sep 1, 2023
e3d2678
fix compile kill-9 bug
risemeup1 Sep 1, 2023
e4f5788
fix compile kill-9 bug
risemeup1 Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 122 additions & 30 deletions paddle/fluid/distributed/fleet_executor/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,154 @@
get_property(paddle_lib GLOBAL PROPERTY PADDLE_LIB_NAME)
set_source_files_properties(
interceptor_ping_pong_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(interceptor_ping_pong_test SRCS interceptor_ping_pong_test.cc DEPS
fleet_executor ${BRPC_DEPS})
if(WIN32 AND WITH_TESTING)
cc_test_old(interceptor_ping_pong_test SRCS interceptor_ping_pong_test.cc
DEPS fleet_executor ${BRPC_DEPS})
else()
cc_test_old(
interceptor_ping_pong_test
SRCS
interceptor_ping_pong_test.cc
DEPS
${paddle_lib}
python
fleet_executor)
endif()

set_source_files_properties(
compute_interceptor_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(compute_interceptor_test SRCS compute_interceptor_test.cc DEPS
fleet_executor ${BRPC_DEPS})

if(WIN32 AND WITH_TESTING)
cc_test_old(compute_interceptor_test SRCS compute_interceptor_test.cc DEPS
fleet_executor ${BRPC_DEPS})
else()
cc_test_old(
compute_interceptor_test
SRCS
compute_interceptor_test.cc
DEPS
${paddle_lib}
python
fleet_executor)
endif()

set_source_files_properties(
source_interceptor_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(source_interceptor_test SRCS source_interceptor_test.cc DEPS
fleet_executor ${BRPC_DEPS})
if(WIN32 AND WITH_TESTING)
cc_test_old(source_interceptor_test SRCS source_interceptor_test.cc DEPS
fleet_executor ${BRPC_DEPS})
else()
cc_test_old(
source_interceptor_test
SRCS
source_interceptor_test.cc
DEPS
${paddle_lib}
python
fleet_executor)
endif()

set_source_files_properties(
sink_interceptor_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(sink_interceptor_test SRCS sink_interceptor_test.cc DEPS
fleet_executor ${BRPC_DEPS})
if(WIN32 AND WITH_TESTING)
cc_test_old(sink_interceptor_test SRCS sink_interceptor_test.cc DEPS
fleet_executor ${BRPC_DEPS})
else()
cc_test_old(
sink_interceptor_test
SRCS
sink_interceptor_test.cc
DEPS
${paddle_lib}
python
fleet_executor)
endif()

set_source_files_properties(
interceptor_pipeline_short_path_test.cc
PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(
interceptor_pipeline_short_path_test SRCS
interceptor_pipeline_short_path_test.cc DEPS fleet_executor ${BRPC_DEPS})
if(WIN32 AND WITH_TESTING)
cc_test_old(
interceptor_pipeline_short_path_test SRCS
interceptor_pipeline_short_path_test.cc DEPS fleet_executor ${BRPC_DEPS})
else()
cc_test_old(
interceptor_pipeline_short_path_test
SRCS
interceptor_pipeline_short_path_test.cc
DEPS
${paddle_lib}
python
fleet_executor)
endif()

set_source_files_properties(
interceptor_pipeline_long_path_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(
interceptor_pipeline_long_path_test SRCS
interceptor_pipeline_long_path_test.cc DEPS fleet_executor ${BRPC_DEPS})
if(WIN32 AND WITH_TESTING)
cc_test_old(
interceptor_pipeline_long_path_test SRCS
interceptor_pipeline_long_path_test.cc DEPS fleet_executor ${BRPC_DEPS})
else()
cc_test_old(
interceptor_pipeline_long_path_test
SRCS
interceptor_pipeline_long_path_test.cc
DEPS
${paddle_lib}
python
fleet_executor)
endif()

set_source_files_properties(
compute_interceptor_run_op_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(
compute_interceptor_run_op_test
SRCS
compute_interceptor_run_op_test.cc
DEPS
fleet_executor
naive_executor
fill_constant_op
op_registry
elementwise_add_op
scope
device_context
${BRPC_DEPS})
if(WIN32 AND WITH_TESTING)
cc_test_old(
compute_interceptor_run_op_test
SRCS
compute_interceptor_run_op_test.cc
DEPS
fleet_executor
naive_executor
fill_constant_op
op_registry
elementwise_add_op
scope
device_context
${BRPC_DEPS})
else()
cc_test_old(
compute_interceptor_run_op_test
SRCS
compute_interceptor_run_op_test.cc
DEPS
${paddle_lib}
python
fleet_executor
fill_constant_op
elementwise_add_op)
endif()

if(WITH_DISTRIBUTE AND NOT WITH_PSLIB)
set_source_files_properties(
interceptor_ping_pong_with_brpc_test.cc
PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test_old(
interceptor_ping_pong_with_brpc_test SRCS
interceptor_ping_pong_with_brpc_test.cc DEPS fleet_executor ${BRPC_DEPS})
if(WIN32 AND WITH_TESTING)
cc_test_old(
interceptor_ping_pong_with_brpc_test SRCS
interceptor_ping_pong_with_brpc_test.cc DEPS fleet_executor ${BRPC_DEPS})
else()
cc_test_old(
interceptor_ping_pong_with_brpc_test
SRCS
interceptor_ping_pong_with_brpc_test.cc
DEPS
${paddle_lib}
python
fleet_executor)
endif()
endif()
32 changes: 5 additions & 27 deletions test/cpp/fluid/mkldnn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
get_property(paddle_lib GLOBAL PROPERTY PADDLE_LIB_NAME)
cc_test(
test_mkldnn_op_inplace
SRCS test_mkldnn_op_inplace.cc
Expand Down Expand Up @@ -41,33 +42,7 @@ cc_test(
test_mkldnn_caching
SRCS test_mkldnn_caching.cc
DEPS ${TEST_MKLDNN_CACHING_DEPS})
if(WITH_CINN)
cc_test_old(
test_mkldnn_op_nhwc
SRCS
test_mkldnn_op_nhwc.cc
DEPS
fleet_executor
conditional_block_op
standalone_executor
executor
recurrent_op_helper
cinn_compiler
recurrent_op
op_registry
generated_static_op
crop_op
activation_op
generated_op
generated_static_op
phi
transpose_op
fused_transpose_op
scope
device_context
enforce
python)
else()
if(WIN32 AND WITH_TESTING)
cc_test_old(
test_mkldnn_op_nhwc
SRCS
Expand All @@ -91,4 +66,7 @@ else()
scope
device_context
enforce)
else()
cc_test_old(test_mkldnn_op_nhwc SRCS test_mkldnn_op_nhwc.cc DEPS
${paddle_lib} python)
endif()