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

[HACKATHON 6th] move distributed unit tests #62762

Merged
merged 1 commit into from
Mar 18, 2024
Merged

[HACKATHON 6th] move distributed unit tests #62762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion paddle/fluid/distributed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,4 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
endif()
add_subdirectory(common)
add_subdirectory(ps)
add_subdirectory(test)
add_subdirectory(index_dataset)
2 changes: 0 additions & 2 deletions paddle/fluid/distributed/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ cc_library(
afs_wrapper
SRCS afs_warpper.cc
DEPS framework_io ps_framework_proto)

#set_property(GLOBAL PROPERTY COMMON_DEPS afs_warpper)
2 changes: 0 additions & 2 deletions paddle/fluid/distributed/ps/service/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ brpc_library(
ps_framework_proto
${BRPC_DEPS})

#set_property(GLOBAL PROPERTY RPC_DEPS sendrecv_rpc ${BRPC_DEPS} string_helper)

get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS)

proto_library(simple_brpc_proto SRCS simple_brpc.proto)
Expand Down
5 changes: 5 additions & 0 deletions test/cpp/fluid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ if(WITH_MKLDNN)
add_subdirectory(mkldnn)
endif()
add_subdirectory(nccl)

if(WITH_DISTRIBUTE)
add_subdirectory(distributed)
endif()

if(WITH_PSCORE)
add_subdirectory(pscore)
endif()
Expand Down
150 changes: 92 additions & 58 deletions paddle/fluid/distributed/test/CMakeLists.txt → test/cpp/fluid/distributed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,116 +1,150 @@
set(DISTRIBUTE_COMPILE_FLAGS
"-Wno-error=unused-value -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=parentheses -Wno-error=unused-result"
)

if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
set(DISTRIBUTE_COMPILE_FLAGS "${DISTRIBUTE_COMPILE_FLAGS} -faligned-new")
endif()

get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS)

set_source_files_properties(
table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
table_test
SRCS table_test.cc
DEPS common_table table ps_framework_proto ${COMMON_DEPS} ${RPC_DEPS})
SRCS
table_test.cc
DEPS
common_table
table
ps_framework_proto
${RPC_DEPS})

set_source_files_properties(
dense_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
dense_table_test
SRCS dense_table_test.cc
DEPS common_table table ps_framework_proto ${COMMON_DEPS} ${RPC_DEPS})
SRCS
dense_table_test.cc
DEPS
common_table
table
ps_framework_proto
${RPC_DEPS})

set_source_files_properties(
barrier_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
barrier_table_test
SRCS barrier_table_test.cc
DEPS common_table table ps_framework_proto ${COMMON_DEPS})
SRCS
barrier_table_test.cc
DEPS
common_table
table
ps_framework_proto)

set_source_files_properties(
brpc_service_dense_sgd_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
brpc_service_dense_sgd_test
SRCS brpc_service_dense_sgd_test.cc
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
SRCS
brpc_service_dense_sgd_test.cc
DEPS
scope
ps_service
table
ps_framework_proto)

set_source_files_properties(
brpc_service_sparse_sgd_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
brpc_service_sparse_sgd_test
SRCS brpc_service_sparse_sgd_test.cc
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
SRCS
brpc_service_sparse_sgd_test.cc
DEPS
scope
ps_service
table
ps_framework_proto)

set_source_files_properties(
brpc_utils_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
brpc_utils_test
SRCS brpc_utils_test.cc
DEPS brpc_utils
scope
phi
common
sendrecv_rpc
ps_service
${COMMON_DEPS}
${RPC_DEPS})
SRCS
brpc_utils_test.cc
DEPS
brpc_utils
scope
phi
common
sendrecv_rpc
ps_service
${RPC_DEPS})

set_source_files_properties(
graph_node_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
graph_node_test
SRCS graph_node_test.cc
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
SRCS
graph_node_test.cc
DEPS
scope
ps_service
table
ps_framework_proto)

set_source_files_properties(
graph_node_split_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
paddle_test(
graph_node_split_test
SRCS graph_node_split_test.cc
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
SRCS
graph_node_split_test.cc
DEPS
scope
ps_service
table
ps_framework_proto)

set_source_files_properties(
graph_table_sample_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
graph_table_sample_test
SRCS graph_table_sample_test.cc
DEPS table ps_framework_proto ${COMMON_DEPS})
paddle_test(graph_table_sample_test SRCS graph_table_sample_test.cc DEPS table
ps_framework_proto)

set_source_files_properties(
feature_value_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})

cc_test(
paddle_test(
feature_value_test
SRCS feature_value_test.cc
DEPS table common_table sendrecv_rpc ${COMMON_DEPS})
SRCS
feature_value_test.cc
DEPS
table
common_table
sendrecv_rpc)

