From 1fd021b1814ba2086d9ca00fa01cebcda519ee89 Mon Sep 17 00:00:00 2001
From: yefeng <yefeng24@huawei.com>
Date: Tue, 29 Dec 2020 17:30:40 +0800
Subject: [PATCH] 4

---
 .../runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc    | 1 +
 mindspore/lite/test/models_tf.cfg                         | 1 +
 mindspore/lite/test/run_benchmark_nets.sh                 | 8 ++++++++
 .../tools/converter/legacy_optimizer/graph/switch_pass.cc | 1 -
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc
index 52bfa35f43..705d0592ea 100644
--- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc
+++ b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc
@@ -109,6 +109,7 @@ int ArithmeticCompareCPUKernel::DoArithmetic(int task_id) {
 }
 
 REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_Equal, LiteKernelCreator<ArithmeticCompareCPUKernel>)
+REG_KERNEL(kCPU, kNumberTypeInt32, PrimitiveType_Equal, LiteKernelCreator<ArithmeticCompareCPUKernel>)
 REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_NotEqual, LiteKernelCreator<ArithmeticCompareCPUKernel>)
 REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_Less, LiteKernelCreator<ArithmeticCompareCPUKernel>)
 REG_KERNEL(kCPU, kNumberTypeInt32, PrimitiveType_Less, LiteKernelCreator<ArithmeticCompareCPUKernel>)
diff --git a/mindspore/lite/test/models_tf.cfg b/mindspore/lite/test/models_tf.cfg
index 7712e1d401..23b3889631 100644
--- a/mindspore/lite/test/models_tf.cfg
+++ b/mindspore/lite/test/models_tf.cfg
@@ -1 +1,2 @@
 decoder_step_201217.pb 5
+decoder_step_201217_modified.pb 5
diff --git a/mindspore/lite/test/run_benchmark_nets.sh b/mindspore/lite/test/run_benchmark_nets.sh
index cd42456882..264aca73dd 100644
--- a/mindspore/lite/test/run_benchmark_nets.sh
+++ b/mindspore/lite/test/run_benchmark_nets.sh
@@ -332,6 +332,14 @@ function Run_x86() {
         else
             run_result='x86: '${model_name}' failed'; echo ${run_result} >> ${run_benchmark_result_file}; return 1
         fi
+        # run benchmark test without clib data
+        echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib:./third_party/libjpeg-turbo/lib:./third_party/opencv/lib;./benchmark/benchmark --modelFile='${ms_models_path}'/'${model_name}'.ms' >> "${run_x86_log_file}"
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib:./third_party/libjpeg-turbo/lib:./third_party/opencv/lib;./benchmark/benchmark --modelFile=${ms_models_path}/${model_name}.ms >> "${run_x86_log_file}"
+        if [ $? = 0 ]; then
+            run_result='x86: '${model_name}' pass'; echo ${run_result} >> ${run_benchmark_result_file}
+        else
+            run_result='x86: '${model_name}' failed'; echo ${run_result} >> ${run_benchmark_result_file}; return 1
+        fi
     done < ${models_tf_config}
 
     # Run tflite converted models:
diff --git a/mindspore/lite/tools/converter/legacy_optimizer/graph/switch_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/switch_pass.cc
index 5feb076f63..d18253a3c2 100644
--- a/mindspore/lite/tools/converter/legacy_optimizer/graph/switch_pass.cc
+++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/switch_pass.cc
@@ -248,7 +248,6 @@ STATUS SingleSwitchPass::InsertMerge() {
                                          merge_node->inputIndex.end());
 
   graph_->nodes.push_back(std::move(merge_node));
-  graph_->subGraph.at(this_subgraph_index_)->nodeIndices.push_back(graph_->nodes.size() - 1);
 
   return RET_OK;
 }