Skip to content

Commit 06c625d

Browse files
committed
update paddlex ci
1 parent 9139955 commit 06c625d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

models/PaddleX/ci/ci_run.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MODEL_LIST_FILE=$2
66
################################################### 可配置环境变量 #####################################################
77
# MEM_SIZE: 显存大小,默认值16G,设置示例:export MEM_SIZE=16
88
# DEVICE_TYPE: 设备类型,默认gpu,只支持小写,设置示例:export DEVICE_TYPE=gpu
9-
# DEVICE_NUM: 卡数,默认4卡,设置示例:export DEVICE_NUM=4
9+
# DEVICE_ID: 使用卡号,默认4卡,设置示例:export DEVICE_ID='0,1,2,3'
1010
# TEST_RANGE: 测试范围,默认为空,设置示例:export TEST_RANGE='inference'
1111

1212
# set -x
@@ -36,12 +36,11 @@ function func_parser_dataset_url(){
3636
}
3737

3838
function get_device_list(){
39-
gn=`expr $DEVICE_NUM - 1`
40-
seq=`seq -s "," 0 $gn`
39+
id_list=$DEVICE_ID
4140
if [[ $suite_name == "PaddleTS" ]];then
42-
seq=0
41+
id_list=$FIRST_ID
4342
fi
44-
echo ${DEVICE_TYPE}:$seq
43+
echo ${DEVICE_TYPE}:$id_list
4544
}
4645

4746
# 运行命令并输出结果,PR级CI失败会重跑3次并异常退出,增量级和全量级会记录失败命令,最后打印失败的命令并异常退出
@@ -237,9 +236,10 @@ fi
237236
if [[ -z $DEVICE_TYPE ]]; then
238237
DEVICE_TYPE='gpu'
239238
fi
240-
if [[ -z $DEVICE_NUM ]]; then
241-
DEVICE_NUM=4
239+
if [[ -z $DEVICE_ID ]]; then
240+
DEVICE_ID='0,1,2,3'
242241
fi
242+
FIRST_ID=`echo $DEVICE_ID | awk -F ',' {'print$1'}`
243243

244244
if [[ -z $MODE ]]; then
245245
install_deps_cmd="paddlex --install -y"
@@ -371,7 +371,7 @@ function check_pipeline() {
371371
rm -rf $output_path
372372
mkdir -p $output_path
373373
cd $output_path
374-
cmd="timeout 30m paddlex --pipeline ${pipeline} --input ${img}"
374+
cmd="timeout 30m paddlex --pipeline ${pipeline} --input ${img} --device ${DEVICE_TYPE}:${FIRST_ID}"
375375
echo $cmd
376376
eval $cmd
377377
last_status=${PIPESTATUS[0]}

0 commit comments

Comments
 (0)