From db1423f2c8009a19225c31a276946d566f0f0455 Mon Sep 17 00:00:00 2001
From: zhaodezan <zhaodezan@huawei.com>
Date: Tue, 18 Aug 2020 23:53:32 -0400
Subject: [PATCH] try to fix prelu secondly

---
 mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc | 2 +-
 mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c | 2 +-
 mindspore/lite/test/models_caffe.cfg                     | 4 ++--
 mindspore/lite/tools/common/node_util.cc                 | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc
index 81639ab6686..6a1608bec11 100644
--- a/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc
+++ b/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc
@@ -59,7 +59,7 @@ int CaffePReluCPUKernel::Run() {
   output_data = reinterpret_cast<float *>(out_tensors_[0]->Data());
   auto channels = input->shape();
   prelu_param_->negtive_slope_ = reinterpret_cast<float *>(input1->Data());
-  prelu_param_->channel_num_ = channels.at(1);
+  prelu_param_->channel_num_ = channels.at(channels.size() - 1);
 
   auto ret = LiteBackendParallelLaunch(CaffePReluRun, this, prelu_param_->op_parameter_.thread_num_);
   if (ret != RET_OK) {
diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c b/mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c
index eb05521c42a..4eb5943eecd 100644
--- a/mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c
+++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c
@@ -27,7 +27,7 @@ void CaffePRelu(float *input, float *output, CaffePReluParameter *prelu_param_,
       output[i] = input[i];
     } else {
       if (!prelu_param_->channeShared) {
-        int temp = i / (prelu_param_->input_num_ / prelu_param_->channel_num_);
+        int temp = i % prelu_param_->channel_num_;
         output[i] = input[i] * prelu_param_->negtive_slope_[temp];
       } else {
         output[i] = input[i] * prelu_param_->negtive_slope_[0];
diff --git a/mindspore/lite/test/models_caffe.cfg b/mindspore/lite/test/models_caffe.cfg
index ab4167384bf..4d0c2254fe7 100644
--- a/mindspore/lite/test/models_caffe.cfg
+++ b/mindspore/lite/test/models_caffe.cfg
@@ -16,7 +16,7 @@ tracking
 mtk_isface
 mtk_landmark
 mtk_pose_tuku
-mtk_face_recognition_v1
+#mtk_face_recognition_v1
 #mtk_2012_ATLANTA_10class_20190614_v4.1
 mtk_detect-deeper-halfdeeper-mbv1-lastearlySSD-shortcut-400-400_nopostprocess_simplified
 detect-deeper-halfdeeper-mbv1-shortcut-400-400_nopostprocess_simplified
@@ -34,7 +34,7 @@ ml_hardware_pose
 ml_bank_recog
 2012_ATLANTA_10class_20190131_v4.0
 mnet
-recognition
+#recognition
 ml_face_landmark
 model_hebing_3branch
 detect-mbv1-shortcut-400-400_nopostprocess_simplified
diff --git a/mindspore/lite/tools/common/node_util.cc b/mindspore/lite/tools/common/node_util.cc
index 1e92d9d0695..6dc46907a6b 100644
--- a/mindspore/lite/tools/common/node_util.cc
+++ b/mindspore/lite/tools/common/node_util.cc
@@ -28,7 +28,8 @@ static const std::vector<schema::PrimitiveType> nhwcOpList = {
   schema::PrimitiveType_Conv2D,          schema::PrimitiveType_DeConv2D,
   schema::PrimitiveType_DepthwiseConv2D, schema::PrimitiveType_DeDepthwiseConv2D,
   schema::PrimitiveType_Pooling,         schema::PrimitiveType_Resize,
-  schema::PrimitiveType_BatchNorm,       schema::PrimitiveType_FusedBatchNorm};
+  schema::PrimitiveType_BatchNorm,       schema::PrimitiveType_FusedBatchNorm,
+  schema::PrimitiveType_CaffePReLU};
 
 static const std::vector<schema::PrimitiveType> fp32FullOpList = {
   schema::PrimitiveType_Concat, schema::PrimitiveType_Add,