From 83c4f7721f4a37cf9f0e79096d5b4bdeecbb5b6d Mon Sep 17 00:00:00 2001
From: wopeizl <wopeizl@163.com>
Date: Sun, 5 May 2019 11:36:19 +0800
Subject: [PATCH] use two GPUs to run the exclusive test test=develop (#17187)

---
 paddle/fluid/inference/api/CMakeLists.txt                | 2 +-
 paddle/fluid/inference/tests/book/CMakeLists.txt         | 4 ++--
 paddle/fluid/train/CMakeLists.txt                        | 2 +-
 .../fluid/tests/book/high-level-api/CMakeLists.txt       | 2 +-
 python/paddle/fluid/tests/unittests/CMakeLists.txt       | 9 ++++-----
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/paddle/fluid/inference/api/CMakeLists.txt b/paddle/fluid/inference/api/CMakeLists.txt
index a73f160dfcf..8b0b76e6539 100644
--- a/paddle/fluid/inference/api/CMakeLists.txt
+++ b/paddle/fluid/inference/api/CMakeLists.txt
@@ -56,7 +56,7 @@ if(WITH_TESTING)
   inference_base_test(test_api_impl SRCS api_impl_tester.cc DEPS ${inference_deps}
                       ARGS --word2vec_dirname=${WORD2VEC_MODEL_DIR} --book_dirname=${PYTHON_TESTS_DIR}/book)
   set_tests_properties(test_api_impl PROPERTIES DEPENDS test_image_classification)
-  set_tests_properties(test_api_impl PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+  set_tests_properties(test_api_impl PROPERTIES LABELS "RUN_TYPE=DIST")
 endif()
 cc_test(test_analysis_predictor SRCS analysis_predictor_tester.cc DEPS analysis_predictor benchmark ${inference_deps}
         ARGS --dirname=${WORD2VEC_MODEL_DIR})
diff --git a/paddle/fluid/inference/tests/book/CMakeLists.txt b/paddle/fluid/inference/tests/book/CMakeLists.txt
index aa8828c4329..874727943c2 100644
--- a/paddle/fluid/inference/tests/book/CMakeLists.txt
+++ b/paddle/fluid/inference/tests/book/CMakeLists.txt
@@ -21,7 +21,7 @@ function(inference_test TARGET_NAME)
     set_tests_properties(test_inference_${TARGET_NAME}${arg}
             PROPERTIES DEPENDS test_${TARGET_NAME})
     set_tests_properties(test_inference_${TARGET_NAME}${arg}
-            PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+            PROPERTIES LABELS "RUN_TYPE=DIST")
   endforeach()
 endfunction(inference_test)
 
@@ -47,4 +47,4 @@ cc_test(test_inference_nlp
   DEPS paddle_fluid_origin
   ARGS
   --model_path=${PADDLE_BINARY_DIR}/python/paddle/fluid/tests/book/recognize_digits_mlp.inference.model)
-set_tests_properties(test_inference_nlp PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+set_tests_properties(test_inference_nlp PROPERTIES LABELS "RUN_TYPE=DIST")
diff --git a/paddle/fluid/train/CMakeLists.txt b/paddle/fluid/train/CMakeLists.txt
index 0637ff4d736..7b0bc669b07 100644
--- a/paddle/fluid/train/CMakeLists.txt
+++ b/paddle/fluid/train/CMakeLists.txt
@@ -21,7 +21,7 @@ function(train_test TARGET_NAME)
         set_tests_properties(test_train_${TARGET_NAME}${arg}
                 PROPERTIES DEPENDS test_${TARGET_NAME})
         set_tests_properties(test_train_${TARGET_NAME}${arg}
-                PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+                PROPERTIES LABELS "RUN_TYPE=DIST")
     endforeach()
 endfunction(train_test)
 
diff --git a/python/paddle/fluid/tests/book/high-level-api/CMakeLists.txt b/python/paddle/fluid/tests/book/high-level-api/CMakeLists.txt
index 0d36c7a04fc..4712a767694 100644
--- a/python/paddle/fluid/tests/book/high-level-api/CMakeLists.txt
+++ b/python/paddle/fluid/tests/book/high-level-api/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
             message(WARNING "These tests has been disabled in OSX for random fail: \n" ${src})
         elseif()
             py_test(${src} SRCS ${src}.py)
-            set_tests_properties(${src} PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+            set_tests_properties(${src} PROPERTIES LABELS "RUN_TYPE=DIST")
         endif()
     endforeach()
 endif()
diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt
index 1cccd138f8f..46664ea33d7 100644
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -178,10 +178,9 @@ endif()
 
 if(WITH_DISTRIBUTE)
     set_tests_properties(test_listen_and_serv_op test_nce_remote_table_op test_hsigmoid_remote_table_op
-            PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+            PROPERTIES LABELS "RUN_TYPE=DIST")
 endif()
 
-set_tests_properties(test_weight_decay test_conv_shift_op test_alloc_continuous_space_op test_recordio_reader
-        test_parallel_executor_test_while_train test_adam_op_multi_thread test_parallel_executor_mnist
-        test_parallel_executor_seresnext test_parallel_executor_crf test_nearest_interp_op
-        PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+set_tests_properties(test_recordio_reader test_parallel_executor_test_while_train test_parallel_executor_mnist
+        test_parallel_executor_seresnext test_parallel_executor_crf
+        PROPERTIES LABELS "RUN_TYPE=DIST")
-- 
GitLab