From f581ad2eb4c9663fa2068d09aca81bfa01695369 Mon Sep 17 00:00:00 2001 From: Yingda Chen Date: Mon, 25 Jul 2022 12:41:44 +0800 Subject: [PATCH] [to #43525415]fix: fix docker ci performance issue --- .dev_scripts/dockerci.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.dev_scripts/dockerci.sh b/.dev_scripts/dockerci.sh index 194fa0a6..c77c7ea3 100644 --- a/.dev_scripts/dockerci.sh +++ b/.dev_scripts/dockerci.sh @@ -5,6 +5,8 @@ CODE_DIR=$PWD CODE_DIR_IN_CONTAINER=/Maas-lib echo "$USER" gpus='7 6 5 4 3 2 1 0' +cpu_sets='0-7 8-15 16-23 24-30 31-37 38-44 45-51 52-58' +cpu_sets_arr=($cpu_sets) is_get_file_lock=false for gpu in $gpus do @@ -13,7 +15,19 @@ do echo "get gpu lock $gpu" CONTAINER_NAME="modelscope-ci-$gpu" let is_get_file_lock=true - docker run --rm --name $CONTAINER_NAME --shm-size=8gb --gpus "device=$gpu" -v $CODE_DIR:$CODE_DIR_IN_CONTAINER -v $MODELSCOPE_CACHE:$MODELSCOPE_CACHE_DIR_IN_CONTAINER -v /home/admin/pre-commit:/home/admin/pre-commit -e CI_TEST=True -e MODELSCOPE_CACHE=$MODELSCOPE_CACHE_DIR_IN_CONTAINER --workdir=$CODE_DIR_IN_CONTAINER --net host ${IMAGE_NAME}:${IMAGE_VERSION} bash .dev_scripts/ci_container_test.sh + docker run --rm --name $CONTAINER_NAME --shm-size=16gb \ + --cpuset-cpus=${cpu_sets_arr[$gpu]} \ + --gpus="device=$gpu" \ + -v $CODE_DIR:$CODE_DIR_IN_CONTAINER \ + -v $MODELSCOPE_CACHE:$MODELSCOPE_CACHE_DIR_IN_CONTAINER \ + -v $MODELSCOPE_HOME_CACHE/$gpu:/root \ + -v /home/admin/pre-commit:/home/admin/pre-commit \ + -e CI_TEST=True \ + -e MODELSCOPE_CACHE=$MODELSCOPE_CACHE_DIR_IN_CONTAINER \ + --workdir=$CODE_DIR_IN_CONTAINER \ + --net host \ + ${IMAGE_NAME}:${IMAGE_VERSION} \ + bash .dev_scripts/ci_container_test.sh if [ $? -ne 0 ]; then echo "Running test case failed, please check the log!" exit -1