!4077 fix anf exporter add concat and transpose populater

Merge pull request !4077 from wangchangkai/master

mindspore/lite/src/common/anf_exporter/anf_exporter.cc

@@ -338,6 +338,18 @@ void AnfExporter::SetOpInputNode(const CNodePtr &cnode,
             meta_graph->allTensors.size();
         fbNode->inputIndex.emplace_back(meta_graph->allTensors.size());
         meta_graph->allTensors.emplace_back(std::move(paramTensor));
+      } else if (value->isa<mindspore::Int32Imm>()) {
+        auto valueAbstract = valueNode->abstract();
+        auto abstractScalar = utils::cast<abstract::AbstractScalarPtr>(valueAbstract);
+        auto typePtr = abstractScalar->GetTypeTrack();
+        paramTensor->dataType = typePtr->type_id();
+        paramTensor->dims = {1};
+        paramTensor->nodeType = schema::NodeType_ValueNode;
+        auto data = value->cast<mindspore::Int32ImmPtr>();
+        paramTensor->data.emplace_back(data->value());
+        nodeIdMap[valueNode->fullname_with_scope()] = meta_graph->allTensors.size();
+        fbNode->inputIndex.emplace_back(meta_graph->allTensors.size());
+        meta_graph->allTensors.emplace_back(std::move(paramTensor));
       } else if (value->isa<mindspore::ValueSequeue>()) {
         MS_LOG(INFO) << "Value type is ValueSequence.";
         break;

mindspore/lite/src/common/anf_exporter/anf_populater/anf_activation_populater.cc

@@ -29,6 +29,8 @@ int mindspore::lite::AnfActivationPopulater::Parse(mindspore::CNodePtr cnodePtr,
     attr->type = schema::ActivationType_RELU;
   } else if (p->name() == "Sigmoid") {
     attr->type = schema::ActivationType_SIGMOID;
+  } else if (p->name() == "ReLU6") {
+    attr->type = schema::ActivationType_RELU6;
   }
 
   node->nodeType = schema::NodeType_CNode;
@@ -38,5 +40,6 @@ int mindspore::lite::AnfActivationPopulater::Parse(mindspore::CNodePtr cnodePtr,
   return 0;
 }
 AnfNodePopulaterRegistrar anfReLUParser("ReLU", new AnfActivationPopulater());
+AnfNodePopulaterRegistrar anfReLU6Parser("ReLU6", new AnfActivationPopulater());
 AnfNodePopulaterRegistrar anfSigmoidParser("Sigmoid", new AnfActivationPopulater());
 }  // namespace mindspore::lite

mindspore/lite/src/common/anf_exporter/anf_populater/anf_concat_populater.cc

