From 85f76a3215fe3ba62b176b177ab825e314bfbe77 Mon Sep 17 00:00:00 2001
From: wang_shaocong <wangshaocong1@huawei.com>
Date: Tue, 26 Jan 2021 10:36:04 +0800
Subject: [PATCH] add ci test for several models.

---
 mindspore/lite/test/models_caffe.cfg          |  4 ++--
 mindspore/lite/test/models_npu.cfg            |  9 ++++++++-
 mindspore/lite/test/models_onnx.cfg           |  2 ++
 mindspore/lite/test/models_tf.cfg             |  1 +
 ...with_several_inputs_or_without_outputs.cfg |  1 +
 mindspore/lite/test/run_benchmark_nets.sh     | 20 ++++++++++++-------
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/mindspore/lite/test/models_caffe.cfg b/mindspore/lite/test/models_caffe.cfg
index 64dc0a0ccd..7dcb5f461b 100644
--- a/mindspore/lite/test/models_caffe.cfg
+++ b/mindspore/lite/test/models_caffe.cfg
@@ -68,8 +68,8 @@ ml_location_scene_division
 ml_tabel_recog
 ml_text_division
 6c_seg_nomean_20200610
-ml_video_edit_person_divison
 ml_video_edit_img_segment
 ml_video_edit_video_segment_gauss_adaptis_part1
 ml_video_edit_Mnet
-ml_video_edit_hairSeg_have_imageProcessLayer_interpTo145
\ No newline at end of file
+ml_video_edit_hairSeg_have_imageProcessLayer_interpTo145
+ml_video_edit_person_divison_video
diff --git a/mindspore/lite/test/models_npu.cfg b/mindspore/lite/test/models_npu.cfg
index d9fe2f5502..6ded1823b4 100644
--- a/mindspore/lite/test/models_npu.cfg
+++ b/mindspore/lite/test/models_npu.cfg
@@ -33,4 +33,11 @@ ml_video_edit_style_transfer_gongnongbing.onnx 10
 ml_video_edit_style_transfer_starry.onnx 11
 porseg_tmp.onnx 1 2
 ml_video_edit_Mnet 1.5
-ml_video_edit_hairSeg_have_imageProcessLayer_interpTo145 0.5
\ No newline at end of file
+ml_video_edit_hairSeg_have_imageProcessLayer_interpTo145 0.5
+ml_video_edit_img_segment 1
+ml_video_edit_video_segment_gauss_adaptis_part1 2
+ml_video_edit_generate_filter.pb 1
+ml_video_edit_img_segment_adaptise.pb 0.5 2
+ml_video_edit_video_segment_gauss_adaptis_part2.pb 3 2
+ml_video_edit_person_divison_pic 8 2
+ml_video_edit_person_divison_video 0.5
diff --git a/mindspore/lite/test/models_onnx.cfg b/mindspore/lite/test/models_onnx.cfg
index 4fc6addb94..c153f5e54e 100644
--- a/mindspore/lite/test/models_onnx.cfg
+++ b/mindspore/lite/test/models_onnx.cfg
@@ -42,3 +42,5 @@ ml_video_edit_style_transfer_autoportrait.onnx
 ml_video_edit_style_transfer_candy.onnx
 ml_video_edit_style_transfer_gongnongbing.onnx
 ml_video_edit_style_transfer_starry.onnx
+ml_video_edit_judge.onnx
+ml_video_edit_vignet.onnx
diff --git a/mindspore/lite/test/models_tf.cfg b/mindspore/lite/test/models_tf.cfg
index 3a920966f5..c8042dd08c 100644
--- a/mindspore/lite/test/models_tf.cfg
+++ b/mindspore/lite/test/models_tf.cfg
@@ -5,3 +5,4 @@ encoder_201228.pb 3;1:1,22:1
 female_model_step2_int16_noiseout.pb 66
 encoder_0111_control_flow.pb 4;1:1,44:1:1
 encoder_0111.pb 4;1:1,44:1:1
+ml_video_edit_generate_filter.pb 1
diff --git a/mindspore/lite/test/models_with_several_inputs_or_without_outputs.cfg b/mindspore/lite/test/models_with_several_inputs_or_without_outputs.cfg
index b203554e6c..2d1251765a 100644
--- a/mindspore/lite/test/models_with_several_inputs_or_without_outputs.cfg
+++ b/mindspore/lite/test/models_with_several_inputs_or_without_outputs.cfg
@@ -36,3 +36,4 @@ ml_video_edit_img_segment_adaptise_pb2tflite.tflite;2
 ml_video_edit_video_segment_gauss_adaptis_part2.pb;2
 ml_video_edit_video_segment_gauss_adaptis_part2_pb2tflite.tflite;2
 tiny-yolov3-11.onnx;2;1,416,416,3:1,2
+ml_video_edit_person_divison_pic;2
diff --git a/mindspore/lite/test/run_benchmark_nets.sh b/mindspore/lite/test/run_benchmark_nets.sh
index fe8c5ad084..55b842d811 100755
--- a/mindspore/lite/test/run_benchmark_nets.sh
+++ b/mindspore/lite/test/run_benchmark_nets.sh
@@ -292,20 +292,26 @@ function Run_Converter() {
           tflite)
             model_fmk="TFLITE"
             ;;
-          caffemodel)
-            model_name=${model_name%.*}
-            model_fmk="CAFFE"
-            ;;
           onnx)
             model_fmk="ONNX"
             ;;
           mindir)
             model_fmk="MINDIR"
             ;;
+          *)
+            model_type="caffe"
+            model_fmk="CAFFE"
+            ;;
         esac
-        echo ${model_name} >> "${run_converter_log_file}"
-        echo './converter_lite  --fmk='${model_fmk}' --modelFile='${models_path}'/'${model_name}' --outputFile='${ms_models_path}'/'${model_name} >> "${run_converter_log_file}"
-        ./converter_lite  --fmk=${model_fmk} --modelFile=${models_path}/${model_name} --outputFile=${ms_models_path}/${model_name}
+        if [[ $model_fmk == "CAFFE" ]]; then
+          echo ${model_name} >> "${run_converter_log_file}"
+          echo './converter_lite  --fmk='${model_fmk}' --modelFile='$models_path/${model_name}'.prototxt --weightFile='$models_path'/'${model_name}'.caffemodel --outputFile='${ms_models_path}'/'${model_name} >> "${run_converter_log_file}"
+          ./converter_lite  --fmk=${model_fmk} --modelFile=${models_path}/${model_name}.prototxt --weightFile=${models_path}/${model_name}.caffemodel --outputFile=${ms_models_path}/${model_name}
+        else
+          echo ${model_name} >> "${run_converter_log_file}"
+          echo './converter_lite  --fmk='${model_fmk}' --modelFile='${models_path}'/'${model_name}' --outputFile='${ms_models_path}'/'${model_name} >> "${run_converter_log_file}"
+          ./converter_lite  --fmk=${model_fmk} --modelFile=${models_path}/${model_name} --outputFile=${ms_models_path}/${model_name}
+        fi
         if [ $? = 0 ]; then
             converter_result='converter '${model_type}' '${model_name}' pass';echo ${converter_result} >> ${run_converter_result_file}
         else