PaddlePaddle
diff --git a/‎.github/workflows/_Coverage.yml
Copy file name to clipboard
+55-51Lines changed: 55 additions & 51 deletions b/‎.github/workflows/_Coverage.yml
Copy file name to clipboard
+55-51Lines changed: 55 additions & 51 deletions
@@ -9,11 +9,12 @@ env:
   PR_ID: ${{ github.event.pull_request.number }}
   COMMIT_ID: ${{ github.event.pull_request.head.sha }}
   TASK: paddle-CI-${{ github.event.pull_request.number }}-coverage
-  ci_scripts: ${{ github.workspace }}/ci
+  ci_scripts: /paddle/ci
   BRANCH: ${{ github.base_ref }}
-  work_dir: ${{ github.workspace }}
-  PADDLE_ROOT: ${{ github.workspace }}
+  work_dir: /paddle
+  PADDLE_ROOT: /paddle
   GIT_PR_ID: ${{ github.event.pull_request.number }}
+  CI_name: coverage
 
 defaults:
   run:
@@ -25,12 +26,11 @@ jobs:
     runs-on:
       group: GZ_BD-CPU
     outputs:
-      can-skip: ${{ steps.check-bypass.outputs.can_skip }}
+      can-skip: ${{ steps.check-bypass.outputs.can-skip }}
 
     steps:
       - name: Download paddle.tar.gz and update test branch
         run: |
-          rm -rf  * .[^.]*
           set -e
           echo "Downloading Paddle.tar.gz"
           wget -q --no-proxy https://paddle-github-action.bj.bcebos.com/PR/Paddle/${PR_ID}/${COMMIT_ID}/Paddle.tar.gz --no-check-certificate
@@ -40,9 +40,9 @@ jobs:
           git remote add upstream https://github.com/PaddlePaddle/Paddle.git
           git config pull.rebase false
           git checkout test
-          echo "Pull upstream develop"
-          . ../../../proxy
-          git pull upstream develop --no-edit
+          echo "Pull upstream $BRANCH"
+          source ${{ github.workspace }}/../../../proxy
+          git pull upstream $BRANCH --no-edit
 
       - name: Check bypass
         id: check-bypass
@@ -52,7 +52,7 @@ jobs:
           workflow-name: coverage
 
       - name: Check docker image and run container
-        if: steps.check-bypass.outputs.can_skip != 'true'
+        if: steps.check-bypass.outputs.can-skip != 'true'
         env:
           CCACHE_DIR: "/root/.ccache/coverage"
           FLAGS_fraction_of_gpu_memory_to_use: 0.15
@@ -81,14 +81,16 @@ jobs:
           GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           UT_RUN_TYPE_SETTING: WITHOUT_HYBRID
         run: |
-          container_name=${TASK}-build-$(date +%s)
+          container_name=${TASK}-build-$(date +%Y%m%d-%H%M%S)
           echo "container_name=${container_name}" >> ${{ github.env }}
           docker run -d -t --name ${container_name} \
             -v "/home/data/cfs:/home/data/cfs" \
             -v "/home/data/cfs/.cache:/root/.cache" \
             -v "/home/data/cfs/.ccache:/root/.ccache" \
             -v "/dev/shm:/dev/shm" \
-            -v "${{ github.workspace }}/../../../..:${{ github.workspace }}/../../../.." \
+            -v ${{ github.workspace }}/../../..:${{ github.workspace }}/../../.. \
+            -v ${{ github.workspace }}:/paddle \
+            -e CI_name \
             -e BRANCH \
             -e PR_ID \
             -e COMMIT_ID \
@@ -121,42 +123,44 @@ jobs:
             -e GITHUB_TOKEN \
             -e GITHUB_API_TOKEN \
             -e UT_RUN_TYPE_SETTING \
-            -w ${{ github.workspace }} --network host ${docker_image}
+            -w /paddle --network host ${docker_image}
 
       - name: Build
-        if: steps.check-bypass.outputs.can_skip != 'true'
+        if: steps.check-bypass.outputs.can-skip != 'true'
         run: |
           docker exec -t ${{ env.container_name }}  /bin/bash -c '
           mkdir -p /home/data/cfs/.cache/coverage
           mkdir -p /home/data/cfs/.ccache/coverage
-          . ../../../proxy
-          bash $ci_scripts/coverage_build.sh ${PYTHON_ABI:-""} bdist_wheel ${parallel_number:-""} coverage "" ${{ github.env }}
+          source ${{ github.workspace }}/../../../proxy
+          bash $ci_scripts/coverage_build.sh bdist_wheel
           '
 
       - name: Check added unittests
