use two GPUs to run the exclusive test test=develop (#17187)

6 years ago · 83c4f7721f
parent 8092c40560
commit 83c4f7721f
5 changed files with 9 additions and 10 deletions
--- 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})
--- 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")
--- 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)

--- 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()
--- 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")