From 0e1dc29bb77d5f3c188d826d5bdeee129c4c4fd6 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Wed, 7 Dec 2022 14:09:54 +0800 Subject: [PATCH 1/2] test update Signed-off-by: chensuyue --- .azure-pipelines/model-test.yml | 2 +- .azure-pipelines/scripts/ut/run_basic_adaptor.sh | 10 ++++++---- .../scripts/ut/run_basic_adaptor_tfnewapi.sh | 10 ++++++---- .azure-pipelines/scripts/ut/run_basic_ipex.sh | 10 ++++++---- .azure-pipelines/scripts/ut/run_basic_itex.sh | 10 ++++++---- .azure-pipelines/scripts/ut/run_basic_others.sh | 11 ++++++----- .azure-pipelines/scripts/ut/run_ncoder.sh | 7 +++++-- .azure-pipelines/scripts/ut/run_ux.sh | 7 +++++-- 8 files changed, 41 insertions(+), 26 deletions(-) diff --git a/.azure-pipelines/model-test.yml b/.azure-pipelines/model-test.yml index 512fbe158cb..270a245bb65 100644 --- a/.azure-pipelines/model-test.yml +++ b/.azure-pipelines/model-test.yml @@ -45,7 +45,7 @@ parameters: - ssd_mobilenet_v1_ckpt # - ssd_resnet50_v1_ckpt - inception_v1 - - resnet50_fashion + # - resnet50_fashion - darknet19 - densenet-121 - resnet-101 diff --git a/.azure-pipelines/scripts/ut/run_basic_adaptor.sh b/.azure-pipelines/scripts/ut/run_basic_adaptor.sh index d9a9fd2d990..52d5678c69b 100644 --- a/.azure-pipelines/scripts/ut/run_basic_adaptor.sh +++ b/.azure-pipelines/scripts/ut/run_basic_adaptor.sh @@ -23,11 +23,13 @@ ut_log_name=${LOG_DIR}/ut_tf_${tensorflow_version}_pt_${pytorch_version}.log echo "cat run.sh..." cat run.sh | tee ${ut_log_name} -echo "-------------" +echo "------UT start-------" bash run.sh 2>&1 | tee -a ${ut_log_name} cp .coverage ${LOG_DIR}/.coverage.adaptor -echo "list all in ${LOG_DIR}" -ls -a ${LOG_DIR} +echo "------UT end -------" + if [ $(grep -c "FAILED" ${ut_log_name}) != 0 ] || [ $(grep -c "OK" ${ut_log_name}) == 0 ];then + echo "Find errors in UT test, please check the output..." exit 1 -fi \ No newline at end of file +fi +echo "UT finished successfully! " \ No newline at end of file diff --git a/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh b/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh index 2b687e633d3..ea3005a7ff3 100644 --- a/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh +++ b/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh @@ -19,11 +19,13 @@ ut_log_name=${LOG_DIR}/ut_tf_newapi.log echo "cat run.sh..." cat run.sh | tee ${ut_log_name} -echo "-------------" +echo "------UT start-------" bash run.sh 2>&1 | tee -a ${ut_log_name} cp .coverage ${LOG_DIR}/.coverage.tfnewapi -echo "list all in ${LOG_DIR}" -ls -a ${LOG_DIR} +echo "------UT end -------" + if [ $(grep -c "FAILED" ${ut_log_name}) != 0 ] || [ $(grep -c "OK" ${ut_log_name}) == 0 ];then + echo "Find errors in UT test, please check the output..." exit 1 -fi \ No newline at end of file +fi +echo "UT finished successfully! " \ No newline at end of file diff --git a/.azure-pipelines/scripts/ut/run_basic_ipex.sh b/.azure-pipelines/scripts/ut/run_basic_ipex.sh index 9e22bc01be3..b915bd8a6e2 100644 --- a/.azure-pipelines/scripts/ut/run_basic_ipex.sh +++ b/.azure-pipelines/scripts/ut/run_basic_ipex.sh @@ -20,11 +20,13 @@ ut_log_name=${LOG_DIR}/ut_ipex.log echo "cat run.sh..." cat run.sh | tee ${ut_log_name} -echo "-------------" +echo "------UT start-------" bash run.sh 2>&1 | tee -a ${ut_log_name} cp .coverage ${LOG_DIR}/.coverage.ipex -echo "list all in ${LOG_DIR}" -ls -a ${LOG_DIR} +echo "------UT end -------" + if [ $(grep -c "FAILED" ${ut_log_name}) != 0 ] || [ $(grep -c "OK" ${ut_log_name}) == 0 ];then + echo "Find errors in UT test, please check the output..." exit 1 -fi \ No newline at end of file +fi +echo "UT finished successfully! " diff --git a/.azure-pipelines/scripts/ut/run_basic_itex.sh b/.azure-pipelines/scripts/ut/run_basic_itex.sh index da9b9923ce9..9f8e32c8489 100644 --- a/.azure-pipelines/scripts/ut/run_basic_itex.sh +++ b/.azure-pipelines/scripts/ut/run_basic_itex.sh @@ -19,11 +19,13 @@ ut_log_name=${LOG_DIR}/ut_itex.log echo "cat run.sh..." cat run.sh | tee ${ut_log_name} -echo "-------------" +echo "------UT start-------" bash run.sh 2>&1 | tee -a ${ut_log_name} cp .coverage ${LOG_DIR}/.coverage.itex -echo "list all in ${LOG_DIR}" -ls -a ${LOG_DIR} +echo "------UT end -------" + if [ $(grep -c "FAILED" ${ut_log_name}) != 0 ] || [ $(grep -c "OK" ${ut_log_name}) == 0 ];then + echo "Find errors in UT test, please check the output..." exit 1 -fi \ No newline at end of file +fi +echo "UT finished successfully! " \ No newline at end of file diff --git a/.azure-pipelines/scripts/ut/run_basic_others.sh b/.azure-pipelines/scripts/ut/run_basic_others.sh index 9789802a75a..4781eb89468 100644 --- a/.azure-pipelines/scripts/ut/run_basic_others.sh +++ b/.azure-pipelines/scripts/ut/run_basic_others.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x python -c "import neural_compressor as nc;print(nc.version.__version__)" echo "run basic others" @@ -29,11 +28,13 @@ ut_log_name=${LOG_DIR}/ut_tf_${tensorflow_version}_pt_${pytorch_version}.log echo "cat run.sh..." cat run.sh | tee ${ut_log_name} -echo "-------------" +echo "------UT start-------" bash run.sh 2>&1 | tee -a ${ut_log_name} cp .coverage ${LOG_DIR}/.coverage.others -echo "list all in ${LOG_DIR}" -ls -a ${LOG_DIR} +echo "------UT end -------" + if [ $(grep -c "FAILED" ${ut_log_name}) != 0 ] || [ $(grep -c "OK" ${ut_log_name}) == 0 ];then + echo "Find errors in UT test, please check the output..." exit 1 -fi \ No newline at end of file +fi +echo "UT finished successfully! " \ No newline at end of file diff --git a/.azure-pipelines/scripts/ut/run_ncoder.sh b/.azure-pipelines/scripts/ut/run_ncoder.sh index aef05d13e3f..a6e38e64d6c 100644 --- a/.azure-pipelines/scripts/ut/run_ncoder.sh +++ b/.azure-pipelines/scripts/ut/run_ncoder.sh @@ -15,9 +15,12 @@ ut_log_name=${LOG_DIR}/ut_neural_coder.log echo "cat run.sh..." cat run.sh | tee ${ut_log_name} -echo "-------------" +echo "------UT start-------" bash run.sh 2>&1 | tee -a ${ut_log_name} +echo "------UT end -------" if [ $(grep -c "FAILED" ${ut_log_name}) != 0 ] || [ $(grep -c "OK" ${ut_log_name}) == 0 ];then + echo "Find errors in UT test, please check the output..." exit 1 -fi \ No newline at end of file +fi +echo "UT finished successfully! " \ No newline at end of file diff --git a/.azure-pipelines/scripts/ut/run_ux.sh b/.azure-pipelines/scripts/ut/run_ux.sh index ceb1c7fcefd..6dcc0d1ba08 100644 --- a/.azure-pipelines/scripts/ut/run_ux.sh +++ b/.azure-pipelines/scripts/ut/run_ux.sh @@ -21,9 +21,12 @@ ut_log_name=${LOG_DIR}/ut_tf_${tensorflow_version}_pt_${pytorch_version}.log echo "cat run.sh..." cat run.sh | tee ${ut_log_name} -echo "-------------" +echo "------UT start-------" bash run.sh 2>&1 | tee -a ${ut_log_name} +echo "------UT end -------" if [ $(grep -c "FAILED" ${ut_log_name}) != 0 ] || [ $(grep -c "OK" ${ut_log_name}) == 0 ];then + echo "Find errors in UT test, please check the output..." exit 1 -fi \ No newline at end of file +fi +echo "UT finished successfully! " \ No newline at end of file From b376cc6193b4618e03e17bd1a5a07e4151591625 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Wed, 7 Dec 2022 14:13:50 +0800 Subject: [PATCH 2/2] test update Signed-off-by: chensuyue --- .azure-pipelines/scripts/ut/run_basic_adaptor.sh | 1 - .azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh | 1 - .azure-pipelines/scripts/ut/run_basic_ipex.sh | 1 - .azure-pipelines/scripts/ut/run_basic_itex.sh | 1 - .azure-pipelines/scripts/ut/run_ncoder.sh | 1 - .azure-pipelines/scripts/ut/run_ux.sh | 1 - 6 files changed, 6 deletions(-) diff --git a/.azure-pipelines/scripts/ut/run_basic_adaptor.sh b/.azure-pipelines/scripts/ut/run_basic_adaptor.sh index 52d5678c69b..d5510bbd177 100644 --- a/.azure-pipelines/scripts/ut/run_basic_adaptor.sh +++ b/.azure-pipelines/scripts/ut/run_basic_adaptor.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x python -c "import neural_compressor as nc;print(nc.version.__version__)" echo "run basic adaptor" diff --git a/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh b/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh index ea3005a7ff3..ebd861efeb2 100644 --- a/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh +++ b/.azure-pipelines/scripts/ut/run_basic_adaptor_tfnewapi.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x python -c "import neural_compressor as nc;print(nc.version.__version__)" echo "run basic adaptor tfnewapi" diff --git a/.azure-pipelines/scripts/ut/run_basic_ipex.sh b/.azure-pipelines/scripts/ut/run_basic_ipex.sh index b915bd8a6e2..edc2b5d3aeb 100644 --- a/.azure-pipelines/scripts/ut/run_basic_ipex.sh +++ b/.azure-pipelines/scripts/ut/run_basic_ipex.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x python -c "import neural_compressor as nc;print(nc.version.__version__)" echo "run basic ipex" diff --git a/.azure-pipelines/scripts/ut/run_basic_itex.sh b/.azure-pipelines/scripts/ut/run_basic_itex.sh index 9f8e32c8489..45278216f8d 100644 --- a/.azure-pipelines/scripts/ut/run_basic_itex.sh +++ b/.azure-pipelines/scripts/ut/run_basic_itex.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x python -c "import neural_compressor as nc;print(nc.version.__version__)" echo "run basic itex" diff --git a/.azure-pipelines/scripts/ut/run_ncoder.sh b/.azure-pipelines/scripts/ut/run_ncoder.sh index a6e38e64d6c..bb3e3212494 100644 --- a/.azure-pipelines/scripts/ut/run_ncoder.sh +++ b/.azure-pipelines/scripts/ut/run_ncoder.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x python -c "import neural_compressor as nc;print(nc.version.__version__)" echo "run coder" diff --git a/.azure-pipelines/scripts/ut/run_ux.sh b/.azure-pipelines/scripts/ut/run_ux.sh index 6dcc0d1ba08..e7041cbacce 100644 --- a/.azure-pipelines/scripts/ut/run_ux.sh +++ b/.azure-pipelines/scripts/ut/run_ux.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x python -c "import neural_compressor as nc;print(nc.version.__version__)" echo "run ux"