Skip to content

Commit eb46bfb

Browse files
risemeup1risemeup1
authored
Revert "[HACKATHON 6th] move distributed unit tests (#62762)" (#62857)
This reverts commit 67e02b0.
1 parent f962c9d commit eb46bfb

21 files changed

Lines changed: 74 additions & 39 deletions

‎paddle/fluid/distributed/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,5 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
6464
endif()
6565
add_subdirectory(common)
6666
add_subdirectory(ps)
67+
add_subdirectory(test)
6768
add_subdirectory(index_dataset)

‎paddle/fluid/distributed/common/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ cc_library(
22
afs_wrapper
33
SRCS afs_warpper.cc
44
DEPS framework_io ps_framework_proto)
5+
6+
#set_property(GLOBAL PROPERTY COMMON_DEPS afs_warpper)

‎paddle/fluid/distributed/ps/service/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ brpc_library(
2121
ps_framework_proto
2222
${BRPC_DEPS})
2323

24+
#set_property(GLOBAL PROPERTY RPC_DEPS sendrecv_rpc ${BRPC_DEPS} string_helper)
25+
2426
get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS)
2527

2628
proto_library(simple_brpc_proto SRCS simple_brpc.proto)

test/cpp/fluid/distributed/CMakeLists.txt renamed to paddle/fluid/distributed/test/CMakeLists.txt

