From 78a44bcdf09bd57df9d32e21dcebf1809232b73d Mon Sep 17 00:00:00 2001
From: gongdaguo <gongdaguo@huawei.com>
Date: Sat, 22 Aug 2020 11:12:15 +0800
Subject: [PATCH] add modlues and converter bug repair

---
 mindspore/lite/test/models_tflite.cfg               |  1 +
 .../optimizer/fusion/conv_activation_fusion.cc      | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mindspore/lite/test/models_tflite.cfg b/mindspore/lite/test/models_tflite.cfg
index 13f1db88d..b73525878 100644
--- a/mindspore/lite/test/models_tflite.cfg
+++ b/mindspore/lite/test/models_tflite.cfg
@@ -56,6 +56,7 @@ nasnet_large.tflite
 model_emotions_0727_nosoftmax.tflite
 inception_resnet_v2.tflite
 ml_ocr_latin.tflite
+hiai_PoseEstimation_Pcm.tflite
 hiai_ssd_mobilenetv2_object.tflite
 hiai_cv_focusShootOCRModel_02.tflite
 hiai_cv_poseEstimation.tflite
diff --git a/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.cc b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.cc
index 99ac17990..2f5917beb 100644
--- a/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.cc
+++ b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.cc
@@ -23,7 +23,6 @@
 #include "schema/inner/model_generated.h"
 #include "tools/optimizer/common/gllo_utils.h"
 
-
 namespace mindspore::opt {
 namespace {
 constexpr size_t kActivationInputsLength = 2;
@@ -68,14 +67,18 @@ const AnfNodePtr ConvActivationFusion::Process(const FuncGraphPtr &func_graph, c
       MS_ASSERT(utils::isa<std::shared_ptr<mindspore::lite::Conv2D>>(primitiveT_value));
       auto primc = utils::cast<std::shared_ptr<mindspore::lite::Conv2D>>(primitiveT_value);
       MS_ASSERT(primc != nullptr);
-      primc->SetActivationType(activation_type);
-      return pre_node;
+      if (primc->GetActivationType() == schema::ActivationType_NO_ACTIVATION) {
+        primc->SetActivationType(activation_type);
+        return pre_node;
+      }
     } else if (node_type == schema::PrimitiveType_DepthwiseConv2D) {
       MS_ASSERT(utils::isa<std::shared_ptr<mindspore::lite::DepthwiseConv2D>>(primitiveT_value));
       auto primc = utils::cast<std::shared_ptr<mindspore::lite::DepthwiseConv2D>>(primitiveT_value);
       MS_ASSERT(primc != nullptr);
-      primc->SetActivationType(activation_type);
-      return pre_node;
+      if (primc->GetActivationType() == schema::ActivationType_NO_ACTIVATION) {
+        primc->SetActivationType(activation_type);
+        return pre_node;
+      }
     } else {
       MS_LOG(EXCEPTION) << "conv activation pass match only conv2d or depthwise_conv2d ";
     }
-- 
GitLab