-        if: steps.check-bypass.outputs.can_skip != 'true'
+        if: steps.check-bypass.outputs.can-skip != 'true'
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
-          . ../../../proxy
-          bash -x $ci_scripts/check_added_ut.sh
+          source ~/.bashrc
+          source ${{ github.workspace }}/../../../proxy
+          bash $ci_scripts/check_added_ut.sh
           '
 
       - name: Check coverage build size requires approval
-        if: steps.check-bypass.outputs.can_skip != 'true'
+        if: steps.check-bypass.outputs.can-skip != 'true'
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
-          . ../../../proxy
-          bash $ci_scripts/coverage_build_size_approval.sh ${{ env.buildSize }}
+          source ~/.bashrc
+          source ${{ github.workspace }}/../../../proxy
+          bash $ci_scripts/coverage_build_size_approval.sh
           '
 
       - name: Clean up env
-        if: steps.check-bypass.outputs.can_skip != 'true'
-        working-directory: build
+        if: steps.check-bypass.outputs.can-skip != 'true'
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
+          source ~/.bashrc
           source ${ci_scripts}/utils.sh; clean_build_files
           Build_Size=$(du -h --max-depth=0 ${work_dir}/build |awk '"'"'{print $1}'"'"')
-          echo "Build_Size=${Build_Size}" > ${{ github.workspace }}/dist/coverage_build_size
+          echo "Build_Size=${Build_Size}" > ${work_dir}/dist/coverage_build_size
           find ./ -type f -size +200M | xargs du -lh
           rm -rf $(find . -name "*.a")
           rm -rf $(find . -name "*.o")
@@ -166,22 +170,20 @@ jobs:
           find ./ -name "eager_generator" -or -name  "kernel_signature_generator" -or -name "eager_legacy_op_function_generator" | xargs rm -rf
           rm -rf ./python/build/lib.linux-x86_64-3.9/
           cd "${work_dir}/build/third_party" && find $(ls | grep -v "dlpack" | grep -v "install" | grep -v "eigen3" | grep -v "gflags") -type f ! -name "*.so" -a ! -name "libdnnl.so*" -delete
-          cd ${{ github.workspace }}/..
-          tar --use-compress-program="pzstd -1" -cpf Paddle.tar.gz Paddle
+          cd /
+          tar --use-compress-program="pzstd -1" -cpf Paddle.tar.gz paddle
           '
 
       - name: Upload coverage product
-        if: steps.check-bypass.outputs.can_skip != 'true'
+        if: steps.check-bypass.outputs.can-skip != 'true'
         env:
           home_path: ${{ github.workspace }}/..
           bos_file: ${{ github.workspace }}/../bos/BosClient.py
           paddle_whl: paddlepaddle_gpu-0.0.0-cp39-cp39-linux_x86_64.whl
-        working-directory: dist
         run: |
-          pwd
           docker exec -t ${{ env.container_name }} /bin/bash -c '
           echo "::group::Install bce-python-sdk"
-          . ../../../proxy
+          source ${{ github.workspace }}/../../../proxy
           python -m pip install bce-python-sdk==0.8.74
           echo "::endgroup::"
           export AK=paddle
@@ -191,17 +193,19 @@ jobs:
             mkdir ${{ env.home_path }}/bos
             tar xf ${{ env.home_path }}/bos_new.tar.gz -C ${{ env.home_path }}/bos
           fi
-          . ../../../unproxy
-          cd ${{ github.workspace }}/dist
-          python ${{ env.bos_file }} coverage_build_size paddle-github-action/PR/coverage_build_size/${{ env.PR_ID }}/${{ env.COMMIT_ID }}
-          python ${{ env.bos_file }} ${{ env.paddle_whl }} paddle-github-action/PR/coverage_whl/${{ env.PR_ID }}/${{ env.COMMIT_ID }}
-          cd ${{ github.workspace }}/..
-          python ${{ env.bos_file }} Paddle.tar.gz paddle-github-action/PR/coverage_paddle/${{ env.PR_ID }}/${{ env.COMMIT_ID }}
+          cd /paddle/dist
+          echo "Uploading coverage build size"
+          python ${{ env.bos_file }} coverage_build_size paddle-github-action/PR/coverage/${{ env.PR_ID }}/${{ env.COMMIT_ID }}
+          echo "Uploading coverage wheel"
+          python ${{ env.bos_file }} ${{ env.paddle_whl }} paddle-github-action/PR/coverage/${{ env.PR_ID }}/${{ env.COMMIT_ID }}
+          cd /
+          echo "Uploading Paddle.tar.gz"
+          python ${{ env.bos_file }} Paddle.tar.gz paddle-github-action/PR/coverage/${{ env.PR_ID }}/${{ env.COMMIT_ID }}
           rm Paddle.tar.gz
           '
 
       - name: Terminate and delete the container
