From 042cff7d68dce03f12a010d8b3723395fccde998 Mon Sep 17 00:00:00 2001 From: "mulin.lyh" Date: Mon, 5 Sep 2022 16:08:50 +0800 Subject: [PATCH] [to #44702084]fix: ci pip install domain in single commands, find with requirement install failed is complicated. Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10014958 * [to #44702084]fix: ci pip install domain in single commands, find with requirement install failed is complicated. --- .dev_scripts/ci_container_test.sh | 10 +++++----- .dev_scripts/citest.sh | 19 ------------------- tests/run_config.yaml | 5 +---- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 .dev_scripts/citest.sh diff --git a/.dev_scripts/ci_container_test.sh b/.dev_scripts/ci_container_test.sh index a53c08c6..194a48b3 100644 --- a/.dev_scripts/ci_container_test.sh +++ b/.dev_scripts/ci_container_test.sh @@ -1,8 +1,8 @@ -pip install -r requirements.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/audio.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/cv.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/multi-modal.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/nlp.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html +awk -F: '/^[^#]/ { print $1 }' requirements.txt | xargs -n 1 pip install -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html +awk -F: '/^[^#]/ { print $1 }' requirements/audio.txt | xargs -n 1 pip install -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html +awk -F: '/^[^#]/ { print $1 }' requirements/cv.txt | xargs -n 1 pip install -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html +awk -F: '/^[^#]/ { print $1 }' requirements/multi-modal.txt | xargs -n 1 pip install -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html +awk -F: '/^[^#]/ { print $1 }' requirements/nlp.txt | xargs -n 1 pip install -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html pip install -r requirements/tests.txt git config --global --add safe.directory /Maas-lib diff --git a/.dev_scripts/citest.sh b/.dev_scripts/citest.sh deleted file mode 100644 index c6e0905f..00000000 --- a/.dev_scripts/citest.sh +++ /dev/null @@ -1,19 +0,0 @@ -pip install -r requirements.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/audio.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/cv.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/multi-modal.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -pip install -r requirements/nlp.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html - -pip install -r requirements/tests.txt -# install numpy<=1.18 for tensorflow==1.15.x -pip install "numpy<=1.18" - -# linter test -# use internal project for pre-commit due to the network problem -pre-commit run --all-files -if [ $? -ne 0 ]; then - echo "linter test failed, please run 'pre-commit run --all-files' to check" - exit -1 -fi - -PYTHONPATH=. python tests/run.py diff --git a/tests/run_config.yaml b/tests/run_config.yaml index 591dcd66..f44053f6 100644 --- a/tests/run_config.yaml +++ b/tests/run_config.yaml @@ -1,7 +1,4 @@ -# envs option allows fine-grained control for test executoin, for example, -# python tests/run.py --env pytorch -# would only trigger exeutions of all pytorch cases. -# envs option defaults to None for backward compatbility +# isolate cases in env, we can install different dependencies in each env. isolated: # test cases that may require excessive anmount of GPU memory, which will be executed in dedicagted process. - test_text_to_speech.py - test_multi_modal_embedding.py