From 2fe3b7be1ab89f38b73cca21c93d4b543758d4a5 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 7 Aug 2020 00:03:43 +0800 Subject: [PATCH] add new nets --- mindspore/lite/test/run_benchmark_nets.sh | 46 +++++------------------ 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/mindspore/lite/test/run_benchmark_nets.sh b/mindspore/lite/test/run_benchmark_nets.sh index f94c44cc1a..e1dd9d5380 100644 --- a/mindspore/lite/test/run_benchmark_nets.sh +++ b/mindspore/lite/test/run_benchmark_nets.sh @@ -43,18 +43,13 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib/:./third_party/protobuf/lib #convert the models cd $convertor_path/MSLite-*-linux_x86_64 -#model1: -./converter_lite --fmk=CAFFE --modelFile=$models_path/test.prototxt --outputFile=$models_path/test --weightFile=$models_path/test.caffemodel -#model2: -./converter_lite --fmk=TFLITE --modelFile=$models_path/hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.tflite --outputFile=$models_path/hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite -./converter_lite --fmk=TFLITE --modelFile=$models_path/hiai_cn_recognize_modify_padv2.tflite --outputFile=$models_path/hiai_cn_recognize_modify_padv2 +models_config_filename=/home/workspace/mindspore_dataset/mslite/models/models_config.txt -./converter_lite --fmk=TFLITE --modelFile=$models_path/hiai_detect_curve_model_float32.tflite --outputFile=$models_path/hiai_detect_curve_model_float32 - -./converter_lite --fmk=TFLITE --modelFile=$models_path/hiai_detectmodel_desnet_256_128_64_32.tflite --outputFile=$models_path/hiai_detectmodel_desnet_256_128_64_32 - -./converter_lite --fmk=TFLITE --modelFile=$models_path/mobilenet_v2_1_0_224.tflite --outputFile=$models_path/mobilenet_v2_1_0_224 +while read line;do + model_name=$line + ./converter_lite --fmk=TFLITE --modelFile=$models_path/${model_name} --outputFile=$models_path/${model_name} +done < ${models_config_filename} #push to the arm and run benchmark: @@ -65,11 +60,6 @@ cp $arm_path/MSLite-0.6.0-linux_arm64/benchmark/benchmark ./benchmark_test/benc #copy the models: cp $models_path/*.ms ./benchmark_test/ -#model1: -#cp $models_path/test.ms ./benchmark_test/ -#model2: -#cp $models_path/hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.ms ./benchmark_test/ -#cp $models_path/mobilenet_v2_1.0_224.tflite.ms ./benchmark_test/ #second:adb push to the phone adb -s $device_id push ./benchmark_test /data/local/tmp/ @@ -78,27 +68,11 @@ adb -s $device_id push ./benchmark_test /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 -#model1: -echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=test.ms' >> adb_cmd.txt -#model2: -#echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.ms' >> adb_cmd.txt - -echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.ms --inDataPath=/data/local/tmp/input_output/input/hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.tflite.ms.bin --calibDataPath=/data/local/tmp/input_output/output/hiai_bigmodel_ghost_2_1_no_normalized_no_trans_tflite.tflite.ms.out' >> adb_cmd.txt - -#echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=hiai_cn_recognize_modify_padv2.ms' >> adb_cmd.txt - -echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=hiai_cn_recognize_modify_padv2.ms --inDataPath=/data/local/tmp/input_output/input/hiai_cn_recognize_modify_padv2.tflite.ms.bin --calibDataPath=/data/local/tmp/input_output/output/hiai_cn_recognize_modify_padv2.tflite.ms.out' >> adb_cmd.txt - -#echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=hiai_detect_curve_model_float32.ms' >> adb_cmd.txt - -#echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=hiai_detectmodel_desnet_256_128_64_32.ms' >> adb_cmd.txt - - -#echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=mobilenet_v2_1_0_224.ms' >> adb_cmd.txt - -echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/data/local/tmp/benchmark_test;./benchmark --modelPath=mobilenet_v2_1_0_224.ms --inDataPath=/data/local/tmp/input_output/input/mobilenet_v2_1.0_224.tflite.ms.bin --calibDataPath=/data/local/tmp/input_output/output/mobilenet_v2_1.0_224.tflite.ms.out' >> adb_cmd.txt - - +#run models: +while read line;do + model_name=$line + 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 +done < ${models_config_filename} adb -s $device_id shell < adb_cmd.txt