CI Merge: PR-CI-Coverage and PR-CI-CINN-GPU

paddle/cinn/utils/error.h

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// --------------------------------------------------------
 #pragma once
 
 #ifdef __GNUC__

paddle/scripts/paddle_build.sh

@@ -2761,13 +2761,9 @@ set +x
 
         if [ ${WITH_CINN:-OFF} == "ON" ]; then
             pushd ${PADDLE_ROOT}/build/paddle/cinn
-            ctest -N -E "test_frontend_interpreter" | awk -F ': ' '{print $2}' | sed '/^$/d' | sed '$d' > ${PADDLE_ROOT}/build/pr_ci_cinn_gpu_ut_list_tmp
-            popd
-            pushd ${PADDLE_ROOT}/build/test/cinn
-            ctest -N -E "test_paddle_model_convertor|test_cinn_fake_resnet|test_cinn_sub_graph_map_expr|test_assign_value_op_mapper|test_batch_norm_op"  | awk -F ': ' '{print $2}' | sed '/^$/d' | sed '$d' >> ${PADDLE_ROOT}/build/pr_ci_cinn_gpu_ut_list_tmp
+            ctest -N -E "test_frontend_interpreter" | awk -F ': ' '{print $2}' | sed '/^$/d' | sed '$d' > ${PADDLE_ROOT}/build/pr_ci_cinn_gpu_ut_list
             popd
             ctest -N -L "RUN_TYPE=CINN" | awk -F ': ' '{print $2}' | sed '/^$/d' | sed '$d' > ${PADDLE_ROOT}/build/pr_ci_cinn_ut_list
-            cat ${PADDLE_ROOT}/build/pr_ci_cinn_gpu_ut_list_tmp | sort | uniq > ${PADDLE_ROOT}/build/pr_ci_cinn_gpu_ut_list
             echo "========================================"
             echo "pr_ci_cinn_ut_list: "
             cat ${PADDLE_ROOT}/build/pr_ci_cinn_ut_list
@@ -2780,7 +2776,7 @@ set +x
         python ${PADDLE_ROOT}/tools/group_case_for_parallel.py ${PADDLE_ROOT}
 
         if [ ${WITH_CINN=-OFF} == "ON" ]; then
-            run_cinn_ut="OFF"
+            run_cinn_ut=`check_cinn_file_diff`
             if [[ "OFF" == ${run_cinn_ut} ]]; then
               echo "No CINN-related changes were found"
               echo "Skip PR-CI-CINN-GPU UT CI"
@@ -2794,21 +2790,6 @@ set +x
                 cinn_gpu_ut_endTime_s=`date +%s`
                 echo "ipipe_log_param_cinn_gpu_TestCases_Total_Time: $[ $cinn_gpu_ut_endTime_s - $cinn_gpu_ut_startTime_s ]s"
                 echo "ipipe_log_param_cinn_gpu_TestCases_Total_Time: $[ $cinn_gpu_ut_endTime_s - $cinn_gpu_ut_startTime_s ]s"  >> ${PADDLE_ROOT}/build/build_summary.txt
-
-                # pr-ci-cinn-gpu
-                export LD_LIBRARY_PATH=/usr/local/cuda/lib:/usr/local/cuda/lib64:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}
-                export LD_LIBRARY_PATH=/usr/local/lib/python3.9/dist-packages/paddle/libs:${LD_LIBRARY_PATH}
-                export LD_LIBRARY_PATH=${PADDLE_ROOT}/build/python/paddle/libs/:${LD_LIBRARY_PATH}
-                pip install nvidia-pyindex
-                pip install nvidia-tensorrt
-                pip install xgboost
-                bash ${PADDLE_ROOT}/tools/cinn/build.sh prepare_model
-                bash ${PADDLE_ROOT}/tools/cinn/build.sh run_demo 2>&1 | tee /dev/null
-                demo_test=${PIPESTATUS[0]}
-                if [[ ${demo_test} -ne 0 ]];then
-                    echo -e "\033[31mcinn demo test failed\033[0m"
-                    exit -1
-                fi
             fi
 
             # run pr-ci-cinn ut

test/cinn/CMakeLists.txt

@@ -8,9 +8,7 @@ add_custom_command(
 add_custom_target(COPY_CINN_PYTHON_TESTS ALL
                   DEPENDS ${CMAKE_BINARY_DIR}/test/__init__.py)
 
-set(BASIC_TEST_NAMES test_common test_packed_func
-                     #    test_op_transform
-)
+set(BASIC_TEST_NAMES)
 
 foreach(basic_test_name ${BASIC_TEST_NAMES})
   add_test(
@@ -114,34 +112,6 @@ if(WITH_GPU)
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
   endforeach()
 
-  # test fusion_fallback_pass
-  add_test(
-    NAME test_fusion_fallback_pass
-    COMMAND
-      ${CMAKE_COMMAND} -E env
-      PYTHONPATH=${CMAKE_BINARY_DIR}:${CMAKE_BINARY_DIR}/python/:$ENV{PYTHONPATH}
-      FLAGS_prim_enable_dynamic=1 FLAGS_cinn_new_group_scheduler=1
-      FLAGS_check_infer_symbolic=1 FLAGS_enable_pir_api=1
-      FLAGS_cinn_bucket_compile=1 FLAGS_group_schedule_tiling_first=1
-      FLAGS_cudnn_deterministic=true FLAGS_enable_fusion_fallback=1
-      ${PYTHON_EXECUTABLE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/passes/test_fusion_fallback_pass.py
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-
-  # test accuracy_check_pass
-  add_test(
-    NAME test_accuracy_check_pass
-    COMMAND
-      ${CMAKE_COMMAND} -E env
-      PYTHONPATH=${CMAKE_BINARY_DIR}:${CMAKE_BINARY_DIR}/python/:$ENV{PYTHONPATH}
-      FLAGS_prim_enable_dynamic=1 FLAGS_cinn_new_group_scheduler=1
-      FLAGS_check_infer_symbolic=1 FLAGS_enable_pir_api=1
-      FLAGS_cinn_bucket_compile=1 FLAGS_group_schedule_tiling_first=1
-      FLAGS_cudnn_deterministic=true FLAGS_enable_cinn_accuracy_check=1
-      ${PYTHON_EXECUTABLE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/passes/test_accuracy_check_pass.py
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-
   file(
     GLOB CINN_RUNTIME_TEST
     RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"