From dd91ba2eef0e58c70cfc33ae264673b3d9f21e5e Mon Sep 17 00:00:00 2001
From: andy <andy.wangrui@huawei.com>
Date: Fri, 7 Aug 2020 17:56:20 +0800
Subject: [PATCH] add new nets

---
 mindspore/lite/test/models_tflite.cfg     |  4 ----
 mindspore/lite/test/run_benchmark_nets.sh | 10 ++++++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mindspore/lite/test/models_tflite.cfg b/mindspore/lite/test/models_tflite.cfg
index 3b1c19d489..e3b984e2bd 100644
--- a/mindspore/lite/test/models_tflite.cfg
+++ b/mindspore/lite/test/models_tflite.cfg
@@ -4,10 +4,6 @@ hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.tflite
 hiai_bigmodel_ghost_5_1_no_normalized_no_trans_tflite.tflite
 hiai_cn_recognize_modify_padv2.tflite
 hiai_model_normalize_object_scene_ps_20200519.tflite
-hiai_detectmodel_06_23_960_480_1180700.tflite
-hiai_detect_curve_model_float32.tflite
-hiai_detectmodel_desnet_256_128_64_32.tflite
-mtk_AADB_HADB_MBV3_model_fp32.tflite
 mobilenet_v1_0.25_128.tflite
 mobilenet_v1_0.25_160.tflite
 mobilenet_v1_0.25_192.tflite
diff --git a/mindspore/lite/test/run_benchmark_nets.sh b/mindspore/lite/test/run_benchmark_nets.sh
index 61f88b21ba..4fc0891c3a 100644
--- a/mindspore/lite/test/run_benchmark_nets.sh
+++ b/mindspore/lite/test/run_benchmark_nets.sh
@@ -50,6 +50,7 @@ cd $convertor_path/MSLite-*-linux_x86_64
 
 #models_config_filename=/home/workspace/mindspore_dataset/mslite/models/models_config.txt
 models_tflite_config=${basepath}/models_tflite.cfg
+rm -rf ${basepath}/ms_models
 mkdir -p ${basepath}/ms_models
 ms_models_path=${basepath}/ms_models
 
@@ -63,6 +64,7 @@ done < ${models_tflite_config}
 #push to the arm and run benchmark：
 
 #first：copy to the server which connected to the phone
+rm -rf ${basepath}/benchmark_test
 mkdir -p ${basepath}/benchmark_test
 benchmark_test_path=${basepath}/benchmark_test
 cd ${benchmark_test_path}
@@ -79,13 +81,17 @@ adb -s $device_id push ${benchmark_test_path} /data/local/tmp/
 echo 'cd  /data/local/tmp/benchmark_test' > adb_cmd.txt
 echo 'cp  /data/local/tmp/libc++_shared.so ./' >> adb_cmd.txt
 echo 'chmod 777 benchmark' >> adb_cmd.txt
+
+adb -s $device_id shell < adb_cmd.txt
+
 #run models：
 while read line;do
 	model_name=$line
 	echo $model_name
+	echo 'cd  /data/local/tmp/benchmark_test' > adb_run_cmd.txt
 	echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath='${model_name}'.ms --inDataPath=/data/local/tmp/input_output/input/'${model_name}'.ms.bin --calibDataPath=/data/local/tmp/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1'
-	echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath='${model_name}'.ms --inDataPath=/data/local/tmp/input_output/input/'${model_name}'.ms.bin --calibDataPath=/data/local/tmp/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1' >> adb_cmd.txt
+	echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath='${model_name}'.ms --inDataPath=/data/local/tmp/input_output/input/'${model_name}'.ms.bin --calibDataPath=/data/local/tmp/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1' >> adb_run_cmd.txt
+        adb -s $device_id shell < adb_run_cmd.txt
 done < ${models_tflite_config}
 
-adb -s $device_id shell < adb_cmd.txt