From d3dae0ce858668202fe63b66857acf8e24b49c56 Mon Sep 17 00:00:00 2001
From: kuizhiqing <kuizhiqing@baidu.com>
Date: Thu, 29 Jul 2021 13:22:04 +0800
Subject: [PATCH] fix test scope (#34450)

---
 python/paddle/distributed/fleet/elastic.py    |  6 ++--
 .../fluid/tests/unittests/CMakeLists.txt      | 30 +++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/python/paddle/distributed/fleet/elastic.py b/python/paddle/distributed/fleet/elastic.py
index 101269764a..da61169cac 100644
--- a/python/paddle/distributed/fleet/elastic.py
+++ b/python/paddle/distributed/fleet/elastic.py
@@ -80,8 +80,10 @@ class LauncherInterface(object):
             if ret is None:
                 alive = True
             elif ret != 0:
-                logger.error("ERROR rank {} error with code {}".format(p.rank,
-                                                                       ret))
+                logger.error("ABORT!!! ABORT!!! ABORT!!!")
+                logger.error(
+                    "ERROR rank {} error with exit code {}, check log for detail.".
+                    format(p.rank, ret))
                 result = ret
         if not alive and result is None:
             return 0
diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt
index 32bde0159e..82874be323 100644
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -914,10 +914,24 @@ if((WITH_ROCM OR WITH_GPU) AND NOT WIN32)
     set_tests_properties(test_collective_sendrecv_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_new_group_api PROPERTIES TIMEOUT 120)
     if(WITH_DISTRIBUTE)
+        set_tests_properties(test_new_group_api PROPERTIES TIMEOUT 120)
         set_tests_properties(test_pipeline PROPERTIES TIMEOUT 120)
         set_tests_properties(test_static_model_parallel PROPERTIES TIMEOUT 240)
+        set_tests_properties(test_collective_split_embedding
+            test_collective_split_embedding_none_divisible
+            test_collective_split_row_linear
+            test_collective_split_col_linear
+            test_collective_scatter_api
+            test_collective_barrier_api
+            test_collective_reduce_api
+            test_pipeline_parallel
+            test_collective_allreduce_api
+            test_new_group_api
+            test_collective_broadcast_api
+            test_collective_allgather_api
+            test_collective_alltoall_api
+            PROPERTIES LABELS "RUN_TYPE=DIST")
     endif()
     set_tests_properties(test_reducescatter_api PROPERTIES TIMEOUT 120)
     set_tests_properties(test_broadcast PROPERTIES TIMEOUT 120)
@@ -934,20 +948,6 @@ if((WITH_ROCM OR WITH_GPU) AND NOT WIN32)
     set_tests_properties(test_collective_barrier_api PROPERTIES TIMEOUT 120)
     set_tests_properties(test_collective_scatter PROPERTIES TIMEOUT 120)
     set_tests_properties(test_collective_sendrecv PROPERTIES TIMEOUT 120)
-    set_tests_properties(test_collective_split_embedding
-        test_collective_split_embedding_none_divisible
-        test_collective_split_row_linear
-        test_collective_split_col_linear
-        test_collective_scatter_api
-        test_collective_barrier_api
-        test_collective_reduce_api
-        test_pipeline_parallel
-        test_collective_allreduce_api
-        test_new_group_api
-        test_collective_broadcast_api
-        test_collective_allgather_api
-        test_collective_alltoall_api
-        PROPERTIES LABELS "RUN_TYPE=DIST")
 endif()
 if(WITH_GPU OR WITH_ROCM)
     set_tests_properties(test_imperative_auto_mixed_precision PROPERTIES TIMEOUT 120)
-- 
GitLab