From 20f2183843a9d92cfba58ffd3220f047ad27603a Mon Sep 17 00:00:00 2001 From: chensuyue Date: Thu, 9 Mar 2023 22:17:42 +0800 Subject: [PATCH 1/6] fix ut coverage Signed-off-by: chensuyue --- .azure-pipelines/template/docker-template.yml | 2 +- .azure-pipelines/ut-basic.yml | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/template/docker-template.yml b/.azure-pipelines/template/docker-template.yml index 85ebfe2df00..33b921fabca 100644 --- a/.azure-pipelines/template/docker-template.yml +++ b/.azure-pipelines/template/docker-template.yml @@ -23,8 +23,8 @@ steps: targetType: "inline" script: | docker ps -a - docker start $(docker ps -aq) if [[ $(docker ps -a | grep -i '${{ parameters.containerName }}'$) ]]; then + docker start $(docker ps -aq) echo "remove left files through container ..." docker exec ${{ parameters.containerName }} bash -c "ls -a /neural-compressor && rm -fr /neural-compressor/* && rm -fr /neural-compressor/.* && ls -a /neural-compressor || true" fi diff --git a/.azure-pipelines/ut-basic.yml b/.azure-pipelines/ut-basic.yml index 549f67aed85..c329809c236 100644 --- a/.azure-pipelines/ut-basic.yml +++ b/.azure-pipelines/ut-basic.yml @@ -198,13 +198,16 @@ stages: jobs: - job: CollectDatafiles steps: - - template: template/docker-template.yml - parameters: - dockerConfigName: "commonDockerConfig" - repoName: "neural-compressor" - repoTag: "py38" - dockerFileName: "Dockerfile" - containerName: "" + - script: | + if [[ ! $(docker images | grep -i ${IMAGE_NAME}:${IMAGE_TAG}) ]]; then + docker build -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} . + fi + docker images | grep -i ${IMAGE_NAME} + if [[ $? -ne 0 ]]; then + echo "NO Such Repo" + exit 1 + fi + displayName: "Build develop docker image" - task: DownloadPipelineArtifact@2 inputs: From af4716267de0b1eb12a8d28c0581483243d4e01c Mon Sep 17 00:00:00 2001 From: chensuyue Date: Thu, 9 Mar 2023 22:19:23 +0800 Subject: [PATCH 2/6] for test Signed-off-by: chensuyue --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 21eabda0a1e..7d79101655c 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +# for test from io import open from setuptools import find_packages, setup import os From 40255235f4e77f76568252c808485cb6e966b6bb Mon Sep 17 00:00:00 2001 From: chensuyue Date: Thu, 9 Mar 2023 23:00:14 +0800 Subject: [PATCH 3/6] update pruning test Signed-off-by: chensuyue --- .azure-pipelines/scripts/ut/run_basic_others.sh | 3 +-- .azure-pipelines/scripts/ut/run_basic_pruning.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/scripts/ut/run_basic_others.sh b/.azure-pipelines/scripts/ut/run_basic_others.sh index 78b07e2cb79..b51d5dead94 100644 --- a/.azure-pipelines/scripts/ut/run_basic_others.sh +++ b/.azure-pipelines/scripts/ut/run_basic_others.sh @@ -16,8 +16,7 @@ sed -i '/ ux\//d' run.sh sed -i '/ neural_coder\//d' run.sh sed -i '/ ipex\//d' run.sh sed -i '/ itex\//d' run.sh -sed -i '/ pruning\//d' run.sh -sed -i '/ pruning_v1\//d' run.sh +sed -i '/ pruning*\//d' run.sh sed -i '/ scheduler\//d' run.sh echo "copy model for dynas..." diff --git a/.azure-pipelines/scripts/ut/run_basic_pruning.sh b/.azure-pipelines/scripts/ut/run_basic_pruning.sh index a13face7745..d12a89f6777 100644 --- a/.azure-pipelines/scripts/ut/run_basic_pruning.sh +++ b/.azure-pipelines/scripts/ut/run_basic_pruning.sh @@ -9,8 +9,7 @@ echo "set up UT env..." bash /neural-compressor/.azure-pipelines/scripts/ut/env_setup.sh lpot_path=$(python -c 'import neural_compressor; import os; print(os.path.dirname(neural_compressor.__file__))') cd /neural-compressor/test || exit 1 -find ./pruning -name "test*.py" | sed 's,\.\/,coverage run --source='"${lpot_path}"' --append ,g' | sed 's/$/ --verbose/'> run.sh -find ./pruning_v1 -name "test*.py" | sed 's,\.\/,coverage run --source='"${lpot_path}"' --append ,g' | sed 's/$/ --verbose/'>> run.sh +find ./pruning* -name "test*.py" | sed 's,\.\/,coverage run --source='"${lpot_path}"' --append ,g' | sed 's/$/ --verbose/'> run.sh find ./scheduler -name "test*.py" | sed 's,\.\/,coverage run --source='"${lpot_path}"' --append ,g' | sed 's/$/ --verbose/'>> run.sh LOG_DIR=/neural-compressor/log_dir From 1010f7bb4feaec210fb6357bc5abf63cd7cbde03 Mon Sep 17 00:00:00 2001 From: chensuyue Date: Thu, 9 Mar 2023 23:04:46 +0800 Subject: [PATCH 4/6] move nas test case Signed-off-by: chensuyue --- .azure-pipelines/scripts/ut/run_basic_others.sh | 1 + .azure-pipelines/scripts/ut/run_basic_pruning.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.azure-pipelines/scripts/ut/run_basic_others.sh b/.azure-pipelines/scripts/ut/run_basic_others.sh index b51d5dead94..d5f1bbe28ca 100644 --- a/.azure-pipelines/scripts/ut/run_basic_others.sh +++ b/.azure-pipelines/scripts/ut/run_basic_others.sh @@ -18,6 +18,7 @@ sed -i '/ ipex\//d' run.sh sed -i '/ itex\//d' run.sh sed -i '/ pruning*\//d' run.sh sed -i '/ scheduler\//d' run.sh +sed -i '/ nas\//d' run.sh echo "copy model for dynas..." mkdir -p .torch/ofa_nets || true diff --git a/.azure-pipelines/scripts/ut/run_basic_pruning.sh b/.azure-pipelines/scripts/ut/run_basic_pruning.sh index d12a89f6777..db07c70f01b 100644 --- a/.azure-pipelines/scripts/ut/run_basic_pruning.sh +++ b/.azure-pipelines/scripts/ut/run_basic_pruning.sh @@ -11,6 +11,7 @@ lpot_path=$(python -c 'import neural_compressor; import os; print(os.path.dirnam cd /neural-compressor/test || exit 1 find ./pruning* -name "test*.py" | sed 's,\.\/,coverage run --source='"${lpot_path}"' --append ,g' | sed 's/$/ --verbose/'> run.sh find ./scheduler -name "test*.py" | sed 's,\.\/,coverage run --source='"${lpot_path}"' --append ,g' | sed 's/$/ --verbose/'>> run.sh +find ./nas -name "test*.py" | sed 's,\.\/,coverage run --source='"${lpot_path}"' --append ,g' | sed 's/$/ --verbose/'>> run.sh LOG_DIR=/neural-compressor/log_dir mkdir -p ${LOG_DIR} From 23d38d61d34ee0eb969a6268446e2ca574131e6a Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 10 Mar 2023 00:35:12 +0800 Subject: [PATCH 5/6] minor fix Signed-off-by: chensuyue --- .azure-pipelines/scripts/ut/run_basic_others.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/scripts/ut/run_basic_others.sh b/.azure-pipelines/scripts/ut/run_basic_others.sh index d5f1bbe28ca..9a4db7d6aef 100644 --- a/.azure-pipelines/scripts/ut/run_basic_others.sh +++ b/.azure-pipelines/scripts/ut/run_basic_others.sh @@ -16,7 +16,7 @@ sed -i '/ ux\//d' run.sh sed -i '/ neural_coder\//d' run.sh sed -i '/ ipex\//d' run.sh sed -i '/ itex\//d' run.sh -sed -i '/ pruning*\//d' run.sh +sed -i '/ pruning/d' run.sh sed -i '/ scheduler\//d' run.sh sed -i '/ nas\//d' run.sh From 04ac5c9e1c0d1192e7d1c0214631b0536077bf7b Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 10 Mar 2023 00:36:55 +0800 Subject: [PATCH 6/6] remove test Signed-off-by: chensuyue --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 7d79101655c..21eabda0a1e 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -# for test from io import open from setuptools import find_packages, setup import os