From 7f3a2a0e67df0a9c6ae086f826f2fa5b66b8376a Mon Sep 17 00:00:00 2001 From: yvette Date: Wed, 2 Dec 2020 09:28:58 +0800 Subject: [PATCH] remove attr of sparseToDense op --- .../src/ops/populate/sparse_to_dense_populate.cc | 5 +---- mindspore/lite/src/ops/sparse_to_dense.cc | 13 ++----------- mindspore/lite/src/ops/sparse_to_dense.h | 2 -- .../tflite/tflite_sparse_to_dense_parser_test.cc | 6 ------ .../parser/tflite/tflite_sparse_to_dense_parser.cc | 1 - 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/mindspore/lite/src/ops/populate/sparse_to_dense_populate.cc b/mindspore/lite/src/ops/populate/sparse_to_dense_populate.cc index 637685b9b6..85f759eee7 100644 --- a/mindspore/lite/src/ops/populate/sparse_to_dense_populate.cc +++ b/mindspore/lite/src/ops/populate/sparse_to_dense_populate.cc @@ -23,16 +23,13 @@ namespace mindspore { namespace lite { OpParameter *PopulateSparseToDenseParameter(const mindspore::lite::PrimitiveC *primitive) { - SparseToDenseParameter *sparse_to_dense_param = - reinterpret_cast(malloc(sizeof(SparseToDenseParameter))); + auto *sparse_to_dense_param = reinterpret_cast(malloc(sizeof(SparseToDenseParameter))); if (sparse_to_dense_param == nullptr) { MS_LOG(ERROR) << "malloc SparseToDenseParameter failed."; return nullptr; } memset(sparse_to_dense_param, 0, sizeof(SparseToDenseParameter)); sparse_to_dense_param->op_parameter_.type_ = primitive->Type(); - auto param = reinterpret_cast(const_cast(primitive)); - sparse_to_dense_param->validate_indices_ = param->GetValidateIndices(); return reinterpret_cast(sparse_to_dense_param); } diff --git a/mindspore/lite/src/ops/sparse_to_dense.cc b/mindspore/lite/src/ops/sparse_to_dense.cc index 6c9a4cd340..bb665ed690 100644 --- a/mindspore/lite/src/ops/sparse_to_dense.cc +++ b/mindspore/lite/src/ops/sparse_to_dense.cc @@ -22,16 +22,7 @@ namespace mindspore { namespace lite { -#ifdef PRIMITIVE_WRITEABLE -bool SparseToDense::GetValidateIndices() const { return this->primitive_->value.AsSparseToDense()->validateIndices; } - -void SparseToDense::SetValidateIndices(bool validate_indices) { - this->primitive_->value.AsSparseToDense()->validateIndices = validate_indices; -} - -#else - -bool SparseToDense::GetValidateIndices() const { return this->primitive_->value_as_SparseToDense()->validateIndices(); } +#ifndef PRIMITIVE_WRITEABLE int SparseToDense::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) { MS_ASSERT(nullptr != primitive); MS_ASSERT(nullptr != fbb); @@ -40,7 +31,7 @@ int SparseToDense::UnPackToFlatBuilder(const schema::Primitive *primitive, flatb MS_LOG(ERROR) << "value_as_SparseToDense return nullptr"; return RET_ERROR; } - auto val_offset = schema::CreateSparseToDense(*fbb, attr->validateIndices()); + auto val_offset = schema::CreateSparseToDense(*fbb); auto prim_offset = schema::CreatePrimitive(*fbb, schema::PrimitiveType_SparseToDense, val_offset.o); fbb->Finish(prim_offset); return RET_OK; diff --git a/mindspore/lite/src/ops/sparse_to_dense.h b/mindspore/lite/src/ops/sparse_to_dense.h index 54599efc88..0a5e4429c3 100644 --- a/mindspore/lite/src/ops/sparse_to_dense.h +++ b/mindspore/lite/src/ops/sparse_to_dense.h @@ -36,14 +36,12 @@ class SparseToDense : public PrimitiveC { void SetOutputShape(const std::vector &output_shape); void SetSparseValue(const std::vector &sparse_value); void SetDefaultValue(const std::vector &default_value); - void SetValidateIndices(bool validate_indices); #else int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetOutputShape() const; std::vector GetSparseValue() const; std::vector GetDefaultValue() const; - bool GetValidateIndices() const; int InferShape(std::vector inputs_, std::vector outputs_) override; }; } // namespace lite diff --git a/mindspore/lite/test/ut/tools/converter/parser/tflite/tflite_sparse_to_dense_parser_test.cc b/mindspore/lite/test/ut/tools/converter/parser/tflite/tflite_sparse_to_dense_parser_test.cc index 9e3c967212..8b0eefc7b2 100644 --- a/mindspore/lite/test/ut/tools/converter/parser/tflite/tflite_sparse_to_dense_parser_test.cc +++ b/mindspore/lite/test/ut/tools/converter/parser/tflite/tflite_sparse_to_dense_parser_test.cc @@ -31,10 +31,4 @@ TEST_F(TestTfliteParserSparseToDense, OpType) { ASSERT_NE(meta_graph->nodes.front()->primitive.get(), nullptr); ASSERT_EQ(meta_graph->nodes.front()->primitive->value.type, schema::PrimitiveType_SparseToDense) << "wrong Op Type"; } - -TEST_F(TestTfliteParserSparseToDense, AttrValue) { - ASSERT_NE(meta_graph->nodes.front()->primitive->value.AsSparseToDense(), nullptr); - auto val = meta_graph->nodes.front()->primitive->value.AsSparseToDense(); - ASSERT_EQ(val->validateIndices, false); -} } // namespace mindspore diff --git a/mindspore/lite/tools/converter/parser/tflite/tflite_sparse_to_dense_parser.cc b/mindspore/lite/tools/converter/parser/tflite/tflite_sparse_to_dense_parser.cc index a7e793a59a..44f7f06371 100644 --- a/mindspore/lite/tools/converter/parser/tflite/tflite_sparse_to_dense_parser.cc +++ b/mindspore/lite/tools/converter/parser/tflite/tflite_sparse_to_dense_parser.cc @@ -35,7 +35,6 @@ PrimitiveC *TfliteSparseToDenseParser::ParseLitePrimitive(const std::unique_ptr< return nullptr; } - attr->validateIndices = false; primitive->value.type = schema::PrimitiveType_SparseToDense; primitive->value.value = attr.release(); return PrimitiveC::Create(primitive.release());