!9565 remove unique optype attr

From: @cjh9368
Reviewed-by: @hangangqiang
Signed-off-by:

mindspore/lite/schema/ops.fbs

@@ -936,7 +936,7 @@ table ScatterND {
 }
 
 table Unique {
-    outType: int;
+    outType: int;  // DEPRECATED
 }
 
 table Unstack {

mindspore/lite/src/model_common.cc

@@ -176,7 +176,7 @@ Model *ImportFromBuffer(const char *model_buf, size_t size, bool take_buf) {
   }
   flatbuffers::Verifier verify((const uint8_t *)model_buf, size);
   int schema_version = VersionVerify(&verify);
-  if (schema_version == -1) {
+  if (schema_version == SCHEMA_INVALID) {
     MS_LOG(ERROR) << "The buffer is invalid and fail to create graph.";
     return nullptr;
   }

mindspore/lite/src/ops/unique.cc

@@ -22,14 +22,7 @@
 
 namespace mindspore {
 namespace lite {
-#ifdef PRIMITIVE_WRITEABLE
-int Unique::GetOutType() const { return this->primitive_->value.AsUnique()->outType; }
-
-void Unique::SetOutType(int out_type) { this->primitive_->value.AsUnique()->outType = out_type; }
-
-#else
-
-int Unique::GetOutType() const { return this->primitive_->value_as_Unique()->outType(); }
+#ifndef PRIMITIVE_WRITEABLE
 int Unique::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) {
   MS_ASSERT(nullptr != primitive);
   MS_ASSERT(nullptr != fbb);

mindspore/lite/src/ops/unique.h

@@ -32,14 +32,12 @@ class Unique : public PrimitiveC {
 #ifdef PRIMITIVE_WRITEABLE
   MS_DECLARE_PARENT(Unique, PrimitiveC);
   explicit Unique(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {}
-  void SetOutType(int out_type);
 
 #else
   int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
 
 #endif
   int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;
-  int GetOutType() const;
 };
 }  // namespace lite
 }  // namespace mindspore

mindspore/lite/test/ut/tools/converter/parser/tflite/tflite_unique_parser_test.cc

@@ -34,8 +34,6 @@ TEST_F(TestTfliteParserUnique, OpType) {
 
 TEST_F(TestTfliteParserUnique, AttrValue) {
   ASSERT_NE(meta_graph->nodes.front()->primitive->value.AsUnique(), nullptr);
-  auto val = meta_graph->nodes.front()->primitive->value.AsUnique();
   ASSERT_NE(meta_graph->nodes.front()->primitive->value.AsUnique(), nullptr);
-  ASSERT_EQ(val->outType, 34);
 }
 }  // namespace mindspore

mindspore/lite/tools/converter/parser/caffe/caffe_model_parser.cc

@@ -182,7 +182,7 @@ STATUS CaffeModelParser::ConvertGraphInputs() {
       auto type_ptr = TypeIdToType(TypeId::kNumberTypeFloat32);
       auto abstract_tensor = std::make_shared<abstract::AbstractTensor>(type_ptr, shape);
       parameter->set_abstract(abstract_tensor);
-      parameter->set_name("graph-input-" + std::to_string(i));
+      parameter->set_name("graph_input-" + std::to_string(i));
       nodes_.insert(std::pair(layer.top(0), parameter));
       return RET_OK;
     }
@@ -205,7 +205,7 @@ STATUS CaffeModelParser::ConvertGraphInputs() {
       auto type_ptr = TypeIdToType(TypeId::kNumberTypeFloat32);
       auto abstract_tensor = std::make_shared<abstract::AbstractTensor>(type_ptr, shape);
       parameter->set_abstract(abstract_tensor);
-      parameter->set_name("graph-input-" + caffe_model_.input(i));
+      parameter->set_name("graph_input-" + caffe_model_.input(i));
       nodes_.insert(std::pair(caffe_model_.input(i), parameter));
     }
   } else {
@@ -219,7 +219,7 @@ STATUS CaffeModelParser::ConvertGraphInputs() {
       auto type_ptr = TypeIdToType(TypeId::kNumberTypeFloat32);
       auto abstract_tensor = std::make_shared<abstract::AbstractTensor>(type_ptr, shape_vector);
       parameter->set_abstract(abstract_tensor);
-      parameter->set_name("graph-input-" + caffe_model_.input(i));
+      parameter->set_name("graph_input-" + caffe_model_.input(i));
       nodes_.insert(std::pair(caffe_model_.input(i), parameter));
     }
   }

mindspore/lite/tools/converter/parser/tflite/tflite_model_parser.cc

@@ -153,6 +153,18 @@ STATUS TfliteModelParser::ConvertOps() {
         MS_LOG(ERROR) << "convert " << op_name << " node: " << input_idx << " const node failed.";
         continue;
       }
+
+      if (tflite_op_type == tflite::BuiltinOperator_CONV_2D ||
+          tflite_op_type == tflite::BuiltinOperator_DEPTHWISE_CONV_2D ||
+          tflite_op_type == tflite::BuiltinOperator_FULLY_CONNECTED) {
+        if (op_inputs.size() == 2) {
+          parameter->set_name(op_name + "/weight");
+        } else if (op_inputs.size() == 3) {
+          parameter->set_name(op_name + "/bias");
+        }
+      } else {
+        parameter->set_name(op_name + "/input-" + std::to_string(op_inputs.size() - 1));
+      }
       op_inputs.emplace_back(parameter);
       nodes_.insert(std::pair(input_idx, parameter));
     }

mindspore/lite/tools/converter/parser/tflite/tflite_unique_parser.cc

@@ -40,7 +40,6 @@ PrimitiveC *TfliteUniqueParser::ParseLitePrimitive(const std::unique_ptr<tflite:
     MS_LOG(ERROR) << "get op unique attr failed";
     return nullptr;
   }
-  attr->outType = GetTfliteDataType(tflite_attr->idx_out_type);
 
   primitive->value.type = schema::PrimitiveType_Unique;
   primitive->value.value = attr.release();