Lines changed: 66 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,116 @@
1-
set(DISTRIBUTE_COMPILE_FLAGS
2-
"-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"
3-
)
4-
5-
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
6-
set(DISTRIBUTE_COMPILE_FLAGS "${DISTRIBUTE_COMPILE_FLAGS} -faligned-new")
7-
endif()
8-
9-
get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS)
10-
111
set_source_files_properties(
122
table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
13-
paddle_test(table_test SRCS table_test.cc DEPS ${RPC_DEPS})
3+
cc_test(
4+
table_test
5+
SRCS table_test.cc
6+
DEPS common_table table ps_framework_proto ${COMMON_DEPS} ${RPC_DEPS})
147

158
set_source_files_properties(
169
dense_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
17-
paddle_test(dense_table_test SRCS dense_table_test.cc DEPS ${RPC_DEPS})
10+
cc_test(
11+
dense_table_test
12+
SRCS dense_table_test.cc
13+
DEPS common_table table ps_framework_proto ${COMMON_DEPS} ${RPC_DEPS})
1814

1915
set_source_files_properties(
2016
barrier_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
21-
paddle_test(barrier_table_test SRCS barrier_table_test.cc)
17+
cc_test(
18+
barrier_table_test
19+
SRCS barrier_table_test.cc
20+
DEPS common_table table ps_framework_proto ${COMMON_DEPS})
2221

2322
set_source_files_properties(
2423
brpc_service_dense_sgd_test.cc PROPERTIES COMPILE_FLAGS
2524
${DISTRIBUTE_COMPILE_FLAGS})
26-
paddle_test(brpc_service_dense_sgd_test SRCS brpc_service_dense_sgd_test.cc
27-
DEPS scope)
25+
cc_test(
26+
brpc_service_dense_sgd_test
27+
SRCS brpc_service_dense_sgd_test.cc
28+
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
2829

2930
set_source_files_properties(
3031
brpc_service_sparse_sgd_test.cc PROPERTIES COMPILE_FLAGS
3132
${DISTRIBUTE_COMPILE_FLAGS})
32-
paddle_test(brpc_service_sparse_sgd_test SRCS brpc_service_sparse_sgd_test.cc
33-
DEPS scope)
33+
cc_test(
34+
brpc_service_sparse_sgd_test
35+
SRCS brpc_service_sparse_sgd_test.cc
36+
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
3437

3538
set_source_files_properties(
3639
brpc_utils_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
37-
paddle_test(
40+
cc_test(
3841
brpc_utils_test
39-
SRCS
40-
brpc_utils_test.cc
41-
DEPS
42-
scope
43-
phi
44-
common
45-
${RPC_DEPS})
42+
SRCS brpc_utils_test.cc
43+
DEPS brpc_utils
44+
scope
45+
phi
46+
common
47+
sendrecv_rpc
48+
ps_service
49+
${COMMON_DEPS}
50+
${RPC_DEPS})
4651

4752
set_source_files_properties(
4853
graph_node_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
49-
paddle_test(graph_node_test SRCS graph_node_test.cc DEPS scope)
54+
cc_test(
55+
graph_node_test
56+
SRCS graph_node_test.cc
57+
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
5058

5159
set_source_files_properties(
5260
graph_node_split_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
53-
paddle_test(graph_node_split_test SRCS graph_node_split_test.cc DEPS scope)
61+
cc_test(
62+
graph_node_split_test
63+
SRCS graph_node_split_test.cc
64+
DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS})
5465

5566
set_source_files_properties(
5667
graph_table_sample_test.cc PROPERTIES COMPILE_FLAGS
5768
${DISTRIBUTE_COMPILE_FLAGS})
58-
paddle_test(graph_table_sample_test SRCS graph_table_sample_test.cc)
69+
cc_test(
70+
graph_table_sample_test
71+
SRCS graph_table_sample_test.cc
72+
DEPS table ps_framework_proto ${COMMON_DEPS})
5973

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

63-
paddle_test(feature_value_test SRCS feature_value_test.cc)
77+
cc_test(
78+
feature_value_test
79+
SRCS feature_value_test.cc
80+
DEPS table common_table sendrecv_rpc ${COMMON_DEPS})
6481

6582
set_source_files_properties(
6683
sparse_sgd_rule_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
67-
paddle_test(sparse_sgd_rule_test SRCS sparse_sgd_rule_test.cc)
84+
cc_test(
85+
sparse_sgd_rule_test
86+
SRCS sparse_sgd_rule_test.cc
87+
DEPS ${COMMON_DEPS} table)
6888

6989
set_source_files_properties(
7090
ctr_accessor_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
71-
paddle_test(ctr_accessor_test SRCS ctr_accessor_test.cc)
91+
cc_test(
92+
ctr_accessor_test
93+
SRCS ctr_accessor_test.cc
94+
DEPS ${COMMON_DEPS} table)
7295
set_source_files_properties(
7396
ctr_dymf_accessor_test.cc PROPERTIES COMPILE_FLAGS
7497
${DISTRIBUTE_COMPILE_FLAGS})
75-
paddle_test(ctr_dymf_accessor_test SRCS ctr_dymf_accessor_test.cc)
98+
cc_test(
99+
ctr_dymf_accessor_test
100+
SRCS ctr_dymf_accessor_test.cc
101+
DEPS ${COMMON_DEPS} table)
76102

77103
set_source_files_properties(
78104
memory_sparse_table_test.cc PROPERTIES COMPILE_FLAGS
79105
${DISTRIBUTE_COMPILE_FLAGS})
80-
paddle_test(memory_sparse_table_test SRCS memory_sparse_table_test.cc DEPS)
106+
cc_test(
107+
memory_sparse_table_test
108+
SRCS memory_sparse_table_test.cc
109+
DEPS ${COMMON_DEPS} table)
81110

82111
set_source_files_properties(
83112
memory_geo_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
84-
paddle_test(memory_sparse_geo_table_test SRCS memory_geo_table_test.cc)
113+
cc_test(
114+
memory_sparse_geo_table_test
115+
SRCS memory_geo_table_test.cc
116+
DEPS ${COMMON_DEPS} table)

test/cpp/fluid/distributed/barrier_table_test.cc renamed to paddle/fluid/distributed/test/barrier_table_test.cc

File renamed without changes.

test/cpp/fluid/distributed/brpc_service_dense_sgd_test.cc renamed to paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc

File renamed without changes.

test/cpp/fluid/distributed/brpc_service_sparse_sgd_test.cc renamed to paddle/fluid/distributed/test/brpc_service_sparse_sgd_test.cc

File renamed without changes.

test/cpp/fluid/distributed/brpc_utils_test.cc renamed to paddle/fluid/distributed/test/brpc_utils_test.cc

File renamed without changes.

test/cpp/fluid/distributed/ctr_accessor_test.cc renamed to paddle/fluid/distributed/test/ctr_accessor_test.cc

File renamed without changes.

test/cpp/fluid/distributed/ctr_dymf_accessor_test.cc renamed to paddle/fluid/distributed/test/ctr_dymf_accessor_test.cc

File renamed without changes.

0 commit comments

Comments
 (0)