From 1e698c600eb74ea11c89c9c008510c4d19924b95 Mon Sep 17 00:00:00 2001 From: YUNSHEN XIE <1084314248@qq.com> Date: Mon, 9 Nov 2020 20:03:42 +0800 Subject: [PATCH] fix cmake error when setting ut timeout properity (#28492) --- .../framework/ir/fusion_group/CMakeLists.txt | 4 +- .../fluid/tests/unittests/CMakeLists.txt | 63 +++++++++---------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/paddle/fluid/framework/ir/fusion_group/CMakeLists.txt b/paddle/fluid/framework/ir/fusion_group/CMakeLists.txt index f32a5eafefc..ab7ccc7f7e8 100644 --- a/paddle/fluid/framework/ir/fusion_group/CMakeLists.txt +++ b/paddle/fluid/framework/ir/fusion_group/CMakeLists.txt @@ -9,6 +9,6 @@ cc_library(fusion_group_pass SRCS fusion_group_pass.cc elementwise_group_detector.cc DEPS subgraph_detector fuse_pass_base code_generator device_code) cc_test(test_fusion_group_pass SRCS fusion_group_pass_tester.cc DEPS fusion_group_pass graph_viz_pass) -if(NOT ON_INFER) -set_tests_properties(test_code_generator PROPERTIES TIMEOUT 120) +if(WITH_GPU AND NOT ON_INFER) + set_tests_properties(test_code_generator PROPERTIES TIMEOUT 120) endif() diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt index 66952537b7b..4191c4c8f43 100644 --- a/python/paddle/fluid/tests/unittests/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt @@ -606,38 +606,22 @@ endif() # setting timeout value for old unittests # set_tests_properties(test_dist_fleet_sparse_embedding_ctr PROPERTIES TIMEOUT 200) -if(NOT WIN32 AND NOT APPLE) - set_tests_properties(test_fused_elemwise_activation_op PROPERTIES TIMEOUT 150) - set_tests_properties(test_gru_op PROPERTIES TIMEOUT 200) - set_tests_properties(test_layer_norm_op PROPERTIES TIMEOUT 150) - set_tests_properties(test_pool3d_op PROPERTIES TIMEOUT 150) - set_tests_properties(test_regularizer PROPERTIES TIMEOUT 150) - set_tests_properties(test_parallel_dygraph_sync_batch_norm PROPERTIES TIMEOUT 120) - set_tests_properties(test_collective_broadcast_api PROPERTIES TIMEOUT 120) - set_tests_properties(test_collective_allreduce_api PROPERTIES TIMEOUT 120) + +if (NOT WIN32) + set_tests_properties(test_multiprocess_reader_exception PROPERTIES TIMEOUT 120) + set_tests_properties(test_layers PROPERTIES TIMEOUT 120) + set_tests_properties(test_ir_memory_optimize_transformer PROPERTIES TIMEOUT 120) + set_tests_properties(test_fleet_utils PROPERTIES TIMEOUT 120) +endif() + +if (WITH_DISTRIBUTE) + set_tests_properties(test_communicator_half_async PROPERTIES TIMEOUT 120) +endif() +if (WITH_DISTRIBUTE AND NOT APPLE) set_tests_properties(test_fleet_launch PROPERTIES TIMEOUT 120) set_tests_properties(test_c_comm_init_op PROPERTIES TIMEOUT 120) - set_tests_properties(test_pipeline PROPERTIES TIMEOUT 120) - set_tests_properties(test_reducescatter_api PROPERTIES TIMEOUT 120) - set_tests_properties(test_broadcast PROPERTIES TIMEOUT 120) - set_tests_properties(test_reducescatter PROPERTIES TIMEOUT 120) set_tests_properties(test_fleet_checkpoint PROPERTIES TIMEOUT 120) - set_tests_properties(test_collective_reduce_api PROPERTIES TIMEOUT 120) - set_tests_properties(test_collective_reduce PROPERTIES TIMEOUT 120) - set_tests_properties(test_allreduce PROPERTIES TIMEOUT 120) - set_tests_properties(test_allgather PROPERTIES TIMEOUT 120) set_tests_properties(test_launch PROPERTIES TIMEOUT 120) - set_tests_properties(test_collective_scatter_api PROPERTIES TIMEOUT 120) - set_tests_properties(test_collective_barrier_api PROPERTIES TIMEOUT 120) -endif() - -if (NOT WIN32) -set_tests_properties(test_multiprocess_reader_exception PROPERTIES TIMEOUT 120) -set_tests_properties(test_layers PROPERTIES TIMEOUT 120) -set_tests_properties(test_communicator_half_async PROPERTIES TIMEOUT 120) -set_tests_properties(test_ir_memory_optimize_transformer PROPERTIES TIMEOUT 120) -set_tests_properties(test_fleet_utils PROPERTIES TIMEOUT 120) - endif() # setting timeout value as 15S @@ -756,11 +740,11 @@ set_tests_properties(test_dygraph_multi_forward PROPERTIES TIMEOUT 120) set_tests_properties(test_norm_op PROPERTIES TIMEOUT 120) set_tests_properties(test_imperative_ocr_attention_model PROPERTIES TIMEOUT 120) set_tests_properties(test_imperative_mnist PROPERTIES TIMEOUT 120) -set_tests_properties(test_fused_elemwise_activation_op PROPERTIES TIMEOUT 120) -set_tests_properties(test_gru_op PROPERTIES TIMEOUT 120) -set_tests_properties(test_layer_norm_op PROPERTIES TIMEOUT 120) -set_tests_properties(test_pool3d_op PROPERTIES TIMEOUT 120) -set_tests_properties(test_regularizer PROPERTIES TIMEOUT 120) +set_tests_properties(test_fused_elemwise_activation_op PROPERTIES TIMEOUT 150) +set_tests_properties(test_gru_op PROPERTIES TIMEOUT 200) +set_tests_properties(test_layer_norm_op PROPERTIES TIMEOUT 150) +set_tests_properties(test_pool3d_op PROPERTIES TIMEOUT 150) +set_tests_properties(test_regularizer PROPERTIES TIMEOUT 150) set_tests_properties(test_imperative_resnet PROPERTIES TIMEOUT 200) set_tests_properties(test_imperative_resnet_sorted_gradient PROPERTIES TIMEOUT 200) set_tests_properties(test_imperative_se_resnext PROPERTIES TIMEOUT 200) @@ -772,8 +756,21 @@ if(WITH_COVERAGE) endif() if(WITH_GPU AND NOT WIN32) set_tests_properties(test_collective_allgather_api PROPERTIES TIMEOUT 120) + set_tests_properties(test_collective_broadcast_api PROPERTIES TIMEOUT 120) + set_tests_properties(test_collective_allreduce_api PROPERTIES TIMEOUT 120) + set_tests_properties(test_pipeline PROPERTIES TIMEOUT 120) + set_tests_properties(test_reducescatter_api PROPERTIES TIMEOUT 120) + set_tests_properties(test_broadcast PROPERTIES TIMEOUT 120) + set_tests_properties(test_reducescatter PROPERTIES TIMEOUT 120) + set_tests_properties(test_collective_reduce_api PROPERTIES TIMEOUT 120) + set_tests_properties(test_collective_reduce PROPERTIES TIMEOUT 120) + set_tests_properties(test_allreduce PROPERTIES TIMEOUT 120) + set_tests_properties(test_allgather PROPERTIES TIMEOUT 120) + set_tests_properties(test_collective_scatter_api PROPERTIES TIMEOUT 120) + set_tests_properties(test_collective_barrier_api PROPERTIES TIMEOUT 120) endif() if(WITH_GPU) set_tests_properties(test_imperative_auto_mixed_precision PROPERTIES TIMEOUT 120) + set_tests_properties(test_parallel_dygraph_sync_batch_norm PROPERTIES TIMEOUT 120) endif() set_tests_properties(test_inplace_addto_strategy PROPERTIES TIMEOUT 120) -- GitLab