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

【CMake opt No.15】Remove all DEPS common with paddle_test #60149

Merged
merged 2 commits into from
Dec 19, 2023
Merged

【CMake opt No.15】Remove all DEPS common with paddle_test #60149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b98d5df
delete common
Liyulingyue Dec 19, 2023
fd5b954
delete common
Liyulingyue Dec 19, 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
3 changes: 1 addition & 2 deletions test/cpp/auto_parallel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ if(WITH_DISTRIBUTE)
DEPS
spmd_rule_test_util
spmd_rules
phi
common)
phi)
paddle_test(
softmax_grad_spmd_rule_test
SRCS
Expand Down
8 changes: 4 additions & 4 deletions test/cpp/eager/performance_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ if(NOT (NOT WITH_PYTHON AND ON_INFER))
eager_prim_api)

paddle_test(test_egr_performance_benchmark_eager_cpu SRCS
benchmark_eager_cpu.cc DEPS performance_benchmark_utils common)
benchmark_eager_cpu.cc DEPS performance_benchmark_utils)
paddle_test(test_egr_performance_benchmark_fluid_cpu SRCS
benchmark_fluid_cpu.cc DEPS performance_benchmark_utils common)
benchmark_fluid_cpu.cc DEPS performance_benchmark_utils)

if(WITH_GPU)
paddle_test(test_egr_performance_benchmark_eager_cuda SRCS
benchmark_eager_cuda.cc DEPS performance_benchmark_utils common)
benchmark_eager_cuda.cc DEPS performance_benchmark_utils)
paddle_test(test_egr_performance_benchmark_fluid_cuda SRCS
benchmark_fluid_cuda.cc DEPS performance_benchmark_utils common)
benchmark_fluid_cuda.cc DEPS performance_benchmark_utils)
endif()

if(WITH_ONNXRUNTIME AND WIN32)
Expand Down
3 changes: 1 addition & 2 deletions test/cpp/fluid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,14 @@ if(WITH_CINN)
op_debug_string_test.cc
DEPS
executor
common
fleet_executor
recurrent_op_helper
recurrent_op
elementwise_add_op
${COMMON_OP_DEPS}
python)
else()
paddle_test(op_debug_string_test SRCS op_debug_string_test.cc DEPS common)
paddle_test(op_debug_string_test SRCS op_debug_string_test.cc)
endif()

if(WITH_GPU)
Expand Down
1 change: 0 additions & 1 deletion test/cpp/fluid/cinn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ if(WITH_TESTING)
DEPS
fleet_executor
phi
common
lod_tensor
scope
proto_desc
Expand Down
3 changes: 1 addition & 2 deletions test/cpp/fluid/framework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,7 @@ if(WITH_CINN)
python)
set_tests_properties(cinn_cache_key_test PROPERTIES LABELS "RUN_TYPE=CINN")

paddle_test(build_cinn_pass_test SRCS paddle2cinn/build_cinn_pass_test.cc
DEPS common)
paddle_test(build_cinn_pass_test SRCS paddle2cinn/build_cinn_pass_test.cc)
set_tests_properties(build_cinn_pass_test PROPERTIES LABELS "RUN_TYPE=CINN")
# target_link_libraries(build_cinn_pass_test ${PYTHON_LIBRARIES})

Expand Down
2 changes: 1 addition & 1 deletion test/cpp/fluid/lite/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
paddle_test(test_lite_engine_op SRCS lite_engine_op_test.cc DEPS common)
paddle_test(test_lite_engine_op SRCS lite_engine_op_test.cc)

if(WITH_ONNXRUNTIME AND WIN32)
# Copy onnxruntime for some c++ test in Windows, since the test will
Expand Down
11 changes: 4 additions & 7 deletions test/cpp/fluid/pscore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,22 @@ endif()

set_source_files_properties(
heter_server_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
paddle_test(heter_server_test SRCS heter_server_test.cc DEPS common)
paddle_test(heter_server_test SRCS heter_server_test.cc)

set_source_files_properties(
send_and_recv_op_cpu_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
paddle_test(send_and_recv_cpu_test SRCS send_and_recv_op_cpu_test.cc DEPS
common)
paddle_test(send_and_recv_cpu_test SRCS send_and_recv_op_cpu_test.cc)

set_source_files_properties(
send_and_recv_op_gpu_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
paddle_test(send_and_recv_gpu_test SRCS send_and_recv_op_gpu_test.cc DEPS
common)
paddle_test(send_and_recv_gpu_test SRCS send_and_recv_op_gpu_test.cc)

set_source_files_properties(
heter_listen_and_server_test.cc PROPERTIES COMPILE_FLAGS
${DISTRIBUTE_COMPILE_FLAGS})
paddle_test(heter_listen_and_server_test SRCS heter_listen_and_server_test.cc
DEPS common)
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)
Expand Down
3 changes: 1 addition & 2 deletions test/cpp/new_executor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# skip win32 since wget is not installed by default on windows machine.

if(NOT WIN32)
paddle_test(standalone_executor_pir_test SRCS standalone_executor_pir_test.cc
DEPS common)
paddle_test(standalone_executor_pir_test SRCS standalone_executor_pir_test.cc)
endif()

set(OPS
Expand Down
5 changes: 2 additions & 3 deletions test/cpp/prim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set(prim_eager_deps
set(prim_generated_deps final_dygraph_function final_dygraph_node
dygraph_function dygraph_node)

paddle_test(test_comp_static SRCS test_static_prim.cc DEPS common)
paddle_test(test_comp_static SRCS test_static_prim.cc)

if(NOT (NOT WITH_PYTHON AND ON_INFER))
if(WITH_CINN)
Expand All @@ -25,8 +25,7 @@ if(NOT (NOT WITH_PYTHON AND ON_INFER))
cc_library(init_env_utils SRCS init_env_utils.cc)
target_compile_definitions(init_env_utils PUBLIC PADDLE_DLL_EXPORT)

paddle_test(test_comp_eager SRCS test_eager_prim.cc DEPS init_env_utils
common)
paddle_test(test_comp_eager SRCS test_eager_prim.cc DEPS init_env_utils)
endif()

# skip win32 since wget is not installed by default on windows machine.
Expand Down