mirrors
/
PaddleClas
mirror of https://github.com/PaddlePaddle/PaddleClas.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[cherry-pick]cherry-pick tipc scripts update and fix np.int error (#3011)

pull/3028/head
Kai Song 2023-10-23 11:09:37 +08:00 committed by GitHub
parent cb9392e60a
commit e35611697a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ppcls/data/preprocess/ops/autoaugment.py
View File

@ -204,7 +204,7 @@ class SubPolicy(object):
"translateY": np.linspace(0, 150 / 331, 10),
"rotate": np.linspace(0, 30, 10),
"color": np.linspace(0.0, 0.9, 10),
"posterize": np.round(np.linspace(8, 4, 10), 0).astype(np.int),
"posterize": np.round(np.linspace(8, 4, 10), 0).astype(np.int_),
"solarize": np.linspace(256, 0, 10),
"contrast": np.linspace(0.0, 0.9, 10),
"sharpness": np.linspace(0.0, 0.9, 10),

4
test_tipc/test_train_inference_python.sh
View File

@ -259,9 +259,9 @@ else
if [ ${#gpu} -le 2 ]; then # train with cpu or single gpu
cmd="${python} ${run_train} ${set_use_gpu} ${set_save_model} ${set_epoch} ${set_pretrain} ${set_autocast} ${set_batchsize} ${set_train_params1} "
elif [ ${#ips} -le 15 ]; then # train with multi-gpu
cmd="${python} -m paddle.distributed.launch --gpus=${gpu} ${run_train} ${set_use_gpu} ${set_save_model} ${set_epoch} ${set_pretrain} ${set_autocast} ${set_batchsize} ${set_train_params1}"
cmd="${python} -m paddle.distributed.launch --devices=${gpu} ${run_train} ${set_use_gpu} ${set_save_model} ${set_epoch} ${set_pretrain} ${set_autocast} ${set_batchsize} ${set_train_params1}"
else # train with multi-machine
cmd="${python} -m paddle.distributed.launch --ips=${ips} --gpus=${gpu} ${run_train} ${set_use_gpu} ${set_save_model} ${set_pretrain} ${set_epoch} ${set_autocast} ${set_batchsize} ${set_train_params1}"
cmd="${python} -m paddle.distributed.launch --ips=${ips} --devices=${gpu} ${run_train} ${set_use_gpu} ${set_save_model} ${set_pretrain} ${set_epoch} ${set_autocast} ${set_batchsize} ${set_train_params1}"
fi
# run train
eval "unset CUDA_VISIBLE_DEVICES"

7
test_tipc/test_train_inference_python_npu.sh
View File

@ -24,10 +24,12 @@ sed -i "s/Global.use_gpu/Global.use_npu/g" $FILENAME
sed -i "s/Global.use_tensorrt:True|False/Global.use_tensorrt:False/g" $FILENAME
sed -i "s/Global.save_interval=2/Global.save_interval=1/g" $FILENAME
sed -i "s/-o Global.epochs:lite_train_lite_infer=2/-o Global.epochs:lite_train_lite_infer=1/g" $FILENAME
sed -i "s/enable_mkldnn:True|False/enable_mkldnn:False/g" $FILENAME
# python has been updated to version 3.9 for npu backend
sed -i "s/python3.7/python3.9/g" $FILENAME
sed -i "s/python3.10/python3.9/g" $FILENAME
modelname=$(echo $FILENAME | cut -d '/' -f4)
modelname=$(echo $FILENAME | cut -d '/' -f3)
if [ $modelname == "PVTV2" ] || [ $modelname == "Twins" ] || [ $modelname == "SwinTransformer" ]; then
sed -i "s/gpu_list:0|0,1/gpu_list:0,1/g" $FILENAME
fi
@ -51,6 +53,9 @@ grep -n 'tools/.*yaml' $FILENAME | cut -d ":" -f 1 \
sed -i 's/device: gpu/device: npu/g' "$REPO_ROOT_PATH/$trainer_config"
done
# change gpu to npu in execution script
sed -i "s/\"gpu\"/\"npu\"/g" test_tipc/test_train_inference_python.sh
# pass parameters to test_train_inference_python.sh
cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} $2"
echo $cmd

18
test_tipc/test_train_inference_python_xpu.sh
View File

@ -21,6 +21,19 @@ FILENAME=$1
# change gpu to xpu in tipc txt configs
sed -i "s/Global.device:gpu/Global.device:xpu/g" $FILENAME
sed -i "s/Global.use_gpu/Global.use_xpu/g" $FILENAME
sed -i "s/Global.use_tensorrt:True|False/Global.use_tensorrt:False/g" $FILENAME
sed -i "s/Global.save_interval=2/Global.save_interval=1/g" $FILENAME
sed -i "s/-o Global.epochs:lite_train_lite_infer=2/-o Global.epochs:lite_train_lite_infer=1/g" $FILENAME
sed -i "s/enable_mkldnn:True|False/enable_mkldnn:False/g" $FILENAME
# python has been updated to version 3.9 for xpu backend
sed -i "s/python3.7/python3.9/g" $FILENAME
sed -i "s/python3.10/python3.9/g" $FILENAME
modelname=$(echo $FILENAME | cut -d '/' -f3)
if [ $modelname == "PVTV2" ] || [ $modelname == "Twins" ] || [ $modelname == "SwinTransformer" ]; then
sed -i "s/gpu_list:0|0,1/gpu_list:0,1/g" $FILENAME
fi
dataline=`cat $FILENAME`
# parser params
@ -40,6 +53,11 @@ grep -n 'tools/.*yaml' $FILENAME | cut -d ":" -f 1 \
sed -i 's/device: gpu/device: xpu/g' "$REPO_ROOT_PATH/$trainer_config"
done
# change gpu to xpu in execution script
sed -i "s/\"gpu\"/\"xpu\"/g" test_tipc/test_train_inference_python.sh
sed -i "s/\${model_name}\/train.log/train.log/g" test_tipc/test_train_inference_python.sh
sed -i "s/\${model_name}\/\${train_model_name}/\${train_model_name}/g" test_tipc/test_train_inference_python.sh
# pass parameters to test_train_inference_python.sh
cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} $2"
echo $cmd