未验证 提交 2e8115d3 编写于 作者: D duanyanhui 提交者: GitHub

[TIPC] Add scripts for npu and xpu (#7020)

* add scritps for npu and xpu

* rm slim_config in config

* rm enable lit egine for npu and xpu

* add lite_engine_enabled
上级 37791f90
...@@ -825,8 +825,13 @@ def load_predictor(model_dir, ...@@ -825,8 +825,13 @@ def load_predictor(model_dir,
# optimize graph and fuse op # optimize graph and fuse op
config.switch_ir_optim(True) config.switch_ir_optim(True)
elif device == 'XPU': elif device == 'XPU':
if config.lite_engine_enabled():
config.enable_lite_engine() config.enable_lite_engine()
config.enable_xpu(10 * 1024 * 1024) config.enable_xpu(10 * 1024 * 1024)
elif device == 'NPU':
if config.lite_engine_enabled():
config.enable_lite_engine()
config.enable_npu()
else: else:
config.disable_gpu() config.disable_gpu()
config.set_cpu_math_library_num_threads(cpu_threads) config.set_cpu_math_library_num_threads(cpu_threads)
...@@ -1026,8 +1031,8 @@ if __name__ == '__main__': ...@@ -1026,8 +1031,8 @@ if __name__ == '__main__':
FLAGS = parser.parse_args() FLAGS = parser.parse_args()
print_arguments(FLAGS) print_arguments(FLAGS)
FLAGS.device = FLAGS.device.upper() FLAGS.device = FLAGS.device.upper()
assert FLAGS.device in ['CPU', 'GPU', 'XPU' assert FLAGS.device in ['CPU', 'GPU', 'XPU', 'NPU'
], "device should be CPU, GPU or XPU" ], "device should be CPU, GPU, XPU or NPU"
assert not FLAGS.use_gpu, "use_gpu has been deprecated, please use --device" assert not FLAGS.use_gpu, "use_gpu has been deprecated, please use --device"
assert not ( assert not (
......
#!/bin/bash
source test_tipc/utils_func.sh
function readlinkf() {
perl -MCwd -e 'print Cwd::abs_path shift' "$1";
}
function func_parser_config() {
strs=$1
IFS=" "
array=(${strs})
tmp=${array[2]}
echo ${tmp}
}
function func_parser_dir() {
strs=$1
IFS="/"
array=(${strs})
len=${#array[*]}
dir=""
count=1
for arr in ${array[*]}; do
if [ ${len} = "${count}" ]; then
continue;
else
dir="${dir}/${arr}"
count=$((${count} + 1))
fi
done
echo "${dir}"
}
BASEDIR=$(dirname "$0")
REPO_ROOT_PATH=$(readlinkf ${BASEDIR}/../)
FILENAME=$1
# change gpu to npu in tipc txt configs
sed -i "s/use_gpu:True/use_npu:True/g" $FILENAME
sed -i "s/--device:gpu|cpu/--device:npu|cpu/g" $FILENAME
sed -i "s/trainer:pact_train/trainer:norm_train/g" $FILENAME
sed -i "s/trainer:fpgm_train/trainer:norm_train/g" $FILENAME
sed -i "s/--slim_config _template_pact/ /g" $FILENAME
sed -i "s/--slim_config _template_fpgm/ /g" $FILENAME
sed -i "s/--slim_config _template_kl_quant/ /g" $FILENAME
sed -i 's/\"gpu\"/\"npu\"/g' test_tipc/test_train_inference_python.sh
# parser params
dataline=`cat $FILENAME`
IFS=$'\n'
lines=(${dataline})
# replace training config file
grep -n '.yml' $FILENAME | cut -d ":" -f 1 \
| while read line_num ; do
train_cmd=$(func_parser_value "${lines[line_num-1]}")
trainer_config=$(func_parser_config ${train_cmd})
echo ${trainer_config}
sed -i 's/use_gpu/use_npu/g' "$REPO_ROOT_PATH/$trainer_config"
# fine use_gpu in those included yaml
sub_datalinee=`cat $REPO_ROOT_PATH/$trainer_config`
IFS=$'\n'
sub_lines=(${sub_datalinee})
grep -n '.yml' "$REPO_ROOT_PATH/$trainer_config" | cut -d ":" -f 1 \
| while read sub_line_num; do
sub_config=${sub_lines[sub_line_num-1]}
dst=${#sub_config}-5
sub_path=$(func_parser_dir "${trainer_config}")
sub_config_path="${REPO_ROOT_PATH}${sub_path}/${sub_config:3:${dst}}"
echo ${sub_config_path}
sed -i 's/use_gpu/use_npu/g' "$sub_config_path"
done
done
# pass parameters to test_train_inference_python.sh
cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} $2"
echo $cmd
eval $cmd
#!/bin/bash
source test_tipc/utils_func.sh
function readlinkf() {
perl -MCwd -e 'print Cwd::abs_path shift' "$1";
}
function func_parser_config() {
strs=$1
IFS=" "
array=(${strs})
tmp=${array[2]}
echo ${tmp}
}
function func_parser_dir() {
strs=$1
IFS="/"
array=(${strs})
len=${#array[*]}
dir=""
count=1
for arr in ${array[*]}; do
if [ ${len} = "${count}" ]; then
continue;
else
dir="${dir}/${arr}"
count=$((${count} + 1))
fi
done
echo "${dir}"
}
BASEDIR=$(dirname "$0")
REPO_ROOT_PATH=$(readlinkf ${BASEDIR}/../)
FILENAME=$1
# change gpu to xpu in tipc txt configs
sed -i "s/use_gpu:True/use_xpu:True/g" $FILENAME
sed -i "s/--device:gpu|cpu/--device:xpu|cpu/g" $FILENAME
sed -i "s/trainer:pact_train/trainer:norm_train/g" $FILENAME
sed -i "s/trainer:fpgm_train/trainer:norm_train/g" $FILENAME
sed -i "s/--slim_config _template_pact/ /g" $FILENAME
sed -i "s/--slim_config _template_fpgm/ /g" $FILENAME
sed -i "s/--slim_config _template_kl_quant/ /g" $FILENAME
sed -i 's/\"gpu\"/\"xpu\"/g' test_tipc/test_train_inference_python.sh
# parser params
dataline=`cat $FILENAME`
IFS=$'\n'
lines=(${dataline})
# replace training config file
grep -n '.yml' $FILENAME | cut -d ":" -f 1 \
| while read line_num ; do
train_cmd=$(func_parser_value "${lines[line_num-1]}")
trainer_config=$(func_parser_config ${train_cmd})
echo ${trainer_config}
sed -i 's/use_gpu/use_xpu/g' "$REPO_ROOT_PATH/$trainer_config"
# fine use_gpu in those included yaml
sub_datalinee=`cat $REPO_ROOT_PATH/$trainer_config`
IFS=$'\n'
sub_lines=(${sub_datalinee})
grep -n '.yml' "$REPO_ROOT_PATH/$trainer_config" | cut -d ":" -f 1 \
| while read sub_line_num; do
sub_config=${sub_lines[sub_line_num-1]}
dst=${#sub_config}-5
sub_path=$(func_parser_dir "${trainer_config}")
sub_config_path="${REPO_ROOT_PATH}${sub_path}/${sub_config:3:${dst}}"
echo ${sub_config_path}
sed -i 's/use_gpu/use_xpu/g' "$sub_config_path"
done
done
# pass parameters to test_train_inference_python.sh
cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} $2"
echo $cmd
eval $cmd
\ No newline at end of file
...@@ -215,6 +215,8 @@ def main(): ...@@ -215,6 +215,8 @@ def main():
merge_config(FLAGS.opt) merge_config(FLAGS.opt)
check_config(cfg) check_config(cfg)
# check if set use_gpu=True in paddlepaddle cpu version # check if set use_gpu=True in paddlepaddle cpu version
if 'use_gpu' not in cfg:
cfg.use_gpu = False
check_gpu(cfg.use_gpu) check_gpu(cfg.use_gpu)
# check if paddlepaddle version is satisfied # check if paddlepaddle version is satisfied
check_version('develop') check_version('develop')
......
...@@ -168,6 +168,9 @@ def main(): ...@@ -168,6 +168,9 @@ def main():
if 'use_xpu' not in cfg: if 'use_xpu' not in cfg:
cfg.use_xpu = False cfg.use_xpu = False
if 'use_gpu' not in cfg:
cfg.use_gpu = False
if cfg.use_gpu: if cfg.use_gpu:
place = paddle.set_device('gpu') place = paddle.set_device('gpu')
elif cfg.use_npu: elif cfg.use_npu:
......
...@@ -112,6 +112,9 @@ def main(): ...@@ -112,6 +112,9 @@ def main():
if 'use_xpu' not in cfg: if 'use_xpu' not in cfg:
cfg.use_xpu = False cfg.use_xpu = False
if 'use_gpu' not in cfg:
cfg.use_gpu = False
if cfg.use_gpu: if cfg.use_gpu:
place = paddle.set_device('gpu') place = paddle.set_device('gpu')
elif cfg.use_npu: elif cfg.use_npu:
......
...@@ -98,6 +98,8 @@ def main(): ...@@ -98,6 +98,8 @@ def main():
# FIXME: Temporarily solve the priority problem of FLAGS.opt # FIXME: Temporarily solve the priority problem of FLAGS.opt
merge_config(FLAGS.opt) merge_config(FLAGS.opt)
check_config(cfg) check_config(cfg)
if 'use_gpu' not in cfg:
cfg.use_gpu = False
check_gpu(cfg.use_gpu) check_gpu(cfg.use_gpu)
check_version() check_version()
......
...@@ -201,6 +201,9 @@ def main(): ...@@ -201,6 +201,9 @@ def main():
if 'use_xpu' not in cfg: if 'use_xpu' not in cfg:
cfg.use_xpu = False cfg.use_xpu = False
if 'use_gpu' not in cfg:
cfg.use_gpu = False
if cfg.use_gpu: if cfg.use_gpu:
place = paddle.set_device('gpu') place = paddle.set_device('gpu')
elif cfg.use_npu: elif cfg.use_npu:
......
...@@ -124,6 +124,9 @@ def main(): ...@@ -124,6 +124,9 @@ def main():
if 'use_xpu' not in cfg: if 'use_xpu' not in cfg:
cfg.use_xpu = False cfg.use_xpu = False
if 'use_gpu' not in cfg:
cfg.use_gpu = False
if cfg.use_gpu: if cfg.use_gpu:
place = paddle.set_device('gpu') place = paddle.set_device('gpu')
elif cfg.use_npu: elif cfg.use_npu:
......
...@@ -86,6 +86,8 @@ def main(): ...@@ -86,6 +86,8 @@ def main():
# FIXME: Temporarily solve the priority problem of FLAGS.opt # FIXME: Temporarily solve the priority problem of FLAGS.opt
merge_config(FLAGS.opt) merge_config(FLAGS.opt)
check_config(cfg) check_config(cfg)
if 'use_gpu' not in cfg:
cfg.use_gpu = False
check_gpu(cfg.use_gpu) check_gpu(cfg.use_gpu)
check_version() check_version()
......
...@@ -146,6 +146,9 @@ def main(): ...@@ -146,6 +146,9 @@ def main():
if 'use_xpu' not in cfg: if 'use_xpu' not in cfg:
cfg.use_xpu = False cfg.use_xpu = False
if 'use_gpu' not in cfg:
cfg.use_gpu = False
if cfg.use_gpu: if cfg.use_gpu:
place = paddle.set_device('gpu') place = paddle.set_device('gpu')
elif cfg.use_npu: elif cfg.use_npu:
...@@ -163,6 +166,7 @@ def main(): ...@@ -163,6 +166,7 @@ def main():
check.check_config(cfg) check.check_config(cfg)
check.check_gpu(cfg.use_gpu) check.check_gpu(cfg.use_gpu)
check.check_npu(cfg.use_npu) check.check_npu(cfg.use_npu)
check.check_xpu(cfg.use_xpu)
check.check_version() check.check_version()
run(FLAGS, cfg) run(FLAGS, cfg)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册