From f1bbed1c26609b162f48ac9bd5fc1e6da2665412 Mon Sep 17 00:00:00 2001 From: "Sun, Xuehao" Date: Fri, 9 Dec 2022 14:17:42 +0800 Subject: [PATCH 1/5] fix UT collect log error Signed-off-by: Sun, Xuehao --- .azure-pipelines/scripts/ut/collect_log.sh | 28 ++++++++++++---------- .azure-pipelines/ut-basic.yml | 1 + 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/scripts/ut/collect_log.sh b/.azure-pipelines/scripts/ut/collect_log.sh index 58900c280d4..2eb80ac1633 100644 --- a/.azure-pipelines/scripts/ut/collect_log.sh +++ b/.azure-pipelines/scripts/ut/collect_log.sh @@ -1,10 +1,13 @@ +source /neural-compressor/.azure-pipelines/scripts/change_color.sh + pip install coverage export COVERAGE_RCFILE=/neural-compressor/.azure-pipelines/scripts/ut/coverage.file coverage_log="/neural-compressor/log_dir/coverage_log" coverage_log_base="/neural-compressor/log_dir/coverage_log_base" coverage_compare="/neural-compressor/log_dir/coverate_compare.html" cd /neural-compressor/log_dir -echo "collect coverage for PR branch" + +$BOLD_YELLOW && echo "collect coverage for PR branch" && $RESET mkdir -p coverage_PR cp ut-coverage-adaptor/.coverage.adaptor ./coverage_PR/ cp ut-coverage-tfnewapi/.coverage.tfnewapi ./coverage_PR/ @@ -18,7 +21,8 @@ coverage report -m --rcfile=${COVERAGE_RCFILE} | tee ${coverage_log} coverage html -d log_dir/coverage_PR/htmlcov --rcfile=${COVERAGE_RCFILE} coverage xml -o log_dir/coverage_PR/coverage.xml --rcfile=${COVERAGE_RCFILE} ls -l log_dir/coverage_PR/htmlcov -echo "collect coverage for baseline" + +$BOLD_YELLOW && echo "collect coverage for baseline" && $RESET coverage erase cd /neural-compressor/log_dir mkdir -p coverage_base @@ -34,28 +38,28 @@ coverage report -m --rcfile=${COVERAGE_RCFILE} | tee ${coverage_log_base} coverage html -d log_dir/coverage_base/htmlcov --rcfile=${COVERAGE_RCFILE} coverage xml -o log_dir/coverage_base/coverage.xml --rcfile=${COVERAGE_RCFILE} ls -l log_dir/coverage_base/htmlcov -echo "compare coverage" + +$BOLD_YELLOW && echo "compare coverage" && $RESET coverage_PR_total=$(cat ${coverage_log} | grep TOTAL | awk '{print $NF}' | sed "s|%||g") coverage_base_total=$(cat ${coverage_log_base} | grep TOTAL | awk '{print $NF}' | sed "s|%||g") -echo "clear upload path" + +$BOLD_YELLOW && echo "clear upload path" && $RESET rm -fr log_dir/coverage_PR/.coverage* rm -fr log_dir/coverage_base/.coverage* rm -fr log_dir/ut-coverage-* if [[ ${coverage_PR_total} -lt ${coverage_base_total} ]]; then - decreate=$(($coverage_PR_total - $coverage_base_total)) - rate=$(awk 'BEGIN{printf "%.2f%\n",'$decreate/100'}') - echo "Unit Test failed with covereage decrese ${rate}%" - echo "compare coverage to give detail info" + decrease=$(($coverage_PR_total - $coverage_base_total)) + rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}') + $BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET + $BOLD_RED && echo "compare coverage to give detail info" && $RESET bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED" exit 1 else - echo "Unit Test success with coverage ${coverage_PR_total}%" - echo "compare coverage to give detail info" + $BOLD_GREEN && echo "Unit Test success with coverage ${coverage_PR_total}%" && $RESET + $BOLD_GREEN && echo "compare coverage to give detail info" && $RESET bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "SUCCESS" #sed "1i\Unit Test success with coverage ${coverage_PR_total}\n" ${coverage_log} fi - #rm -r ${coverage_log} #rm -r ${coverage_log_base} - diff --git a/.azure-pipelines/ut-basic.yml b/.azure-pipelines/ut-basic.yml index bdeb6dd6d6f..3ee98968b01 100644 --- a/.azure-pipelines/ut-basic.yml +++ b/.azure-pipelines/ut-basic.yml @@ -194,6 +194,7 @@ stages: displayName: 'collect logs' - task: PublishPipelineArtifact@1 + condition: succeededOrFailed() inputs: targetPath: $(UPLOAD_PATH) artifact: $(ARTIFACT_NAME) From 4d14f2ac0e15b980c50baf04aa22c609e72040a1 Mon Sep 17 00:00:00 2001 From: "Sun, Xuehao" Date: Fri, 9 Dec 2022 14:19:39 +0800 Subject: [PATCH 2/5] test condition failed Signed-off-by: Sun, Xuehao --- .azure-pipelines/scripts/ut/collect_log.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines/scripts/ut/collect_log.sh b/.azure-pipelines/scripts/ut/collect_log.sh index 2eb80ac1633..a32c7ac1adf 100644 --- a/.azure-pipelines/scripts/ut/collect_log.sh +++ b/.azure-pipelines/scripts/ut/collect_log.sh @@ -61,5 +61,7 @@ else #sed "1i\Unit Test success with coverage ${coverage_PR_total}\n" ${coverage_log} fi +exit 1 + #rm -r ${coverage_log} #rm -r ${coverage_log_base} From ecadfd8981ea1ad415861d9354e156c10d8d61e2 Mon Sep 17 00:00:00 2001 From: "Sun, Xuehao" Date: Fri, 9 Dec 2022 17:24:26 +0800 Subject: [PATCH 3/5] update agent pool Signed-off-by: Sun, Xuehao --- .azure-pipelines/ut-basic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/ut-basic.yml b/.azure-pipelines/ut-basic.yml index 3ee98968b01..7865db2410b 100644 --- a/.azure-pipelines/ut-basic.yml +++ b/.azure-pipelines/ut-basic.yml @@ -16,7 +16,7 @@ pr: - test/ux - test/neural_coder -pool: ICX-16C +pool: test-pool variables: IMAGE_NAME: 'neural-compressor' From dca810c6f7941586d91d3cbb7edc71dcf9a2a7d4 Mon Sep 17 00:00:00 2001 From: "Sun, Xuehao" Date: Fri, 9 Dec 2022 20:23:03 +0800 Subject: [PATCH 4/5] test condition failed Signed-off-by: Sun, Xuehao --- .azure-pipelines/scripts/ut/collect_log.sh | 31 +++++++++++++--------- .azure-pipelines/ut-basic.yml | 3 ++- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/scripts/ut/collect_log.sh b/.azure-pipelines/scripts/ut/collect_log.sh index a32c7ac1adf..222d122e3a4 100644 --- a/.azure-pipelines/scripts/ut/collect_log.sh +++ b/.azure-pipelines/scripts/ut/collect_log.sh @@ -47,20 +47,25 @@ $BOLD_YELLOW && echo "clear upload path" && $RESET rm -fr log_dir/coverage_PR/.coverage* rm -fr log_dir/coverage_base/.coverage* rm -fr log_dir/ut-coverage-* -if [[ ${coverage_PR_total} -lt ${coverage_base_total} ]]; then - decrease=$(($coverage_PR_total - $coverage_base_total)) - rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}') - $BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET - $BOLD_RED && echo "compare coverage to give detail info" && $RESET - bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED" - exit 1 -else - $BOLD_GREEN && echo "Unit Test success with coverage ${coverage_PR_total}%" && $RESET - $BOLD_GREEN && echo "compare coverage to give detail info" && $RESET - bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "SUCCESS" - #sed "1i\Unit Test success with coverage ${coverage_PR_total}\n" ${coverage_log} -fi +# if [[ ${coverage_PR_total} -lt ${coverage_base_total} ]]; then +# decrease=$(($coverage_PR_total - $coverage_base_total)) +# rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}') +# $BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET +# $BOLD_RED && echo "compare coverage to give detail info" && $RESET +# bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED" +# exit 1 +# else +# $BOLD_GREEN && echo "Unit Test success with coverage ${coverage_PR_total}%" && $RESET +# $BOLD_GREEN && echo "compare coverage to give detail info" && $RESET +# bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "SUCCESS" +# #sed "1i\Unit Test success with coverage ${coverage_PR_total}\n" ${coverage_log} +# fi +decrease=$(($coverage_PR_total - $coverage_base_total)) +rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}') +$BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET +$BOLD_RED && echo "compare coverage to give detail info" && $RESET +bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED" exit 1 #rm -r ${coverage_log} diff --git a/.azure-pipelines/ut-basic.yml b/.azure-pipelines/ut-basic.yml index 7865db2410b..94b6778a112 100644 --- a/.azure-pipelines/ut-basic.yml +++ b/.azure-pipelines/ut-basic.yml @@ -165,7 +165,8 @@ stages: - stage: Coverage displayName: "Coverage Combine" - dependsOn: [Adaptor, TFNewAPI, Others, IPEX, Adaptor_base, TFNewAPI_base, Others_base, IPEX_base] + # dependsOn: [Adaptor, TFNewAPI, Others, IPEX, Adaptor_base, TFNewAPI_base, Others_base, IPEX_base] + dependsOn: [IPEX] jobs: - job: CollectDatafiles steps: From 70fc20ee0483d0270f962bdd72b1728dc2519221 Mon Sep 17 00:00:00 2001 From: "Sun, Xuehao" Date: Fri, 9 Dec 2022 20:32:29 +0800 Subject: [PATCH 5/5] update agent pool Signed-off-by: Sun, Xuehao --- .azure-pipelines/scripts/ut/collect_log.sh | 33 +++++++++------------- .azure-pipelines/ut-basic.yml | 7 ++--- .azure-pipelines/ut-ncoder.yml | 1 - 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.azure-pipelines/scripts/ut/collect_log.sh b/.azure-pipelines/scripts/ut/collect_log.sh index 222d122e3a4..2eb80ac1633 100644 --- a/.azure-pipelines/scripts/ut/collect_log.sh +++ b/.azure-pipelines/scripts/ut/collect_log.sh @@ -47,26 +47,19 @@ $BOLD_YELLOW && echo "clear upload path" && $RESET rm -fr log_dir/coverage_PR/.coverage* rm -fr log_dir/coverage_base/.coverage* rm -fr log_dir/ut-coverage-* -# if [[ ${coverage_PR_total} -lt ${coverage_base_total} ]]; then -# decrease=$(($coverage_PR_total - $coverage_base_total)) -# rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}') -# $BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET -# $BOLD_RED && echo "compare coverage to give detail info" && $RESET -# bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED" -# exit 1 -# else -# $BOLD_GREEN && echo "Unit Test success with coverage ${coverage_PR_total}%" && $RESET -# $BOLD_GREEN && echo "compare coverage to give detail info" && $RESET -# bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "SUCCESS" -# #sed "1i\Unit Test success with coverage ${coverage_PR_total}\n" ${coverage_log} -# fi - -decrease=$(($coverage_PR_total - $coverage_base_total)) -rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}') -$BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET -$BOLD_RED && echo "compare coverage to give detail info" && $RESET -bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED" -exit 1 +if [[ ${coverage_PR_total} -lt ${coverage_base_total} ]]; then + decrease=$(($coverage_PR_total - $coverage_base_total)) + rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}') + $BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET + $BOLD_RED && echo "compare coverage to give detail info" && $RESET + bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED" + exit 1 +else + $BOLD_GREEN && echo "Unit Test success with coverage ${coverage_PR_total}%" && $RESET + $BOLD_GREEN && echo "compare coverage to give detail info" && $RESET + bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "SUCCESS" + #sed "1i\Unit Test success with coverage ${coverage_PR_total}\n" ${coverage_log} +fi #rm -r ${coverage_log} #rm -r ${coverage_log_base} diff --git a/.azure-pipelines/ut-basic.yml b/.azure-pipelines/ut-basic.yml index 94b6778a112..05417fae4e0 100644 --- a/.azure-pipelines/ut-basic.yml +++ b/.azure-pipelines/ut-basic.yml @@ -16,7 +16,7 @@ pr: - test/ux - test/neural_coder -pool: test-pool +pool: ICX-16C variables: IMAGE_NAME: 'neural-compressor' @@ -165,8 +165,7 @@ stages: - stage: Coverage displayName: "Coverage Combine" - # dependsOn: [Adaptor, TFNewAPI, Others, IPEX, Adaptor_base, TFNewAPI_base, Others_base, IPEX_base] - dependsOn: [IPEX] + dependsOn: [Adaptor, TFNewAPI, Others, IPEX, Adaptor_base, TFNewAPI_base, Others_base, IPEX_base] jobs: - job: CollectDatafiles steps: @@ -207,4 +206,4 @@ stages: targetType: "inline" script: | docker exec collectLogs bash -c "rm -fr /neural-compressor/* && rm -fr /neural-compressor/.* || true" - displayName: "Docker clean up" \ No newline at end of file + displayName: "Docker clean up" diff --git a/.azure-pipelines/ut-ncoder.yml b/.azure-pipelines/ut-ncoder.yml index 16ee8cdb6ba..14ce726c626 100644 --- a/.azure-pipelines/ut-ncoder.yml +++ b/.azure-pipelines/ut-ncoder.yml @@ -29,4 +29,3 @@ stages: utScriptFileName: 'run_ncoder' uploadPath: $(UPLOAD_PATH) utArtifact: 'ut-ncoder' -