From e35611697a3514f24289f170e115a12399f6a342 Mon Sep 17 00:00:00 2001
From: Kai Song <50285351+USTCKAY@users.noreply.github.com>
Date: Mon, 23 Oct 2023 11:09:37 +0800
Subject: [PATCH] [cherry-pick]cherry-pick tipc scripts update and fix np.int
 error (#3011)

---
 ppcls/data/preprocess/ops/autoaugment.py     |  2 +-
 test_tipc/test_train_inference_python.sh     |  4 ++--
 test_tipc/test_train_inference_python_npu.sh |  7 ++++++-
 test_tipc/test_train_inference_python_xpu.sh | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ppcls/data/preprocess/ops/autoaugment.py b/ppcls/data/preprocess/ops/autoaugment.py
index dba27808c..43327950f 100644
--- a/ppcls/data/preprocess/ops/autoaugment.py
+++ b/ppcls/data/preprocess/ops/autoaugment.py
@@ -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),
diff --git a/test_tipc/test_train_inference_python.sh b/test_tipc/test_train_inference_python.sh
index 474fed1f2..e7a14d9aa 100644
--- a/test_tipc/test_train_inference_python.sh
+++ b/test_tipc/test_train_inference_python.sh
@@ -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"
diff --git a/test_tipc/test_train_inference_python_npu.sh b/test_tipc/test_train_inference_python_npu.sh
index 6f2870ad4..ba5f3770b 100644
--- a/test_tipc/test_train_inference_python_npu.sh
+++ b/test_tipc/test_train_inference_python_npu.sh
@@ -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
diff --git a/test_tipc/test_train_inference_python_xpu.sh b/test_tipc/test_train_inference_python_xpu.sh
index 24968b168..f39bf9b0c 100644
--- a/test_tipc/test_train_inference_python_xpu.sh
+++ b/test_tipc/test_train_inference_python_xpu.sh
@@ -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