From b1c2350a265241ce42979056a11b8285454b4589 Mon Sep 17 00:00:00 2001
From: qili93 <qili93@qq.com>
Date: Tue, 13 Sep 2022 15:03:14 +0800
Subject: [PATCH] [TIPC] add more scripts change, test=develop

---
 test_tipc/test_train_inference_python.sh     | 4 ++--
 test_tipc/test_train_inference_python_npu.sh | 3 +++
 test_tipc/test_train_inference_python_xpu.sh | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test_tipc/test_train_inference_python.sh b/test_tipc/test_train_inference_python.sh
index ba2f26db2..7b7d590ab 100644
--- a/test_tipc/test_train_inference_python.sh
+++ b/test_tipc/test_train_inference_python.sh
@@ -265,9 +265,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"
diff --git a/test_tipc/test_train_inference_python_npu.sh b/test_tipc/test_train_inference_python_npu.sh
index bc6386b75..e933eff5b 100644
--- a/test_tipc/test_train_inference_python_npu.sh
+++ b/test_tipc/test_train_inference_python_npu.sh
@@ -40,6 +40,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
diff --git a/test_tipc/test_train_inference_python_xpu.sh b/test_tipc/test_train_inference_python_xpu.sh
index 24968b168..124d39935 100644
--- a/test_tipc/test_train_inference_python_xpu.sh
+++ b/test_tipc/test_train_inference_python_xpu.sh
@@ -40,6 +40,9 @@ 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 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