From 3a3c2528dff438b4a385a759e0fc77f706b58bef Mon Sep 17 00:00:00 2001
From: hexia <hexia15@huawei.com>
Date: Fri, 14 Aug 2020 10:14:02 +0800
Subject: [PATCH] fix st

---
 tests/st/serving/client_example.py |  2 +-
 tests/st/serving/generate_model.py |  7 ++++---
 tests/st/serving/serving.sh        | 14 +++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/st/serving/client_example.py b/tests/st/serving/client_example.py
index ae203aea39..164852acee 100644
--- a/tests/st/serving/client_example.py
+++ b/tests/st/serving/client_example.py
@@ -89,7 +89,7 @@ def test_bert():
     net = BertModel(bert_net_cfg, False)
     bert_out = net(Tensor(input_ids), Tensor(segment_ids), Tensor(input_mask))
     print("bert out: ")
-    print(bert_out)
+    print(bert_out[0])
     bert_out_size = len(bert_out)
     for i in range(bert_out_size):
         result_np = np.frombuffer(result.result[i].data, dtype=np.float32).reshape(result.result[i].tensor_shape.dims)
diff --git a/tests/st/serving/generate_model.py b/tests/st/serving/generate_model.py
index ec05514405..2fdee2344a 100644
--- a/tests/st/serving/generate_model.py
+++ b/tests/st/serving/generate_model.py
@@ -62,14 +62,15 @@ def export_add_model():
     net = AddNet()
     x = np.ones(4).astype(np.float32)
     y = np.ones(4).astype(np.float32)
-    export(net, Tensor(x), Tensor(y), file_name='add.pb', file_format='MINDIR')
+    export(net, Tensor(x), Tensor(y), file_name='add.mindir', file_format='MINDIR')
 
 def export_bert_model():
-    net = BertModel(bert_net_cfg, False)
     input_ids = np.random.randint(0, 1000, size=(2, 32), dtype=np.int32)
     segment_ids = np.zeros((2, 32), dtype=np.int32)
     input_mask = np.zeros((2, 32), dtype=np.int32)
-    export(net, Tensor(input_ids), Tensor(segment_ids), Tensor(input_mask), file_name='bert.pb', file_format='MINDIR')
+    net = BertModel(bert_net_cfg, False)
+    export(net, Tensor(input_ids), Tensor(segment_ids), Tensor(input_mask),
+           file_name='bert.mindir', file_format='MINDIR')
 
 if __name__ == '__main__':
     export_add_model()
diff --git a/tests/st/serving/serving.sh b/tests/st/serving/serving.sh
index dd40293062..e3b8ca9fd0 100644
--- a/tests/st/serving/serving.sh
+++ b/tests/st/serving/serving.sh
@@ -16,7 +16,7 @@ echo "ENV_DEVICE_ID:" ${ENV_DEVICE_ID}
 
 MODEL_PATH=${CURRPATH}/model
 export LD_LIBRARY_PATH=${MINDSPORE_INSTALL_PATH}/lib:/usr/local/python/python375/lib/:${LD_LIBRARY_PATH}
-export PYTHONPATH=${MINDSPORE_INSTALL_PATH}/../:${PYTHONPATH}
+export PYTHONPATH=${MINDSPORE_INSTALL_PATH}/:${PYTHONPATH}
 
 echo "LD_LIBRARY_PATH: " ${LD_LIBRARY_PATH}
 echo "PYTHONPATH: " ${PYTHONPATH}
@@ -40,7 +40,7 @@ prepare_model()
   echo "### begin to generate mode for serving test ###"
   python3 generate_model.py &> generate_model_serving.log
   echo "### end to generate mode for serving test ###"
-  result=`ls -l | grep -E '*pb' | grep -v ".log" | wc -l`
+  result=`ls -l | grep -E '*mindir' | grep -v ".log" | wc -l`
   if [ ${result} -ne 2 ]
   then
     cat generate_model_serving.log
@@ -49,7 +49,7 @@ prepare_model()
   fi
   rm -rf model
   mkdir model
-  mv *.pb ${CURRPATH}/model
+  mv *.mindir ${CURRPATH}/model
   cp ${MINDSPORE_INSTALL_PATH}/ms_serving ./
 }
 
@@ -91,27 +91,27 @@ pytest_serving()
   then
     clean_pid
     cat ${test_client_name}_client.log
-    echo "client $1 faile to start."
+    echo "client $1 faile to start." && exit 1
   fi
   echo "### $1 client end ###"
 }
 
 test_add_model()
 {
-  start_service 5500 add.pb ${ENV_DEVICE_ID}
+  start_service 5500 add.mindir ${ENV_DEVICE_ID}
   pytest_serving test_add
   clean_pid
 }
 
 test_bert_model()
 {
-  start_service 5500 bert.pb ${ENV_DEVICE_ID}
+  start_service 5500 bert.mindir ${ENV_DEVICE_ID}
   pytest_serving test_bert
   clean_pid
 }
 
 echo "-----serving start-----"
-rm -rf ms_serving *.log *.pb *.dat ${CURRPATH}/model ${CURRPATH}/kernel_meta
+rm -rf ms_serving *.log *.mindir *.dat ${CURRPATH}/model ${CURRPATH}/kernel_meta
 prepare_model
 test_add_model
 test_bert_model