From b6684227070f7eddb136052abb0e77ea4f1493cf Mon Sep 17 00:00:00 2001 From: XieYunshen <1084314248@qq.com> Date: Tue, 12 Jul 2022 21:41:51 +0800 Subject: [PATCH 1/4] add labels for infer ut --- .../fluid/tests/unittests/ir/inference/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt b/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt index 6f79a248cf38b..6999ed64e4fff 100755 --- a/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt @@ -52,15 +52,18 @@ if(WITH_GPU AND TENSORRT_FOUND) "7.1") py_test_modules(${target} MODULES ${target}) set_tests_properties(${target} PROPERTIES TIMEOUT 60) + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endif() else() py_test_modules(${target} MODULES ${target}) + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endif() endforeach() foreach(target ${TEST_TRT_CONVERTER}) py_test_modules(${target} MODULES ${target}) set_tests_properties(${target} PROPERTIES TIMEOUT 300) + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endforeach() endif() @@ -76,6 +79,7 @@ endforeach() if(WITH_MKLDNN) foreach(target ${TEST_MKLDNN_IR_PASSES}) py_test_modules(${target} MODULES ${target}) + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endforeach() endif() @@ -84,6 +88,7 @@ if(WITH_MKLDNN AND WITH_GPU) foreach(target ${TEST_INFERENCE_IR_PASSES}) py_test_modules(${target} MODULES ${target}) + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endforeach() endif() @@ -92,6 +97,7 @@ if(NOT WITH_MKLDNN AND NOT WITH_GPU) foreach(target ${TEST_INFERENCE_CPU_UT}) py_test_modules(${target} MODULES ${target}) + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endforeach() set_tests_properties(test_mul_lstm_fuse_pass PROPERTIES TIMEOUT 300) From d6082e78eb5cc8fdc2407e9f0469b5b8c85fb925 Mon Sep 17 00:00:00 2001 From: XieYunshen <1084314248@qq.com> Date: Fri, 15 Jul 2022 16:02:58 +0800 Subject: [PATCH 2/4] add RUN_TYPE=INFER for cpp ut --- paddle/fluid/inference/analysis/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/paddle/fluid/inference/analysis/CMakeLists.txt b/paddle/fluid/inference/analysis/CMakeLists.txt index 67f0e3212db43..10d67c69f1344 100644 --- a/paddle/fluid/inference/analysis/CMakeLists.txt +++ b/paddle/fluid/inference/analysis/CMakeLists.txt @@ -65,6 +65,7 @@ function(inference_analysis_test_run TARGET) "${multiValueArgs}" ${ARGN}) inference_base_test_run(${TARGET} COMMAND ${analysis_test_COMMAND} ARGS ${analysis_test_ARGS}) + set_tests_properties(${TARGET} PROPERTIES LABELS "RUN_TYPE=INFER") endif() endfunction() @@ -86,6 +87,7 @@ function(inference_analysis_test TARGET) ${GLOB_PASS_LIB}) inference_base_test_run(${TARGET} COMMAND ${TARGET} ARGS ${analysis_test_ARGS}) + set_tests_properties(${TARGET} PROPERTIES LABELS "RUN_TYPE=INFER") endif() endfunction() From 16cdb84dec831c6a5c4631712851b8b2b29cd18c Mon Sep 17 00:00:00 2001 From: XieYunshen <1084314248@qq.com> Date: Fri, 15 Jul 2022 16:43:20 +0800 Subject: [PATCH 3/4] fix formaterror --- python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt b/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt index 6999ed64e4fff..769dceb3dfa36 100755 --- a/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/ir/inference/CMakeLists.txt @@ -52,7 +52,7 @@ if(WITH_GPU AND TENSORRT_FOUND) "7.1") py_test_modules(${target} MODULES ${target}) set_tests_properties(${target} PROPERTIES TIMEOUT 60) - set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endif() else() py_test_modules(${target} MODULES ${target}) From 2488d4909dcdbc0b7bdb7bda829d92fc4c633c66 Mon Sep 17 00:00:00 2001 From: XieYunshen <1084314248@qq.com> Date: Fri, 15 Jul 2022 17:14:27 +0800 Subject: [PATCH 4/4] update --- python/paddle/fluid/tests/unittests/ir/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/python/paddle/fluid/tests/unittests/ir/CMakeLists.txt b/python/paddle/fluid/tests/unittests/ir/CMakeLists.txt index 58a3c8f987e7e..732a70069a1ab 100644 --- a/python/paddle/fluid/tests/unittests/ir/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/ir/CMakeLists.txt @@ -12,6 +12,7 @@ endif() foreach(target ${TEST_IR_PASSES}) py_test_modules(${target} MODULES ${target}) + set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER") endforeach() add_subdirectory(inference)