@@ -0,0 +1,45 @@
+/**
+ * This is the C++ adaptation and derivative work of Myia (https://github.com/mila-iqia/myia/).
+ *
+ * Copyright 2020 Huawei Technologies Co., Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "src/common/anf_exporter/anf_populater/anf_concat_populater.h"
+#include <string>
+#include <vector>
+#include <memory>
+#include "src/common/anf_exporter/anf_populater/anf_node_populater_registry.h"
+#include "ir/func_graph.h"
+#include "ir/primitive.h"
+
+namespace mindspore::lite {
+int mindspore::lite::AnfConcatPopulater::Parse(mindspore::CNodePtr cnodePtr, schema::CNodeT *node,
+                                          std::vector<schema::TensorT *> *outputs) {
+  auto p = GetCNodePrimitive(cnodePtr);
+  auto attr = std::make_unique<schema::ConcatT>();
+
+  auto prim_axis = GetValue<int>(p->GetAttr("axis"));
+  attr->axis = prim_axis;
+
+  node->nodeType = schema::NodeType_CNode;
+  node->primitive = std::make_unique<schema::PrimitiveT>();
+  node->primitive->value.type = schema::PrimitiveType_Concat;
+  node->primitive->value.value = attr.release();
+
+  return 0;
+}
+
+AnfNodePopulaterRegistrar anfConcatParser("Concat", new AnfConcatPopulater());
+}  // namespace mindspore::lite

mindspore/lite/src/common/anf_exporter/anf_populater/anf_concat_populater.h

@@ -0,0 +1,32 @@
+/**
+ * This is the C++ adaptation and derivative work of Myia (https://github.com/mila-iqia/myia/).
+ *
+ * Copyright 2020 Huawei Technologies Co., Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MINDSPORE_ANF_CONCAT_PARSER_H
+#define MINDSPORE_ANF_CONCAT_PARSER_H
+#include "src/common/anf_exporter/anf_populater/anf_node_populater.h"
+#include <vector>
+namespace mindspore::lite {
+class AnfConcatPopulater : public AnfNodePopulater {
+ public:
+  AnfConcatPopulater() = default;
+  ~AnfConcatPopulater() override = default;
+  int Parse(CNodePtr cnodePtr, schema::CNodeT *node, std::vector<schema::TensorT *> *outputs) override;
+};
+}  // namespace mindspore::lite
+
+#endif  // MINDSPORE_ANF_CONCAT_PARSER_H

mindspore/lite/src/common/anf_exporter/anf_populater/anf_depthwiseconv2d_populater.cc

@@ -62,6 +62,26 @@ int mindspore::lite::AnfDepwiseconv2DPopulater::Parse(mindspore::CNodePtr cnodeP
     attr->padMode = schema::PadMode_NOTSET;
   }
 
+  auto channel_multiplier = GetValue<int>(p->GetAttr("channel_multiplier"));
+  attr->channelMultiplier = channel_multiplier;
+
+  MS_ASSERT(cnodePtr->size() == kAnfPopulaterThree);
+  auto inputNode = cnodePtr->input(kAnfPopulaterTwo);
+  MS_ASSERT(inputNode != nullptr);
+  if (inputNode->isa<Parameter>()) {
+    auto paramNode = inputNode->cast<ParameterPtr>();
+    auto abstractBase = paramNode->abstract();
+    MS_ASSERT(abstractBase != nullptr);
+    if (utils::isa<abstract::AbstractTensorPtr>(abstractBase)) {
+      auto abstractTensor = utils::cast<abstract::AbstractTensorPtr>(abstractBase);
+      MS_ASSERT(abstractTensor != nullptr);
+      if (utils::isa<abstract::ShapePtr>(abstractTensor->BuildShape())) {
+        auto dims = utils::cast<abstract::ShapePtr>(abstractTensor->BuildShape())->shape();
+        attr->channelIn = dims[kAnfPopulaterOne];
+      }
+    }
+  }
+
   node->nodeType = schema::NodeType_CNode;
   node->primitive = std::make_unique<schema::PrimitiveT>();
   node->primitive->value.type = schema::PrimitiveType_DepthwiseConv2D;

mindspore/lite/src/common/anf_exporter/anf_populater/anf_node_populater.h

@@ -21,6 +21,9 @@
 #include "ir/anf.h"
 #include "schema/inner/model_generated.h"
 namespace mindspore::lite {
+constexpr int kAnfPopulaterOne = 1;
+constexpr int kAnfPopulaterTwo = 2;
+constexpr int kAnfPopulaterThree = 3;
 class AnfNodePopulater {
  public:
   AnfNodePopulater() = default;

mindspore/lite/src/common/anf_exporter/anf_populater/anf_transpose_populater.cc

@@ -0,0 +1,54 @@
+/**
+ * Copyright 2020 Huawei Technologies Co., Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "src/common/anf_exporter/anf_populater/anf_transpose_populater.h"
+#include <vector>
+#include <string>
+#include <memory>
+#include "src/common/anf_exporter/anf_populater/anf_node_populater_registry.h"
+#include "ir/func_graph.h"
+#include "ir/primitive.h"
+
+namespace mindspore::lite {
+int mindspore::lite::AnfTransposePopulater::Parse(mindspore::CNodePtr cnodePtr, schema::CNodeT *node,
+                                          std::vector<schema::TensorT *> *outputs) {
+  auto attr = std::make_unique<schema::TransposeT>();
+
+  MS_ASSERT(cnodePtr->size() == kAnfPopulaterThree);
+  auto inputNode = cnodePtr->input(kAnfPopulaterTwo);
+  if (inputNode->isa<ValueNode>()) {
+    auto valNode = inputNode->cast<ValueNodePtr>();
+    MS_ASSERT(valNode != nullptr);
+    auto val = valNode->value();
+    MS_ASSERT(val != nullptr);
+    if (val->isa<ValueTuple>()) {
+      auto tuple = val->cast<ValueTuplePtr>();
+      MS_ASSERT(tuple != nullptr);
+      for (size_t i = 0; i < tuple->size(); i++) {
+        auto elem = tuple->value()[i]->cast<Int32ImmPtr>();
+        MS_ASSERT(elem != nullptr);
+        attr->perm.emplace_back(static_cast<int>(elem->value()));
+      }
+    }
+  }
+
+  node->nodeType = schema::NodeType_CNode;
+  node->primitive = std::make_unique<schema::PrimitiveT>();
+  node->primitive->value.type = schema::PrimitiveType_Transpose;
+  node->primitive->value.value = attr.release();
+  return 0;
+}
+AnfNodePopulaterRegistrar anfTransposeParser("Transpose", new AnfTransposePopulater());
+}  // namespace mindspore::lite

mindspore/lite/src/common/anf_exporter/anf_populater/anf_transpose_populater.h

@@ -0,0 +1,29 @@
+/**
+ * Copyright 2019 Huawei Technologies Co., Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MINDSPORE_ANF_TRANSPOSE_PARSER_H
+#define MINDSPORE_ANF_TRANSPOSE_PARSER_H
+#include "src/common/anf_exporter/anf_populater/anf_node_populater.h"
+#include <vector>
+namespace mindspore::lite {
+class AnfTransposePopulater : public AnfNodePopulater {
+ public:
+  AnfTransposePopulater() = default;
+  ~AnfTransposePopulater() override = default;
+  int Parse(CNodePtr cnodePtr, schema::CNodeT *node, std::vector<schema::TensorT *> *outputs) override;
+};
+}  // namespace mindspore::lite
+
+#endif  // MINDSPORE_ANF_TRANSPOSE_PARSER_H