From b0cbca40619bdca4ac16b907928d3b6a942c36f2 Mon Sep 17 00:00:00 2001
From: tianshuo78520a <707759223@qq.com>
Date: Wed, 3 Nov 2021 10:54:32 +0800
Subject: [PATCH] Update Model-Benchmark CI build (#36782)

* notest;test=123

* notest;test=123

* notest;test=123

* notest;test=123

* notest;test=123

* notest;test=123

* notest;test=123

* fix
---
 paddle/scripts/paddle_build.sh | 2 +-
 tools/ci_model_benchmark.sh    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index d4b5c0cdeff..3077d5ba552 100755
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -2411,9 +2411,9 @@ function build_pr_and_develop() {
     cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
     mkdir ${PADDLE_ROOT}/build/pr_whl && cp ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/pr_whl
     rm -f ${PADDLE_ROOT}/build/python/dist/*.whl && rm -f ${PADDLE_ROOT}/build/python/build/.timestamp
-    rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt
     cmake_change=`git diff --name-only upstream/$BRANCH | grep "cmake/external" || true`
     if [ ${cmake_change} ];then
+        rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt
         rm -rf ${PADDLE_ROOT}/build/third_party
     fi
     git checkout .
diff --git a/tools/ci_model_benchmark.sh b/tools/ci_model_benchmark.sh
index 57416986937..ec1515f7d76 100644
--- a/tools/ci_model_benchmark.sh
+++ b/tools/ci_model_benchmark.sh
@@ -98,6 +98,7 @@ case $1 in
   ;;
   run_all)
     compile_install_paddle
+    init_benchmark
     prepare_data
     run_model_benchmark
   ;;
-- 
GitLab