set_source_files_properties(
sparse_sgd_rule_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
sparse_sgd_rule_test
SRCS sparse_sgd_rule_test.cc
DEPS ${COMMON_DEPS} table)
paddle_test(sparse_sgd_rule_test SRCS sparse_sgd_rule_test.cc DEPS table)

set_source_files_properties(
ctr_accessor_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
ctr_accessor_test
SRCS ctr_accessor_test.cc
DEPS ${COMMON_DEPS} table)
paddle_test(ctr_accessor_test SRCS ctr_accessor_test.cc DEPS table)
set_source_files_properties(
ctr_dymf_accessor_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
ctr_dymf_accessor_test
SRCS ctr_dymf_accessor_test.cc
DEPS ${COMMON_DEPS} table)
paddle_test(ctr_dymf_accessor_test SRCS ctr_dymf_accessor_test.cc DEPS table)

set_source_files_properties(
memory_sparse_table_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
memory_sparse_table_test
SRCS memory_sparse_table_test.cc
DEPS ${COMMON_DEPS} table)
paddle_test(memory_sparse_table_test SRCS memory_sparse_table_test.cc DEPS
table)

set_source_files_properties(
memory_geo_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(
memory_sparse_geo_table_test
SRCS memory_geo_table_test.cc
DEPS ${COMMON_DEPS} table)
paddle_test(memory_sparse_geo_table_test SRCS memory_geo_table_test.cc DEPS
table)
0 ...id/distributed/test/barrier_table_test.cc → ...p/fluid/distributed/barrier_table_test.cc
View file
Open in desktop
File renamed without changes.
0 ...buted/test/brpc_service_dense_sgd_test.cc → ...istributed/brpc_service_dense_sgd_test.cc
View file
Open in desktop
File renamed without changes.
0 ...uted/test/brpc_service_sparse_sgd_test.cc → ...stributed/brpc_service_sparse_sgd_test.cc
View file
Open in desktop
File renamed without changes.
0 ...fluid/distributed/test/brpc_utils_test.cc → .../cpp/fluid/distributed/brpc_utils_test.cc
View file
Open in desktop
File renamed without changes.
0 ...uid/distributed/test/ctr_accessor_test.cc → ...pp/fluid/distributed/ctr_accessor_test.cc
View file
Open in desktop
File renamed without changes.
0 ...istributed/test/ctr_dymf_accessor_test.cc → ...uid/distributed/ctr_dymf_accessor_test.cc
View file
Open in desktop
File renamed without changes.
0 ...luid/distributed/test/dense_table_test.cc → ...cpp/fluid/distributed/dense_table_test.cc
View file
Open in desktop
File renamed without changes.
0 ...id/distributed/test/feature_value_test.cc → ...p/fluid/distributed/feature_value_test.cc
View file
Open in desktop
File renamed without changes.
0 ...distributed/test/graph_node_split_test.cc → ...luid/distributed/graph_node_split_test.cc
View file
Open in desktop
File renamed without changes.
0 ...fluid/distributed/test/graph_node_test.cc → .../cpp/fluid/distributed/graph_node_test.cc
View file
Open in desktop
File renamed without changes.
0 ...stributed/test/graph_table_sample_test.cc → ...id/distributed/graph_table_sample_test.cc
View file
Open in desktop
File renamed without changes.
0 ...distributed/test/memory_geo_table_test.cc → ...luid/distributed/memory_geo_table_test.cc
View file
Open in desktop
File renamed without changes.
0 ...tributed/test/memory_sparse_table_test.cc → ...d/distributed/memory_sparse_table_test.cc
View file
Open in desktop
File renamed without changes.
0 .../distributed/test/sparse_sgd_rule_test.cc → ...fluid/distributed/sparse_sgd_rule_test.cc
View file
Open in desktop
File renamed without changes.
0 paddle/fluid/distributed/test/table_test.cc → test/cpp/fluid/distributed/table_test.cc
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions test/cpp/fluid/pscore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ set_source_files_properties(
${DISTRIBUTE_COMPILE_FLAGS})
paddle_test(heter_listen_and_server_test SRCS heter_listen_and_server_test.cc)

#set_source_files_properties(heter_cloud_comm_cpu_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
#cc_test(heter_cloud_comm_cpu_test SRCS heter_cloud_comm_cpu_test.cc DEPS executor scope proto_desc generated_static_op heter_listen_and_serv_op ${RPC_DEPS} ${DISTRIBUTE_DEPS} phi common)

set_source_files_properties(
switch_server_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
paddle_test(switch_server_test SRCS switch_server_test.cc)