diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index e8bde467e085d6e4d3fa075cb48471b2911e8de6..2e2efa65d7007d67091d1c9943f0f6824792e607 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -923,12 +923,11 @@ function fetch_upstream_develop_if_not_exist() { } function check_whl_size() { - if [ ! "${pr_whl_size}" ];then - echo "pr whl size not found " - exit 1 - fi set +x + pr_whl_size=`du -m ${PADDLE_ROOT}/build/pr_whl/*.whl|awk '{print $1}'` + echo "pr_whl_size: ${pr_whl_size}" + dev_whl_size=`du -m ${PADDLE_ROOT}/build/python/dist/*.whl|awk '{print $1}'` echo "dev_whl_size: ${dev_whl_size}" @@ -949,11 +948,20 @@ function check_whl_size() { } function generate_upstream_develop_api_spec() { - fetch_upstream_develop_if_not_exist - cur_branch=`git branch | grep \* | cut -d ' ' -f2` + cp ${PADDLE_ROOT}/python/requirements.txt /tmp + pr_whl_size=`du -m ${PADDLE_ROOT}/build/python/dist/*.whl|awk '{print $1}'` + mkdir -p ${PADDLE_ROOT}/build/pr_whl && mv ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/pr_whl/ + echo "pr_whl_size: ${pr_whl_size}" + + 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/third_party + fi + + cd ${PADDLE_ROOT} git checkout . git checkout -b develop_base_pr upstream/$BRANCH - startTime_firstBuild=`date +%s` dev_commit=`git log -1|head -1|awk '{print $2}'` dev_url="https://xly-devops.bj.bcebos.com/PR/build_whl/0/${dev_commit}/paddlepaddle_gpu-0.0.0-cp37-cp37m-linux_x86_64.whl" @@ -964,21 +972,11 @@ function generate_upstream_develop_api_spec() { cmake_gen $1 build $2 fi - - cp ${PADDLE_ROOT}/python/requirements.txt /tmp - pr_whl_size=`du -m ${PADDLE_ROOT}/build/python/dist/*.whl|awk '{print $1}'` - echo "pr_whl_size: ${pr_whl_size}" - - - git checkout $cur_branch generate_api_spec "$1" "DEV" - git branch -D develop_base_pr - ENABLE_MAKE_CLEAN="ON" - 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/third_party - fi + + endTime_s=`date +%s` + echo "Build Time: $[ $endTime_s - $startTime_s ]s" + echo "ipipe_log_param_Build_Time: $[ $endTime_s - $startTime_s ]s" >> ${PADDLE_ROOT}/build/build_summary.txt } function generate_api_spec() { @@ -2997,15 +2995,13 @@ function main() { example_code=$? summary_check_problems $check_style_code $[${example_code_gpu} + ${example_code}] "$check_style_info" "${example_info_gpu}\n${example_info}" assert_api_spec_approvals - check_whl_size ;; build_and_check_cpu) set +e - generate_upstream_develop_api_spec ${PYTHON_ABI:-""} ${parallel_number} cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number} - check_sequence_op_unittest generate_api_spec ${PYTHON_ABI:-""} "PR" - check_whl_size + generate_upstream_develop_api_spec ${PYTHON_ABI:-""} ${parallel_number} + check_sequence_op_unittest ;; build_and_check_gpu) set +e @@ -3022,6 +3018,9 @@ function main() { summary_check_problems $check_style_code $[${example_code_gpu} + ${example_code}] "$check_style_info" "${example_info_gpu}\n${example_info}" assert_api_spec_approvals ;; + check_whl_size) + check_whl_size + ;; build) cmake_gen ${PYTHON_ABI:-""} build ${parallel_number}