From 087711c6b9d0980672bdadc5b92e8a176464b64a Mon Sep 17 00:00:00 2001 From: Roc <30228238+sljlp@users.noreply.github.com> Date: Mon, 5 Sep 2022 10:53:40 +0800 Subject: [PATCH] update for runtype and serial (#45699) --- .../tests/unittests/collective/CMakeLists.txt | 111 ++++++------ .../unittests/collective/fleet/CMakeLists.txt | 159 ++++++------------ .../unittests/collective/fleet/testslist.csv | 144 ++++++++-------- .../collective/multinode/CMakeLists.txt | 12 +- .../collective/multinode/testslist.csv | 6 +- .../tests/unittests/collective/testslist.csv | 68 ++++---- tools/gen_ut_cmakelists.hook | 4 +- tools/gen_ut_cmakelists.py | 5 +- 8 files changed, 231 insertions(+), 278 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/collective/CMakeLists.txt b/python/paddle/fluid/tests/unittests/collective/CMakeLists.txt index 93eaad262b..3a30617ede 100644 --- a/python/paddle/fluid/tests/unittests/collective/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/collective/CMakeLists.txt @@ -8,31 +8,36 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_allreduce MODULES test_allreduce ENVS "PYTHONPATH=..:${PADDLE_BINARY_DIR}/python;http_proxy=;https_proxy=") - set_tests_properties(test_allreduce PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_allreduce PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_broadcast MODULES test_broadcast ENVS "PYTHONPATH=..:${PADDLE_BINARY_DIR}/python;http_proxy=;https_proxy=") - set_tests_properties(test_broadcast PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_broadcast PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_c_concat MODULES test_c_concat ENVS "PYTHONPATH=..:${PADDLE_BINARY_DIR}/python;http_proxy=;https_proxy=") - set_tests_properties(test_c_concat PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_c_concat PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_c_identity MODULES test_c_identity ENVS "PYTHONPATH=..:${PADDLE_BINARY_DIR}/python;http_proxy=;https_proxy=") - set_tests_properties(test_c_identity PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_c_identity PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_c_split MODULES test_c_split ENVS "PYTHONPATH=..:${PADDLE_BINARY_DIR}/python;http_proxy=;https_proxy=") - set_tests_properties(test_c_split PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_c_split PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if((WITH_ROCM OR WITH_GPU) AND (LINUX)) bash_test_modules( @@ -44,15 +49,14 @@ if((WITH_ROCM OR WITH_GPU) AND (LINUX)) ENVS "PADDLE_DIST_UT_PORT=21288;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python;http_proxy=;https_proxy=" ) - set_tests_properties(test_collective_split_embedding PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_split_embedding PROPERTIES TIMEOUT "300") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_allgather_api MODULES test_collective_allgather_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_allgather_api PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_allgather_api + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( @@ -60,21 +64,21 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) test_collective_allgather_object_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_collective_allgather_object_api - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_allreduce_api MODULES test_collective_allreduce_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_allreduce_api PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_collective_allreduce_api + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_alltoall_api MODULES test_collective_alltoall_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_alltoall_api PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_collective_alltoall_api + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) bash_test_modules( @@ -86,15 +90,14 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) ENVS "PADDLE_DIST_UT_PORT=21290;http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_collective_alltoall_single PROPERTIES TIMEOUT "350" - RUN_SERIAL 1) + set_tests_properties(test_collective_alltoall_single PROPERTIES TIMEOUT "350") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_barrier_api MODULES test_collective_barrier_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_barrier_api PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_barrier_api + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) bash_test_modules( @@ -106,15 +109,15 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) ENVS "PADDLE_DIST_UT_PORT=21292;http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_collective_batch_isend_irecv - PROPERTIES TIMEOUT "350" RUN_SERIAL 1) + set_tests_properties(test_collective_batch_isend_irecv PROPERTIES TIMEOUT + "350") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_broadcast_api MODULES test_collective_broadcast_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_broadcast_api PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_collective_broadcast_api + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( @@ -122,28 +125,28 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) test_collective_cpu_barrier_with_gloo ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_collective_cpu_barrier_with_gloo - PROPERTIES TIMEOUT "300" RUN_SERIAL 1) + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_global_gather MODULES test_collective_global_gather ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_global_gather PROPERTIES TIMEOUT "200" - RUN_SERIAL 1) + set_tests_properties(test_collective_global_gather + PROPERTIES TIMEOUT "200" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_global_scatter MODULES test_collective_global_scatter ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_global_scatter PROPERTIES TIMEOUT "200" - RUN_SERIAL 1) + set_tests_properties(test_collective_global_scatter + PROPERTIES TIMEOUT "200" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_optimizer MODULES test_collective_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_optimizer PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_optimizer + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) bash_test_modules( @@ -155,22 +158,21 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) ENVS "PADDLE_DIST_UT_PORT=21294;http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_collective_process_group PROPERTIES TIMEOUT "350" - RUN_SERIAL 1) + set_tests_properties(test_collective_process_group PROPERTIES TIMEOUT "350") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_reduce MODULES test_collective_reduce ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_reduce PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_reduce PROPERTIES TIMEOUT "300" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_reduce_api MODULES test_collective_reduce_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_reduce_api PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_reduce_api + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) bash_test_modules( @@ -182,43 +184,42 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) ENVS "PADDLE_DIST_UT_PORT=21296;http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_collective_reduce_scatter PROPERTIES TIMEOUT "350" - RUN_SERIAL 1) + set_tests_properties(test_collective_reduce_scatter PROPERTIES TIMEOUT "350") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_scatter MODULES test_collective_scatter ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_scatter PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_scatter PROPERTIES TIMEOUT "300" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_scatter_api MODULES test_collective_scatter_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_scatter_api PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_scatter_api + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_sendrecv MODULES test_collective_sendrecv ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_sendrecv PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_collective_sendrecv PROPERTIES TIMEOUT "300" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_sendrecv_api MODULES test_collective_sendrecv_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_sendrecv_api PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_collective_sendrecv_api + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_split_col_linear MODULES test_collective_split_col_linear ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_collective_split_col_linear - PROPERTIES TIMEOUT "300" RUN_SERIAL 1) + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( @@ -226,34 +227,35 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) test_collective_split_embedding_none_divisible ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_collective_split_embedding_none_divisible - PROPERTIES TIMEOUT "300" RUN_SERIAL 1) + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_split_row_linear MODULES test_collective_split_row_linear ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_collective_split_row_linear - PROPERTIES TIMEOUT "300" RUN_SERIAL 1) + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_collective_wait MODULES test_collective_wait ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_collective_wait PROPERTIES TIMEOUT "300" RUN_SERIAL - 1) + set_tests_properties(test_collective_wait PROPERTIES TIMEOUT "300" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_eager_dist_api MODULES test_eager_dist_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_eager_dist_api PROPERTIES TIMEOUT "120" RUN_SERIAL - 1) + set_tests_properties(test_eager_dist_api PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_new_group_api MODULES test_new_group_api ENVS "http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_new_group_api PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_new_group_api PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM @@ -270,7 +272,6 @@ if((WITH_GPU ENVS "PADDLE_DIST_UT_PORT=21298;http_proxy=;https_proxy=;PYTHONPATH=..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_gen_nccl_id_op PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( @@ -278,7 +279,7 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) test_communication_stream_allreduce_api ENVS "PYTHONPATH=..:${PADDLE_BINARY_DIR}/python;http_proxy=;https_proxy=") set_tests_properties(test_communication_stream_allreduce_api - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() add_subdirectory(fleet) add_subdirectory(multinode) diff --git a/python/paddle/fluid/tests/unittests/collective/fleet/CMakeLists.txt b/python/paddle/fluid/tests/unittests/collective/fleet/CMakeLists.txt index 6f4363c906..83cb99a2e7 100644 --- a/python/paddle/fluid/tests/unittests/collective/fleet/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/collective/fleet/CMakeLists.txt @@ -15,20 +15,18 @@ if((WITH_GPU test_fleet_sharding_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_fleet_sharding_meta_optimizer - PROPERTIES TIMEOUT "350" RUN_SERIAL 1) + PROPERTIES TIMEOUT "350" LABELS "RUN_TYPE=DIST") endif() if(LOCAL_ALL_ARCH AND (LINUX OR WIN32)) py_test_modules( test_fleet_static_mp_layers MODULES test_fleet_static_mp_layers ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_static_mp_layers PROPERTIES RUN_SERIAL 1) endif() if(WITH_DGC) if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) py_test_modules( test_dgc_op MODULES test_dgc_op ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_dgc_op PROPERTIES RUN_SERIAL 1) endif() endif() if(WITH_DGC) @@ -36,7 +34,6 @@ if(WITH_DGC) py_test_modules( test_dgc_optimizer MODULES test_dgc_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_dgc_optimizer PROPERTIES RUN_SERIAL 1) endif() endif() if(WITH_NCCL) @@ -50,8 +47,8 @@ if(WITH_NCCL) ENVS "PADDLE_DIST_UT_PORT=21200;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_margin_cross_entropy - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_parallel_margin_cross_entropy PROPERTIES TIMEOUT + "120") endif() endif() if(WITH_NCCL) @@ -65,8 +62,7 @@ if(WITH_NCCL) ENVS "PADDLE_DIST_UT_PORT=21202;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_dygraph_sharding_stage3 PROPERTIES TIMEOUT "350" - RUN_SERIAL 1) + set_tests_properties(test_dygraph_sharding_stage3 PROPERTIES TIMEOUT "350") endif() endif() if(WITH_NCCL) @@ -81,8 +77,6 @@ if(WITH_NCCL) ENVS "PADDLE_DIST_UT_PORT=21204;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_transformer - PROPERTIES RUN_SERIAL 1) endif() endif() endif() @@ -96,16 +90,12 @@ if((WITH_ROCM) AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21204;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_transformer PROPERTIES RUN_SERIAL - 1) endif() if(LOCAL_ALL_ARCH AND (LINUX OR WIN32)) py_test_modules( test_fleet_fp16_allreduce_meta_optimizer MODULES test_fleet_fp16_allreduce_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_fp16_allreduce_meta_optimizer - PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_XPU @@ -122,7 +112,6 @@ if((WITH_GPU ENVS "PADDLE_DIST_UT_PORT=21208;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_rnn_dp PROPERTIES RUN_SERIAL 1) endif() if(WITH_NCCL) if((WITH_GPU) AND LOCAL_ALL_PLAT) @@ -135,8 +124,8 @@ if(WITH_NCCL) ENVS "PADDLE_DIST_UT_PORT=21210;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_mp_layers - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_mp_layers PROPERTIES TIMEOUT + "120") endif() endif() if(LOCAL_ALL_ARCH AND (LINUX OR APPLE)) @@ -149,7 +138,6 @@ if(LOCAL_ALL_ARCH AND (LINUX OR APPLE)) ENVS "PADDLE_DIST_UT_PORT=21212;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_tcp_store PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -161,8 +149,8 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21214;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_dygraph_sharding_stage3_for_eager - PROPERTIES TIMEOUT "350" RUN_SERIAL 1) + set_tests_properties(test_dygraph_sharding_stage3_for_eager PROPERTIES TIMEOUT + "350") endif() if((WITH_GPU OR WITH_XPU @@ -179,8 +167,6 @@ if((WITH_GPU ENVS "PADDLE_DIST_UT_PORT=21216;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_fleet_graph_execution_meta_optimizer - PROPERTIES RUN_SERIAL 1) endif() if(WITH_NCCL) if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) @@ -191,8 +177,8 @@ if(WITH_NCCL) ENVS "FLAGS_communicator_send_queue_size=1;FLAGS_communicator_max_merge_var_num=1;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_communicator_half_async PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_communicator_half_async + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() endif() if((WITH_GPU @@ -204,7 +190,6 @@ if((WITH_GPU py_test_modules( test_fleet_graph_executor MODULES test_fleet_graph_executor ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_graph_executor PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU) AND LOCAL_ALL_PLAT) bash_test_modules( @@ -217,7 +202,7 @@ if((WITH_GPU) AND LOCAL_ALL_PLAT) "PADDLE_DIST_UT_PORT=21218;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) set_tests_properties(test_parallel_dygraph_pipeline_parallel - PROPERTIES TIMEOUT "500" RUN_SERIAL 1) + PROPERTIES TIMEOUT "500") endif() if((WITH_GPU OR WITH_XPU @@ -229,8 +214,6 @@ if((WITH_GPU test_fleet_localsgd_meta_optimizer MODULES test_fleet_localsgd_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_localsgd_meta_optimizer PROPERTIES RUN_SERIAL - 1) endif() if(WITH_NCCL) if((WITH_GPU) AND LOCAL_ALL_PLAT) @@ -243,8 +226,8 @@ if(WITH_NCCL) ENVS "PADDLE_DIST_UT_PORT=21220;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_class_center_sample - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_parallel_class_center_sample PROPERTIES TIMEOUT + "120") endif() endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) @@ -257,13 +240,14 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21222;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_pipeline PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_pipeline PROPERTIES TIMEOUT "120") endif() if(LOCAL_ALL_ARCH AND (LINUX OR APPLE)) py_test_modules( test_fleet_utils MODULES test_fleet_utils ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_utils PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_fleet_utils PROPERTIES TIMEOUT "120" LABELS + "RUN_TYPE=DIST") endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -275,8 +259,7 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21224;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_static_model_parallel PROPERTIES TIMEOUT "240" - RUN_SERIAL 1) + set_tests_properties(test_static_model_parallel PROPERTIES TIMEOUT "240") endif() if(WITH_NCCL) if((WITH_GPU) AND LOCAL_ALL_PLAT) @@ -289,8 +272,7 @@ if(WITH_NCCL) ENVS "PADDLE_DIST_UT_PORT=21226;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_no_sync PROPERTIES TIMEOUT "300" - RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_no_sync PROPERTIES TIMEOUT "300") endif() endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) @@ -303,8 +285,7 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21228;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_dygraph_sharding_stage2 PROPERTIES TIMEOUT "200" - RUN_SERIAL 1) + set_tests_properties(test_dygraph_sharding_stage2 PROPERTIES TIMEOUT "200") endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -316,8 +297,8 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21230;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_control_flow - PROPERTIES TIMEOUT "350" RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_control_flow PROPERTIES TIMEOUT + "350") endif() if((WITH_GPU OR WITH_XPU @@ -334,7 +315,6 @@ if((WITH_GPU ENVS "PADDLE_DIST_UT_PORT=21232;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_fleet_lars_meta_optimizer PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -346,27 +326,25 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21234;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_hybrid_parallel_inference_helper - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_hybrid_parallel_inference_helper PROPERTIES TIMEOUT + "120") endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) py_test_modules( test_fleet_rolemaker_new MODULES test_fleet_rolemaker_new ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_rolemaker_new PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_ROCM) AND (LINUX OR WIN32)) py_test_modules( test_dist_mnist_gradient_merge MODULES test_dist_mnist_gradient_merge ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_dist_mnist_gradient_merge PROPERTIES TIMEOUT "360" - RUN_SERIAL 1) + set_tests_properties(test_dist_mnist_gradient_merge + PROPERTIES TIMEOUT "360" LABELS "RUN_TYPE=DIST") endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) py_test_modules( test_recv_save_op MODULES test_recv_save_op ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_recv_save_op PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) py_test_modules( @@ -376,7 +354,6 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "FLAGS_communicator_send_queue_size=1;FLAGS_communicator_max_merge_var_num=1;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_communicator_sync PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_XPU @@ -393,8 +370,6 @@ if((WITH_GPU ENVS "PADDLE_DIST_UT_PORT=21236;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_fleet_pipeline_meta_optimizer PROPERTIES RUN_SERIAL - 1) endif() if((WITH_GPU OR WITH_XPU @@ -406,14 +381,11 @@ if((WITH_GPU test_fleet_gradient_merge_meta_optimizer MODULES test_fleet_gradient_merge_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_gradient_merge_meta_optimizer - PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND (LINUX OR WIN32)) py_test_modules( test_fleet_amp_init MODULES test_fleet_amp_init ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_amp_init PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -425,14 +397,13 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21238;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_dygraph_sharding_optimizer_stage2 - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_dygraph_sharding_optimizer_stage2 PROPERTIES TIMEOUT + "120") endif() if(LOCAL_ALL_ARCH AND (LINUX OR WIN32)) py_test_modules( test_fleet_meta_optimizer_base MODULES test_fleet_meta_optimizer_base ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_meta_optimizer_base PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_XPU @@ -449,8 +420,6 @@ if((WITH_GPU ENVS "PADDLE_DIST_UT_PORT=21240;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_fleet_raw_program_meta_optimizer - PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -463,7 +432,7 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) "PADDLE_DIST_UT_PORT=21242;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) set_tests_properties(test_parallel_dygraph_sharding_parallel - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + PROPERTIES TIMEOUT "120") endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -475,8 +444,8 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21244;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_tensor_parallel - PROPERTIES TIMEOUT "200" RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_tensor_parallel PROPERTIES TIMEOUT + "200") endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -489,21 +458,19 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) "PADDLE_DIST_UT_PORT=21246;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) set_tests_properties(test_dygraph_group_sharded_api_for_eager - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + PROPERTIES TIMEOUT "120") endif() if(LOCAL_ALL_ARCH AND (LINUX OR WIN32)) py_test_modules( test_fleet_distributed_strategy MODULES test_fleet_distributed_strategy ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_distributed_strategy PROPERTIES RUN_SERIAL 1) endif() if(WITH_DGC) if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) py_test_modules( test_fleet_dgc_meta_optimizer MODULES test_fleet_dgc_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_dgc_meta_optimizer PROPERTIES RUN_SERIAL 1) endif() endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) @@ -516,8 +483,8 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21248;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_unused_variables - PROPERTIES TIMEOUT "350" RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_unused_variables PROPERTIES TIMEOUT + "350") endif() if((WITH_GPU OR WITH_XPU @@ -528,14 +495,12 @@ if((WITH_GPU py_test_modules( test_fleet_lamb_meta_optimizer MODULES test_fleet_lamb_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_lamb_meta_optimizer PROPERTIES RUN_SERIAL 1) endif() if(WITH_DGC) if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) py_test_modules( test_dgc_momentum_op MODULES test_dgc_momentum_op ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_dgc_momentum_op PROPERTIES RUN_SERIAL 1) endif() endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) @@ -549,7 +514,7 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) "PADDLE_DIST_UT_PORT=21250;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) set_tests_properties(test_parallel_dygraph_no_sync_gradient_check - PROPERTIES TIMEOUT "60" RUN_SERIAL 1) + PROPERTIES TIMEOUT "60") endif() if((WITH_GPU OR WITH_XPU @@ -566,8 +531,6 @@ if((WITH_GPU ENVS "PADDLE_DIST_UT_PORT=21252;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_fleet_pipeline_meta_optimizer_with_recompute - PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_XPU @@ -579,7 +542,6 @@ if((WITH_GPU test_fleet_hybrid_meta_optimizer MODULES test_fleet_hybrid_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_hybrid_meta_optimizer PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -591,8 +553,7 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21254;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_qat PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_qat PROPERTIES TIMEOUT "120") endif() if(WITH_NCCL) if(${NCCL_VERSION} VERSION_GREATER_EQUAL 2212) @@ -607,7 +568,7 @@ if(WITH_NCCL) "PADDLE_DIST_UT_PORT=21256;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) set_tests_properties(test_parallel_dygraph_sparse_embedding - PROPERTIES TIMEOUT "200" RUN_SERIAL 1) + PROPERTIES TIMEOUT "200") endif() endif() endif() @@ -621,8 +582,8 @@ if((WITH_ROCM) AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21256;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_sparse_embedding - PROPERTIES TIMEOUT "200" RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_sparse_embedding PROPERTIES TIMEOUT + "200") endif() if((WITH_GPU OR WITH_XPU @@ -633,7 +594,6 @@ if((WITH_GPU py_test_modules( test_fleet_amp_meta_optimizer MODULES test_fleet_amp_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_amp_meta_optimizer PROPERTIES RUN_SERIAL 1) endif() if(WITH_NCCL) if(${NCCL_VERSION} VERSION_GREATER_EQUAL 2212) @@ -648,7 +608,7 @@ if(WITH_NCCL) "PADDLE_DIST_UT_PORT=21260;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) set_tests_properties(test_parallel_dygraph_sparse_embedding_over_height - PROPERTIES TIMEOUT "150" RUN_SERIAL 1) + PROPERTIES TIMEOUT "150") endif() endif() endif() @@ -663,13 +623,12 @@ if((WITH_ROCM) AND LOCAL_ALL_PLAT) "PADDLE_DIST_UT_PORT=21260;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) set_tests_properties(test_parallel_dygraph_sparse_embedding_over_height - PROPERTIES TIMEOUT "350" RUN_SERIAL 1) + PROPERTIES TIMEOUT "350") endif() if(LOCAL_ALL_ARCH AND (LINUX OR APPLE)) py_test_modules( test_distributed_strategy MODULES test_distributed_strategy ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_distributed_strategy PROPERTIES RUN_SERIAL 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -681,8 +640,7 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21264;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_auto_parallel_parallelizer PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_auto_parallel_parallelizer PROPERTIES TIMEOUT "120") endif() if((WITH_GPU OR WITH_XPU @@ -694,8 +652,6 @@ if((WITH_GPU test_fleet_recompute_meta_optimizer MODULES test_fleet_recompute_meta_optimizer ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_recompute_meta_optimizer PROPERTIES RUN_SERIAL - 1) endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -707,14 +663,12 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21266;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_dygraph_group_sharded_api PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_dygraph_group_sharded_api PROPERTIES TIMEOUT "120") endif() if(LOCAL_ALL_ARCH AND (LINUX OR WIN32)) py_test_modules( test_fleet_private_function MODULES test_fleet_private_function ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_private_function PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_XPU @@ -730,7 +684,6 @@ if((WITH_GPU "RUN_TYPE=DIST" ENVS "PADDLE_DIST_UT_PORT=21268;http_proxy=;https_proxy=") - set_tests_properties(test_new_group PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_XPU @@ -746,8 +699,7 @@ if((WITH_GPU "RUN_TYPE=DIST" ENVS "PADDLE_DIST_UT_PORT=21270;http_proxy=;https_proxy=") - set_tests_properties(test_c_comm_init_op PROPERTIES TIMEOUT "120" RUN_SERIAL - 1) + set_tests_properties(test_c_comm_init_op PROPERTIES TIMEOUT "120") endif() if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) bash_test_modules( @@ -759,8 +711,7 @@ if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21272;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_ir_pass_pipeline PROPERTIES TIMEOUT "120" - RUN_SERIAL 1) + set_tests_properties(test_ir_pass_pipeline PROPERTIES TIMEOUT "120") endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) bash_test_modules( @@ -772,8 +723,7 @@ if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21274;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_mnist PROPERTIES TIMEOUT "200" - RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_mnist PROPERTIES TIMEOUT "200") endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) bash_test_modules( @@ -785,8 +735,8 @@ if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) ENVS "PADDLE_DIST_UT_PORT=21276;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_parallel_dygraph_se_resnext - PROPERTIES TIMEOUT "200" RUN_SERIAL 1) + set_tests_properties(test_parallel_dygraph_se_resnext PROPERTIES TIMEOUT + "200") endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) py_test_modules( @@ -794,7 +744,7 @@ if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) test_parallel_dygraph_sync_batch_norm ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_parallel_dygraph_sync_batch_norm - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) py_test_modules( @@ -802,7 +752,7 @@ if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) test_imperative_auto_mixed_precision ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_imperative_auto_mixed_precision - PROPERTIES TIMEOUT "300" RUN_SERIAL 1) + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) py_test_modules( @@ -810,26 +760,23 @@ if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) test_imperative_auto_mixed_precision_for_eager ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") set_tests_properties(test_imperative_auto_mixed_precision_for_eager - PROPERTIES TIMEOUT "300" RUN_SERIAL 1) + PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST") endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) py_test_modules( test_mixed_precision MODULES test_mixed_precision ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_mixed_precision PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) py_test_modules( test_dygraph_recompute MODULES test_dygraph_recompute ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_dygraph_recompute PROPERTIES RUN_SERIAL 1) endif() if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT) py_test_modules( test_dygraph_recompute_for_eager MODULES test_dygraph_recompute_for_eager ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_dygraph_recompute_for_eager PROPERTIES RUN_SERIAL 1) endif() if(WITH_NCCL OR WITH_RCCL) if(WITH_DGC) @@ -843,7 +790,6 @@ if(WITH_NCCL OR WITH_RCCL) ENVS "PADDLE_DIST_UT_PORT=21278;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_dist_mnist_dgc_nccl PROPERTIES RUN_SERIAL 1) endif() endif() endif() @@ -859,7 +805,6 @@ if(WITH_NCCL OR WITH_RCCL) ENVS "PADDLE_DIST_UT_PORT=21280;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python" ) - set_tests_properties(test_dist_se_resnext_dgc PROPERTIES RUN_SERIAL 1) endif() endif() endif() @@ -975,5 +920,7 @@ if((WITH_GPU OR WITH_ROCM) AND (LINUX)) py_test_modules( test_fleet_checkpoint MODULES test_fleet_checkpoint ENVS "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python") - set_tests_properties(test_fleet_checkpoint PROPERTIES TIMEOUT "200") + set_tests_properties( + test_fleet_checkpoint PROPERTIES TIMEOUT "200" LABELS + "RUN_TYPE=EXCLUSIVE:NIGHTLY") endif() diff --git a/python/paddle/fluid/tests/unittests/collective/fleet/testslist.csv b/python/paddle/fluid/tests/unittests/collective/fleet/testslist.csv index a81cb4e231..cb5607325a 100644 --- a/python/paddle/fluid/tests/unittests/collective/fleet/testslist.csv +++ b/python/paddle/fluid/tests/unittests/collective/fleet/testslist.csv @@ -1,76 +1,76 @@ name,os,arch,timeout,run_type,launcher,num_port,run_serial,envs,conditions -test_fleet_sharding_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,350,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_static_mp_layers,LINUX;WIN32,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dgc_op,,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC -test_dgc_optimizer,,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC -test_parallel_margin_cross_entropy,,GPU,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL -test_dygraph_sharding_stage3,,GPU,350,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL -test_parallel_dygraph_transformer,,GPU,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212 -test_parallel_dygraph_transformer,,ROCM,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_fp16_allreduce_meta_optimizer,LINUX;WIN32,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_rnn_dp,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_mp_layers,,GPU,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL -test_tcp_store,LINUX;APPLE,,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dygraph_sharding_stage3_for_eager,,,350,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_graph_execution_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_communicator_half_async,,,120,DIST,test_runner.py,2,1,FLAGS_communicator_send_queue_size=1;FLAGS_communicator_max_merge_var_num=1;http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL -test_fleet_graph_executor,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_pipeline_parallel,,GPU,500,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_localsgd_meta_optimizer,LINUX,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_class_center_sample,,GPU,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL -test_pipeline,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_utils,LINUX;APPLE,,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_static_model_parallel,,,240,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_no_sync,,GPU,300,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL -test_dygraph_sharding_stage2,,,200,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_control_flow,,,350,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_lars_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_hybrid_parallel_inference_helper,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_rolemaker_new,,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dist_mnist_gradient_merge,LINUX;WIN32,GPU;ROCM,360,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_recv_save_op,,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_communicator_sync,,,,DIST,test_runner.py,2,1,FLAGS_communicator_send_queue_size=1;FLAGS_communicator_max_merge_var_num=1;http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_pipeline_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_gradient_merge_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_amp_init,LINUX;WIN32,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dygraph_sharding_optimizer_stage2,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_meta_optimizer_base,LINUX;WIN32,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_raw_program_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_sharding_parallel,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_tensor_parallel,,,200,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dygraph_group_sharded_api_for_eager,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_distributed_strategy,LINUX;WIN32,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_dgc_meta_optimizer,,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC -test_parallel_dygraph_unused_variables,,,350,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_lamb_meta_optimizer,LINUX,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dgc_momentum_op,,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC -test_parallel_dygraph_no_sync_gradient_check,,,60,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_pipeline_meta_optimizer_with_recompute,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_hybrid_meta_optimizer,LINUX;WIN32,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_qat,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_sparse_embedding,,GPU,200,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212 -test_parallel_dygraph_sparse_embedding,,ROCM,200,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_amp_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_sparse_embedding_over_height,,GPU,150,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212 -test_parallel_dygraph_sparse_embedding_over_height,,ROCM,350,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_distributed_strategy,LINUX;APPLE,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_auto_parallel_parallelizer,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_recompute_meta_optimizer,LINUX;WIN32,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dygraph_group_sharded_api,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_fleet_private_function,LINUX;WIN32,,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_new_group,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_new_group.sh,2,1,http_proxy=;https_proxy=, -test_c_comm_init_op,LINUX,GPU;XPU;ASCEND;ASCEND_CL,120,DIST,test_c_comm_init_op.sh,2,1,http_proxy=;https_proxy=, -test_ir_pass_pipeline,,,120,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_mnist,,GPU;ROCM,200,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_se_resnext,,GPU;ROCM,200,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_parallel_dygraph_sync_batch_norm,,GPU;ROCM,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_imperative_auto_mixed_precision,,GPU;ROCM,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_imperative_auto_mixed_precision_for_eager,,GPU;ROCM,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_mixed_precision,,GPU;ROCM,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dygraph_recompute,,GPU;ROCM,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dygraph_recompute_for_eager,,GPU;ROCM,,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=../.., -test_dist_mnist_dgc_nccl,,,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL OR WITH_RCCL;WITH_DGC -test_dist_se_resnext_dgc,,,,DIST,../../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL OR WITH_RCCL;WITH_DGC +test_fleet_sharding_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,350,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_static_mp_layers,LINUX;WIN32,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dgc_op,,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC +test_dgc_optimizer,,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC +test_parallel_margin_cross_entropy,,GPU,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL +test_dygraph_sharding_stage3,,GPU,350,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL +test_parallel_dygraph_transformer,,GPU,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212 +test_parallel_dygraph_transformer,,ROCM,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_fp16_allreduce_meta_optimizer,LINUX;WIN32,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_rnn_dp,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_mp_layers,,GPU,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL +test_tcp_store,LINUX;APPLE,,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dygraph_sharding_stage3_for_eager,,,350,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_graph_execution_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_communicator_half_async,,,120,DIST,test_runner.py,2,,FLAGS_communicator_send_queue_size=1;FLAGS_communicator_max_merge_var_num=1;http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL +test_fleet_graph_executor,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_pipeline_parallel,,GPU,500,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_localsgd_meta_optimizer,LINUX,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_class_center_sample,,GPU,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL +test_pipeline,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_utils,LINUX;APPLE,,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_static_model_parallel,,,240,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_no_sync,,GPU,300,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL +test_dygraph_sharding_stage2,,,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_control_flow,,,350,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_lars_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_hybrid_parallel_inference_helper,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_rolemaker_new,,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dist_mnist_gradient_merge,LINUX;WIN32,GPU;ROCM,360,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_recv_save_op,,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_communicator_sync,,,,DIST,test_runner.py,2,,FLAGS_communicator_send_queue_size=1;FLAGS_communicator_max_merge_var_num=1;http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_pipeline_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_gradient_merge_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_amp_init,LINUX;WIN32,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dygraph_sharding_optimizer_stage2,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_meta_optimizer_base,LINUX;WIN32,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_raw_program_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_sharding_parallel,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_tensor_parallel,,,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dygraph_group_sharded_api_for_eager,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_distributed_strategy,LINUX;WIN32,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_dgc_meta_optimizer,,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC +test_parallel_dygraph_unused_variables,,,350,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_lamb_meta_optimizer,LINUX,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dgc_momentum_op,,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC +test_parallel_dygraph_no_sync_gradient_check,,,60,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_pipeline_meta_optimizer_with_recompute,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_hybrid_meta_optimizer,LINUX;WIN32,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_qat,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_sparse_embedding,,GPU,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212 +test_parallel_dygraph_sparse_embedding,,ROCM,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_amp_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_sparse_embedding_over_height,,GPU,150,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212 +test_parallel_dygraph_sparse_embedding_over_height,,ROCM,350,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_distributed_strategy,LINUX;APPLE,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_auto_parallel_parallelizer,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_recompute_meta_optimizer,LINUX;WIN32,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dygraph_group_sharded_api,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_fleet_private_function,LINUX;WIN32,,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_new_group,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_new_group.sh,2,,http_proxy=;https_proxy=, +test_c_comm_init_op,LINUX,GPU;XPU;ASCEND;ASCEND_CL,120,DIST,test_c_comm_init_op.sh,2,,http_proxy=;https_proxy=, +test_ir_pass_pipeline,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_mnist,,GPU;ROCM,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_se_resnext,,GPU;ROCM,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_parallel_dygraph_sync_batch_norm,,GPU;ROCM,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_imperative_auto_mixed_precision,,GPU;ROCM,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_imperative_auto_mixed_precision_for_eager,,GPU;ROCM,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_mixed_precision,,GPU;ROCM,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dygraph_recompute,,GPU;ROCM,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dygraph_recompute_for_eager,,GPU;ROCM,,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., +test_dist_mnist_dgc_nccl,,,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL OR WITH_RCCL;WITH_DGC +test_dist_se_resnext_dgc,,,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL OR WITH_RCCL;WITH_DGC test_auto_checkpoint,LINUX,,200,EXCLUSIVE:NIGHTLY,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., test_auto_checkpoint1,LINUX,,200,EXCLUSIVE:NIGHTLY,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., test_auto_checkpoint2,LINUX,,200,EXCLUSIVE:NIGHTLY,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../.., diff --git a/python/paddle/fluid/tests/unittests/collective/multinode/CMakeLists.txt b/python/paddle/fluid/tests/unittests/collective/multinode/CMakeLists.txt index 6947c89a2a..ab86ddaf72 100644 --- a/python/paddle/fluid/tests/unittests/collective/multinode/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/collective/multinode/CMakeLists.txt @@ -14,8 +14,8 @@ if(WITH_MULTINODE_TESTING) "RUN_TYPE=DIST" ENVS "PADDLE_DIST_UT_PORT=21282;http_proxy=;https_proxy=") - set_tests_properties(test_multinode_dygraph_hybrid_dpppmp - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_multinode_dygraph_hybrid_dpppmp PROPERTIES TIMEOUT + "120") endif() endif() if(WITH_MULTINODE_TESTING) @@ -28,8 +28,8 @@ if(WITH_MULTINODE_TESTING) "RUN_TYPE=DIST" ENVS "PADDLE_DIST_UT_PORT=21284;http_proxy=;https_proxy=") - set_tests_properties(test_multinode_dygraph_hybrid_dp - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_multinode_dygraph_hybrid_dp PROPERTIES TIMEOUT + "120") endif() endif() if(WITH_MULTINODE_TESTING) @@ -42,7 +42,7 @@ if(WITH_MULTINODE_TESTING) "RUN_TYPE=DIST" ENVS "PADDLE_DIST_UT_PORT=21286;http_proxy=;https_proxy=") - set_tests_properties(test_multinode_dygraph_sharding - PROPERTIES TIMEOUT "120" RUN_SERIAL 1) + set_tests_properties(test_multinode_dygraph_sharding PROPERTIES TIMEOUT + "120") endif() endif() diff --git a/python/paddle/fluid/tests/unittests/collective/multinode/testslist.csv b/python/paddle/fluid/tests/unittests/collective/multinode/testslist.csv index 8ada8ed0be..8749416de4 100644 --- a/python/paddle/fluid/tests/unittests/collective/multinode/testslist.csv +++ b/python/paddle/fluid/tests/unittests/collective/multinode/testslist.csv @@ -1,4 +1,4 @@ name,os,arch,timeout,run_type,launcher,num_port,run_serial,ENVS,conditions -test_multinode_dygraph_hybrid_dpppmp,linux,gpu,120,DIST,multinode_dist_test.sh,8,1,http_proxy=;https_proxy=,WITH_MULTINODE_TESTING -test_multinode_dygraph_hybrid_dp,linux,gpu,120,DIST,multinode_dist_test.sh,8,1,http_proxy=;https_proxy=,WITH_MULTINODE_TESTING -test_multinode_dygraph_sharding,linux,gpu,120,DIST,multinode_dist_test.sh,8,1,http_proxy=;https_proxy=,WITH_MULTINODE_TESTING +test_multinode_dygraph_hybrid_dpppmp,linux,gpu,120,DIST,multinode_dist_test.sh,8,,http_proxy=;https_proxy=,WITH_MULTINODE_TESTING +test_multinode_dygraph_hybrid_dp,linux,gpu,120,DIST,multinode_dist_test.sh,8,,http_proxy=;https_proxy=,WITH_MULTINODE_TESTING +test_multinode_dygraph_sharding,linux,gpu,120,DIST,multinode_dist_test.sh,8,,http_proxy=;https_proxy=,WITH_MULTINODE_TESTING diff --git a/python/paddle/fluid/tests/unittests/collective/testslist.csv b/python/paddle/fluid/tests/unittests/collective/testslist.csv index 8792db307a..bc341433b3 100644 --- a/python/paddle/fluid/tests/unittests/collective/testslist.csv +++ b/python/paddle/fluid/tests/unittests/collective/testslist.csv @@ -1,35 +1,35 @@ name,os,arch,timeout,run_type,launcher,num_port,run_serial,ENVS,conditions -test_allreduce,linux,gpu;rocm,120,DIST,test_runner.py,2,1,PYTHONPATH=..;http_proxy=;https_proxy=, -test_broadcast,linux,gpu;rocm,120,DIST,test_runner.py,2,1,PYTHONPATH=..;http_proxy=;https_proxy=, -test_c_concat,linux,gpu;rocm,120,DIST,test_runner.py,2,1,PYTHONPATH=..;http_proxy=;https_proxy=, -test_c_identity,linux,gpu;rocm,120,DIST,test_runner.py,2,1,PYTHONPATH=..;http_proxy=;https_proxy=, -test_c_split,linux,gpu;rocm,120,DIST,test_runner.py,2,1,PYTHONPATH=..;http_proxy=;https_proxy=, -test_collective_split_embedding,linux,rocm;gpu,300,DIST,../dist_test.sh,2,1,PYTHONPATH=..;http_proxy=;https_proxy=, -test_collective_allgather_api,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_allgather_object_api,linux,gpu;rocm,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_allreduce_api,linux,gpu;rocm,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_alltoall_api,linux,gpu;rocm,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_alltoall_single,linux,gpu;rocm,350,DIST,../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_barrier_api,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_batch_isend_irecv,linux,gpu;rocm,350,DIST,../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_broadcast_api,linux,gpu;rocm,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_cpu_barrier_with_gloo,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_global_gather,linux,gpu;rocm,200,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_global_scatter,linux,gpu;rocm,200,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_optimizer,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_process_group,linux,gpu;rocm,350,DIST,../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_reduce,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_reduce_api,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_reduce_scatter,linux,gpu;rocm,350,DIST,../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_scatter,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_scatter_api,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_sendrecv,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_sendrecv_api,linux,gpu;rocm,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_split_col_linear,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_split_embedding_none_divisible,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_split_row_linear,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_collective_wait,linux,gpu;rocm,300,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_eager_dist_api,linux,gpu;rocm,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_new_group_api,linux,gpu;rocm,120,DIST,test_runner.py,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_gen_nccl_id_op,,gpu;rocm;ASCEND;ASCEND_CL,,DIST,../dist_test.sh,2,1,http_proxy=;https_proxy=;PYTHONPATH=.., -test_communication_stream_allreduce_api,linux,gpu;rocm,120,DIST,,2,1,PYTHONPATH=..;http_proxy=;https_proxy=, +test_allreduce,linux,gpu;rocm,120,DIST,test_runner.py,2,,PYTHONPATH=..;http_proxy=;https_proxy=, +test_broadcast,linux,gpu;rocm,120,DIST,test_runner.py,2,,PYTHONPATH=..;http_proxy=;https_proxy=, +test_c_concat,linux,gpu;rocm,120,DIST,test_runner.py,2,,PYTHONPATH=..;http_proxy=;https_proxy=, +test_c_identity,linux,gpu;rocm,120,DIST,test_runner.py,2,,PYTHONPATH=..;http_proxy=;https_proxy=, +test_c_split,linux,gpu;rocm,120,DIST,test_runner.py,2,,PYTHONPATH=..;http_proxy=;https_proxy=, +test_collective_split_embedding,linux,rocm;gpu,300,DIST,../dist_test.sh,2,,PYTHONPATH=..;http_proxy=;https_proxy=, +test_collective_allgather_api,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_allgather_object_api,linux,gpu;rocm,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_allreduce_api,linux,gpu;rocm,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_alltoall_api,linux,gpu;rocm,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_alltoall_single,linux,gpu;rocm,350,DIST,../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_barrier_api,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_batch_isend_irecv,linux,gpu;rocm,350,DIST,../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_broadcast_api,linux,gpu;rocm,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_cpu_barrier_with_gloo,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_global_gather,linux,gpu;rocm,200,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_global_scatter,linux,gpu;rocm,200,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_optimizer,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_process_group,linux,gpu;rocm,350,DIST,../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_reduce,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_reduce_api,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_reduce_scatter,linux,gpu;rocm,350,DIST,../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_scatter,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_scatter_api,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_sendrecv,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_sendrecv_api,linux,gpu;rocm,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_split_col_linear,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_split_embedding_none_divisible,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_split_row_linear,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_collective_wait,linux,gpu;rocm,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_eager_dist_api,linux,gpu;rocm,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_new_group_api,linux,gpu;rocm,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_gen_nccl_id_op,,gpu;rocm;ASCEND;ASCEND_CL,,DIST,../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=.., +test_communication_stream_allreduce_api,linux,gpu;rocm,120,DIST,,2,,PYTHONPATH=..;http_proxy=;https_proxy=, diff --git a/tools/gen_ut_cmakelists.hook b/tools/gen_ut_cmakelists.hook index 196054a511..fe8ebca454 100644 --- a/tools/gen_ut_cmakelists.hook +++ b/tools/gen_ut_cmakelists.hook @@ -1,4 +1,6 @@ set -e lists=`python tools/gen_ut_cmakelists.py -f $* |grep 'modified/new:'|cut -f 2 -d :` -git add $lists +num=`echo $lists |wc -w` +[[ $num -ge 1 ]] && git add $lists && exit 1 +exit 0 diff --git a/tools/gen_ut_cmakelists.py b/tools/gen_ut_cmakelists.py index ef5ec56538..58cb6b4246 100644 --- a/tools/gen_ut_cmakelists.py +++ b/tools/gen_ut_cmakelists.py @@ -428,6 +428,7 @@ class CMakeGenerator(): "PADDLE_DIST_UT_PORT={dist_ut_port};{envs}")%s endif() ''' + run_type_str = "" else: cmd += f'''if({archs} AND {os_}) py_test_modules( @@ -438,13 +439,15 @@ class CMakeGenerator(): "{envs}")%s endif() ''' + run_type_str = "" if len( + run_type) == 0 else f' LABELS "RUN_TYPE={run_type}"' time_out_str = f' TIMEOUT "{timeout}"' if len( timeout.strip()) > 0 else '' run_serial_str = f' RUN_SERIAL {run_serial}' if len( run_serial) > 0 else '' if len(time_out_str) > 0 or len(run_serial_str) > 0: set_properties = f''' - set_tests_properties({name} PROPERTIES{time_out_str}{run_serial_str})''' + set_tests_properties({name} PROPERTIES{time_out_str}{run_serial_str}{run_type_str})''' else: set_properties = "" cmd = cmd % set_properties -- GitLab