-        if: ${{ steps.check-bypass.outputs.can_skip != 'true' && always() }}
+        if: ${{ steps.check-bypass.outputs.can-skip != 'true' && always() }}
         run: |
           set +e
           docker exec -t ${{ env.container_name }} /bin/bash -c 'rm -rf * .[^.]*'
@@ -214,23 +218,20 @@ jobs:
     needs: build
     if: needs.build.outputs.can-skip != 'true'
     runs-on:
-      group: BD_BJ-V100
+      group: BD_BJ_v100
     steps:
       - name: Download paddle.tar.gz and update test branch
         run: |
-          set +e
-          rm -rf * .[^.]*
           set -e
           echo "Downloading Paddle.tar.gz"
-          wget -q --no-proxy https://paddle-github-action.bj.bcebos.com/PR/coverage_paddle/${PR_ID}/${COMMIT_ID}/Paddle.tar.gz --no-check-certificate
-          # wget -q --no-proxy https://paddle-github-action.bj.bcebos.com/PR/coverage_paddle/71611/52756a5f582d9ee58822dd76788beaf13024f6a0/Paddle.tar.gz --no-check-certificate
+          wget -q --no-proxy https://paddle-github-action.bj.bcebos.com/PR/coverage/${PR_ID}/${COMMIT_ID}/Paddle.tar.gz --no-check-certificate
           echo "Extracting Paddle.tar.gz"
           tar  --use-compress-program='pzstd -1' -xpf Paddle.tar.gz --strip-components=1
           rm Paddle.tar.gz
-          . ../../../proxy
+          source ${{ github.workspace }}/../../../proxy
           git checkout test
           echo "Pull upstream develop"
-          git pull upstream develop --no-edit
+          git pull upstream $BRANCH --no-edit
 
       - name: Check docker image and run container
         env:
@@ -259,14 +260,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          container_name=${TASK}-test-$(date +%s)
+          container_name=${TASK}-$(date +%Y%m%d-%H%M%S)
           echo "container_name=${container_name}" >> ${{ github.env }}
           docker run -d -t --gpus all --name ${container_name} \
             -v "/home/data/cfs:/home/data/cfs" \
             -v "/home/data/cfs/.cache:/root/.cache" \
             -v "/home/data/cfs/.ccache:/root/.ccache" \
             -v "/dev/shm:/dev/shm" \
-            -v "${{ github.workspace }}/../../../..:${{ github.workspace }}/../../../.." \
+            -v ${{ github.workspace }}/../../..:${{ github.workspace }}/../../.. \
+            -v ${{ github.workspace }}:/paddle \
+            -e CI_name \
             -e BRANCH \
             -e PR_ID \
             -e COMMIT_ID \
@@ -298,14 +301,13 @@ jobs:
             -e COVERAGE_FILE \
             -e GITHUB_TOKEN \
             -e GITHUB_API_TOKEN  \
-            -w ${{ github.workspace }} --network host ${docker_image}
+            -w /paddle --network host ${docker_image}
 
       - name: Test
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
-          nvidia-smi
-          . ../../../proxy
-          bash $ci_scripts/coverage_test.sh ${{ github.env }}
+          source ${{ github.workspace }}/../../../proxy
+          bash $ci_scripts/coverage_test.sh
           TEST_EXIT_CODE=$?
           echo "TEST_EXIT_CODE=${TEST_EXIT_CODE}" >> ${{ github.env }}
           if [[ "$TEST_EXIT_CODE" -ne 0 && "$TEST_EXIT_CODE" -ne 9 ]]; then
@@ -316,7 +318,9 @@ jobs:
       - name: Check coverage data
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
-          . ../../../proxy
+          source ~/.bashrc
+          unset GREP_OPTIONS
+          source ${{ github.workspace }}/../../../proxy
           source ${ci_scripts}/utils.sh; check_coverage
           COVERAGE_EXIT_CODE=$?
           echo "COVERAGE_EXIT_CODE=${COVERAGE_EXIT_CODE}" >> ${{ github.env }}