From db1b265492311c8c8cf73fe6473486e4c489fd4e Mon Sep 17 00:00:00 2001
From: shangliang Xu <ghostxsl@users.noreply.github.com>
Date: Thu, 16 Jun 2022 20:47:21 +0800
Subject: [PATCH] [TIPC] fix serving infer shell (#6206)

---
 test_tipc/prepare.sh                   | 8 --------
 test_tipc/test_serving_infer_cpp.sh    | 4 ----
 test_tipc/test_serving_infer_python.sh | 4 ++--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/test_tipc/prepare.sh b/test_tipc/prepare.sh
index a9fbfff6f..c18fbb2e1 100644
--- a/test_tipc/prepare.sh
+++ b/test_tipc/prepare.sh
@@ -80,14 +80,6 @@ elif [ ${MODE} = "paddle2onnx_infer" ];then
     ${python} -m pip install install paddle2onnx
     ${python} -m pip install onnxruntime==1.10.0
 elif [ ${MODE} = "serving_infer" ];then
-    git clone https://github.com/PaddlePaddle/Serving
-    cd Serving
-    bash tools/paddle_env_install.sh
-    ${python} -m pip install -r python/requirements.txt
-    cd ..
-    ${python} -m pip install paddle-serving-client -i https://pypi.tuna.tsinghua.edu.cn/simple
-    ${python} -m pip install paddle-serving-app -i https://pypi.tuna.tsinghua.edu.cn/simple
-    ${python} -m pip install paddle-serving-server-gpu -i https://pypi.tuna.tsinghua.edu.cn/simple
     unset https_proxy http_proxy
 else
     # download coco lite data
diff --git a/test_tipc/test_serving_infer_cpp.sh b/test_tipc/test_serving_infer_cpp.sh
index a9cf17ad3..17c3a50ec 100644
--- a/test_tipc/test_serving_infer_cpp.sh
+++ b/test_tipc/test_serving_infer_cpp.sh
@@ -89,10 +89,6 @@ function func_serving_inference(){
     done
 }
 
-# build paddle_serving_server
-bash deploy/serving/cpp/build_server.sh
-echo "################### build finished! ###################"
-
 # run serving infer
 Count=0
 IFS="|"
diff --git a/test_tipc/test_serving_infer_python.sh b/test_tipc/test_serving_infer_python.sh
index 96bd26ddb..be70a0297 100644
--- a/test_tipc/test_serving_infer_python.sh
+++ b/test_tipc/test_serving_infer_python.sh
@@ -81,9 +81,9 @@ function func_serving_inference(){
 }
 
 # set cuda device
-GPUID=$2
+GPUID=$3
 if [ ${#GPUID} -le 0 ];then
-    env=" "
+    env="export CUDA_VISIBLE_DEVICES=0"
 else
     env="export CUDA_VISIBLE_DEVICES=${GPUID}"
 fi
-- 
GitLab