Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!4431 fix st result 

Merge pull request !4431 from hexia/fix_st_result
This commit is contained in:
mindspore-ci-bot 2020-08-15 17:53:08 +08:00 committed by Gitee
parent 2b89b18e83 3a3c2528df
commit aa29042034
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/st/serving/client_example.py
View File

@ -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)

7
tests/st/serving/generate_model.py
View File

@ -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()

14
tests/st/serving/serving.sh
View File

@ -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