Browse Source

!7622 [MSLITE] Decoupling primitive problems

Merge pull request !7622 from yeyunpeng2020/primitive
tags/v1.1.0
mindspore-ci-bot Gitee 5 years ago
parent
commit
f26a3c685b
100 changed files with 304 additions and 1163 deletions
  1. +1
    -2
      mindspore/lite/src/CMakeLists.txt
  2. +3
    -3
      mindspore/lite/src/kernel_registry.cc
  3. +2
    -0
      mindspore/lite/src/model_common.cc
  4. +3
    -1
      mindspore/lite/src/ops/abs.cc
  5. +2
    -19
      mindspore/lite/src/ops/activation.cc
  6. +2
    -0
      mindspore/lite/src/ops/activation_grad.cc
  7. +2
    -0
      mindspore/lite/src/ops/adam.cc
  8. +2
    -23
      mindspore/lite/src/ops/add.cc
  9. +2
    -12
      mindspore/lite/src/ops/addn.cc
  10. +2
    -0
      mindspore/lite/src/ops/apply_momentum.cc
  11. +2
    -20
      mindspore/lite/src/ops/argmax.cc
  12. +2
    -20
      mindspore/lite/src/ops/argmin.cc
  13. +0
    -22
      mindspore/lite/src/ops/arithmetic.cc
  14. +0
    -2
      mindspore/lite/src/ops/arithmetic.h
  15. +2
    -11
      mindspore/lite/src/ops/arithmetic_self.cc
  16. +2
    -0
      mindspore/lite/src/ops/assign.cc
  17. +2
    -18
      mindspore/lite/src/ops/batch_norm.cc
  18. +2
    -38
      mindspore/lite/src/ops/batch_to_space.cc
  19. +3
    -14
      mindspore/lite/src/ops/bias_add.cc
  20. +2
    -0
      mindspore/lite/src/ops/bias_grad.cc
  21. +2
    -0
      mindspore/lite/src/ops/bn_grad.cc
  22. +2
    -21
      mindspore/lite/src/ops/broadcast_to.cc
  23. +2
    -17
      mindspore/lite/src/ops/cast.cc
  24. +0
    -1
      mindspore/lite/src/ops/ceil.h
  25. +2
    -15
      mindspore/lite/src/ops/clip.cc
  26. +2
    -16
      mindspore/lite/src/ops/concat.cc
  27. +2
    -17
      mindspore/lite/src/ops/constant_of_shape.cc
  28. +3
    -42
      mindspore/lite/src/ops/conv2d.cc
  29. +2
    -0
      mindspore/lite/src/ops/conv2d_grad_filter.cc
  30. +2
    -0
      mindspore/lite/src/ops/conv2d_grad_input.cc
  31. +2
    -1
      mindspore/lite/src/ops/cos.cc
  32. +2
    -24
      mindspore/lite/src/ops/crop.cc
  33. +2
    -13
      mindspore/lite/src/ops/custom_extract_features.cc
  34. +2
    -12
      mindspore/lite/src/ops/custom_normalize.cc
  35. +2
    -15
      mindspore/lite/src/ops/custom_predict.cc
  36. +2
    -40
      mindspore/lite/src/ops/deconv2d.cc
  37. +2
    -40
      mindspore/lite/src/ops/dedepthwise_conv2d.cc
  38. +2
    -0
      mindspore/lite/src/ops/depend.cc
  39. +2
    -17
      mindspore/lite/src/ops/depth_to_space.cc
  40. +2
    -42
      mindspore/lite/src/ops/depthwise_conv2d.cc
  41. +2
    -28
      mindspore/lite/src/ops/detection_post_process.cc
  42. +2
    -21
      mindspore/lite/src/ops/div.cc
  43. +2
    -0
      mindspore/lite/src/ops/dropout.cc
  44. +2
    -27
      mindspore/lite/src/ops/eltwise.cc
  45. +3
    -14
      mindspore/lite/src/ops/elu.cc
  46. +2
    -24
      mindspore/lite/src/ops/embedding_lookup.cc
  47. +2
    -0
      mindspore/lite/src/ops/embedding_lookup_sparse.cc
  48. +3
    -1
      mindspore/lite/src/ops/equal.cc
  49. +2
    -1
      mindspore/lite/src/ops/exp.cc
  50. +2
    -16
      mindspore/lite/src/ops/expand_dims.cc
  51. +2
    -0
      mindspore/lite/src/ops/fake_quant_with_min_max_vars.cc
  52. +2
    -21
      mindspore/lite/src/ops/fill.cc
  53. +2
    -14
      mindspore/lite/src/ops/flatten.cc
  54. +2
    -0
      mindspore/lite/src/ops/flatten_grad.cc
  55. +2
    -1
      mindspore/lite/src/ops/floor.cc
  56. +3
    -1
      mindspore/lite/src/ops/floor_div.cc
  57. +3
    -1
      mindspore/lite/src/ops/floor_mod.cc
  58. +2
    -27
      mindspore/lite/src/ops/full_connection.cc
  59. +2
    -18
      mindspore/lite/src/ops/fused_batchnorm.cc
  60. +2
    -16
      mindspore/lite/src/ops/gather.cc
  61. +2
    -17
      mindspore/lite/src/ops/gather_nd.cc
  62. +3
    -1
      mindspore/lite/src/ops/greater.cc
  63. +3
    -1
      mindspore/lite/src/ops/greater_equal.cc
  64. +2
    -0
      mindspore/lite/src/ops/group_conv2d_grad_input.cc
  65. +2
    -12
      mindspore/lite/src/ops/hashtable_lookup.cc
  66. +2
    -36
      mindspore/lite/src/ops/l2_norm.cc
  67. +2
    -0
      mindspore/lite/src/ops/leaky_relu.cc
  68. +3
    -1
      mindspore/lite/src/ops/less.cc
  69. +3
    -1
      mindspore/lite/src/ops/less_equal.cc
  70. +2
    -23
      mindspore/lite/src/ops/local_response_normalization.cc
  71. +2
    -1
      mindspore/lite/src/ops/log.cc
  72. +2
    -1
      mindspore/lite/src/ops/log_grad.cc
  73. +2
    -1
      mindspore/lite/src/ops/logical_and.cc
  74. +2
    -1
      mindspore/lite/src/ops/logical_not.cc
  75. +3
    -1
      mindspore/lite/src/ops/logical_or.cc
  76. +2
    -0
      mindspore/lite/src/ops/lrn.cc
  77. +2
    -17
      mindspore/lite/src/ops/lsh_projection.cc
  78. +2
    -20
      mindspore/lite/src/ops/lstm.cc
  79. +2
    -0
      mindspore/lite/src/ops/make_tuple.cc
  80. +2
    -18
      mindspore/lite/src/ops/matmul.cc
  81. +2
    -0
      mindspore/lite/src/ops/matrix_diag.cc
  82. +3
    -1
      mindspore/lite/src/ops/maximum.cc
  83. +2
    -27
      mindspore/lite/src/ops/mean.cc
  84. +2
    -1
      mindspore/lite/src/ops/minimum.cc
  85. +3
    -22
      mindspore/lite/src/ops/mul.cc
  86. +2
    -18
      mindspore/lite/src/ops/nchw2nhwc.cc
  87. +3
    -1
      mindspore/lite/src/ops/neg.cc
  88. +2
    -1
      mindspore/lite/src/ops/neg_grad.cc
  89. +2
    -19
      mindspore/lite/src/ops/nhwc2nchw.cc
  90. +3
    -1
      mindspore/lite/src/ops/not_equal.cc
  91. +2
    -20
      mindspore/lite/src/ops/one_hot.cc
  92. +0
    -15
      mindspore/lite/src/ops/ops_register.h
  93. +2
    -15
      mindspore/lite/src/ops/p_relu.cc
  94. +2
    -32
      mindspore/lite/src/ops/pad.cc
  95. +2
    -0
      mindspore/lite/src/ops/permute.cc
  96. +2
    -63
      mindspore/lite/src/ops/pooling.cc
  97. +2
    -0
      mindspore/lite/src/ops/pooling_grad.cc
  98. +42
    -0
      mindspore/lite/src/ops/populate/activation_populate.cc
  99. +46
    -0
      mindspore/lite/src/ops/populate/add_populate.cc
  100. +14
    -6
      mindspore/lite/src/ops/populate/addn_populate.cc

+ 1
- 2
mindspore/lite/src/CMakeLists.txt View File

@@ -31,7 +31,6 @@ set(LITE_SRC
${CMAKE_CURRENT_SOURCE_DIR}/kernel_registry.cc
${CMAKE_CURRENT_SOURCE_DIR}/lite_kernel.cc
${CMAKE_CURRENT_SOURCE_DIR}/sub_graph_kernel.cc
${CMAKE_CURRENT_SOURCE_DIR}/populate_parameter.cc
${CMAKE_CURRENT_SOURCE_DIR}/scheduler.cc
${CMAKE_CURRENT_SOURCE_DIR}/lite_session.cc
${CMAKE_CURRENT_SOURCE_DIR}/model.cc
@@ -65,7 +64,7 @@ if (SUPPORT_TRAIN)
)
endif ()

file(GLOB_RECURSE C_OPS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/ops/*.cc)
file(GLOB_RECURSE C_OPS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/ops/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/ops/populate/*.cc)
add_subdirectory(runtime/kernel/arm)

add_library(mindspore-lite SHARED ${LITE_SRC} ${C_OPS_SRC})


+ 3
- 3
mindspore/lite/src/kernel_registry.cc View File

@@ -15,8 +15,7 @@
*/
#include "src/kernel_registry.h"
#include "include/errorcode.h"

#include "src/populate_parameter.h"
#include "src/ops/populate/populate_register.h"
#ifdef ENABLE_ARM64
#include <asm/hwcap.h>
#include "common/utils.h"
@@ -107,7 +106,8 @@ kernel::LiteKernel *KernelRegistry::GetKernel(const std::vector<Tensor *> &in_te
const InnerContext *ctx, const kernel::KernelKey &key) {
MS_ASSERT(nullptr != primitive);
MS_ASSERT(nullptr != ctx);
auto parameter = kernel::PopulateParameter(primitive);
auto parameter =
PopulateRegistry::GetInstance()->getParameterCreator(schema::PrimitiveType(primitive->Type()))(primitive);
if (parameter == nullptr) {
MS_LOG(ERROR) << "PopulateParameter return nullptr, type: "
<< schema::EnumNamePrimitiveType((schema::PrimitiveType)primitive->Type());


+ 2
- 0
mindspore/lite/src/model_common.cc View File

@@ -16,7 +16,9 @@

#include "src/model_common.h"
#include "include/version.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore::lite {
bool ConvertNodes(const schema::MetaGraph *meta_graph, Model *model) {


+ 3
- 1
mindspore/lite/src/ops/abs.cc View File

@@ -15,7 +15,9 @@
*/

#include "src/ops/abs.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -31,6 +33,6 @@ int Abs::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::Fl
PrimitiveC *AbsCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Abs>(primitive); }
Registry AbsRegistry(schema::PrimitiveType_Abs, AbsCreator);
#endif
Registry AbsParameterRegistry(schema::PrimitiveType_Abs, PopulateArithmeticSelf);
} // namespace lite
} // namespace mindspore

+ 2
- 19
mindspore/lite/src/ops/activation.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/activation.h"
#include <memory>
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/activation.h"
#endif

namespace mindspore {
namespace lite {
@@ -88,24 +89,6 @@ PrimitiveC *ActivationCreator(const schema::Primitive *primitive) {
}
Registry ActivationRegistry(schema::PrimitiveType_Activation, ActivationCreator);
#endif
OpParameter *PopulateActivationParameter(const mindspore::lite::PrimitiveC *primitive) {
ActivationParameter *act_param = reinterpret_cast<ActivationParameter *>(malloc(sizeof(ActivationParameter)));
if (act_param == nullptr) {
MS_LOG(ERROR) << "malloc ActivationParameter failed.";
return nullptr;
}
memset(act_param, 0, sizeof(ActivationParameter));
act_param->op_parameter_.type_ = primitive->Type();
auto activation =
reinterpret_cast<mindspore::lite::Activation *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
act_param->type_ = static_cast<int>(activation->GetType());
act_param->alpha_ = activation->GetAlpha();
act_param->min_val_ = activation->GetMinVal();
act_param->max_val_ = activation->GetMaxVal();
return reinterpret_cast<OpParameter *>(act_param);
}

Registry ActivationParameterRegistry(schema::PrimitiveType_Activation, PopulateActivationParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 0
mindspore/lite/src/ops/activation_grad.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/activation_grad.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 0
mindspore/lite/src/ops/adam.cc View File

@@ -14,7 +14,9 @@
* limitations under the License.
*/
#include "src/ops/adam.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 23
mindspore/lite/src/ops/add.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/add.h"
#include <memory>
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/arithmetic_common.h"
#endif

namespace mindspore {
namespace lite {
@@ -77,27 +78,5 @@ PrimitiveC *AddCreator(const schema::Primitive *primitive) { return PrimitiveC::
Registry AddRegistry(schema::PrimitiveType_Add, AddCreator);
#endif

OpParameter *PopulateAddParameter(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticParameter *arithmetic_param = reinterpret_cast<ArithmeticParameter *>(malloc(sizeof(ArithmeticParameter)));
if (arithmetic_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticParameter failed.";
return nullptr;
}
memset(arithmetic_param, 0, sizeof(ArithmeticParameter));
arithmetic_param->op_parameter_.type_ = primitive->Type();
arithmetic_param->broadcasting_ = ((lite::Arithmetic *)primitive)->Broadcasting();
arithmetic_param->ndim_ = ((lite::Arithmetic *)primitive)->NDims();
arithmetic_param->activation_type_ =
reinterpret_cast<mindspore::lite::Add *>(const_cast<mindspore::lite::PrimitiveC *>(primitive))->GetActivationType();
auto tmp_shape = ((lite::Arithmetic *)primitive)->InShape0();
memcpy(arithmetic_param->in_shape0_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->InShape1();
memcpy(arithmetic_param->in_shape1_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->OutputShape();
memcpy(arithmetic_param->out_shape_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
return reinterpret_cast<OpParameter *>(arithmetic_param);
}
Registry AddParameterRegistry(schema::PrimitiveType_Add, PopulateAddParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 12
mindspore/lite/src/ops/addn.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/addn.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -68,18 +70,6 @@ PrimitiveC *AddNCreator(const schema::Primitive *primitive) { return PrimitiveC:
Registry AddNRegistry(schema::PrimitiveType_AddN, AddNCreator);
#endif

OpParameter *PopulateAddNParameter(const mindspore::lite::PrimitiveC *primitive) {
OpParameter *addn_param = reinterpret_cast<OpParameter *>(malloc(sizeof(OpParameter)));
if (addn_param == nullptr) {
MS_LOG(ERROR) << "malloc OpParameter failed.";
return nullptr;
}
memset(addn_param, 0, sizeof(OpParameter));
addn_param->type_ = primitive->Type();
return reinterpret_cast<OpParameter *>(addn_param);
}
Registry AddNParameterRegistry(schema::PrimitiveType_AddN, PopulateAddNParameter);

namespace {
constexpr int kLeastInputNum = 2;
}


+ 2
- 0
mindspore/lite/src/ops/apply_momentum.cc View File

@@ -14,7 +14,9 @@
* limitations under the License.
*/
#include "src/ops/apply_momentum.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 20
mindspore/lite/src/ops/argmax.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/argmax.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/arg_min_max_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -59,25 +60,6 @@ PrimitiveC *ArgMaxCreator(const schema::Primitive *primitive) { return Primitive
Registry ArgMaxRegistry(schema::PrimitiveType_ArgMax, ArgMaxCreator);
#endif

OpParameter *PopulateArgMaxParameter(const mindspore::lite::PrimitiveC *primitive) {
ArgMinMaxParameter *arg_param = reinterpret_cast<ArgMinMaxParameter *>(malloc(sizeof(ArgMinMaxParameter)));
if (arg_param == nullptr) {
MS_LOG(ERROR) << "malloc ArgMinMaxParameter failed.";
return nullptr;
}
memset(arg_param, 0, sizeof(ArgMinMaxParameter));
arg_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::ArgMax *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
arg_param->axis_ = param->GetAxis();
arg_param->topk_ = param->GetTopK();
arg_param->axis_type_ = param->GetAxisType();
arg_param->out_value_ = param->GetOutMaxValue();
arg_param->keep_dims_ = param->GetKeepDims();
return reinterpret_cast<OpParameter *>(arg_param);
}

Registry ArgMaxParameterRegistry(schema::PrimitiveType_ArgMax, PopulateArgMaxParameter);

int ArgMax::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 2
- 20
mindspore/lite/src/ops/argmin.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/argmin.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/arg_min_max_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -59,25 +60,6 @@ PrimitiveC *ArgMinCreator(const schema::Primitive *primitive) { return Primitive
Registry ArgMinRegistry(schema::PrimitiveType_ArgMin, ArgMinCreator);
#endif

OpParameter *PopulateArgMinParameter(const mindspore::lite::PrimitiveC *primitive) {
ArgMinMaxParameter *arg_param = reinterpret_cast<ArgMinMaxParameter *>(malloc(sizeof(ArgMinMaxParameter)));
if (arg_param == nullptr) {
MS_LOG(ERROR) << "malloc ArgMinMaxParameter failed.";
return nullptr;
}
memset(arg_param, 0, sizeof(ArgMinMaxParameter));
arg_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::ArgMin *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
arg_param->axis_ = param->GetAxis();
arg_param->topk_ = param->GetTopK();
arg_param->axis_type_ = param->GetAxisType();
arg_param->out_value_ = param->GetOutMaxValue();
arg_param->keep_dims_ = param->GetKeepDims();
return reinterpret_cast<OpParameter *>(arg_param);
}

Registry ArgMinParameterRegistry(schema::PrimitiveType_ArgMin, PopulateArgMinParameter);

int ArgMin::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 0
- 22
mindspore/lite/src/ops/arithmetic.cc View File

@@ -22,28 +22,6 @@
namespace mindspore {
namespace lite {

OpParameter *PopulateArithmetic(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticParameter *arithmetic_param = reinterpret_cast<ArithmeticParameter *>(malloc(sizeof(ArithmeticParameter)));
if (arithmetic_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticParameter failed.";
return nullptr;
}
memset(arithmetic_param, 0, sizeof(ArithmeticParameter));
arithmetic_param->op_parameter_.type_ = primitive->Type();
arithmetic_param->broadcasting_ = ((lite::Arithmetic *)primitive)->Broadcasting();
arithmetic_param->ndim_ = ((lite::Arithmetic *)primitive)->NDims();

arithmetic_param->activation_type_ = 0;

auto tmp_shape = ((lite::Arithmetic *)primitive)->InShape0();
memcpy(arithmetic_param->in_shape0_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->InShape1();
memcpy(arithmetic_param->in_shape1_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->OutputShape();
memcpy(arithmetic_param->out_shape_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
return reinterpret_cast<OpParameter *>(arithmetic_param);
}

int Arithmetic::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
if (inputs_.size() != kDoubleNum) {


+ 0
- 2
mindspore/lite/src/ops/arithmetic.h View File

@@ -52,8 +52,6 @@ class Arithmetic : public PrimitiveC {
std::vector<int> in_shape1_;
std::vector<int> out_shape_;
};

OpParameter *PopulateArithmetic(const mindspore::lite::PrimitiveC *primitive);
} // namespace lite
} // namespace mindspore



+ 2
- 11
mindspore/lite/src/ops/arithmetic_self.cc View File

@@ -17,21 +17,12 @@
#include "src/ops/arithmetic_self.h"
#include "include/errorcode.h"
#include "src/common/log_adapter.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
OpParameter *PopulateArithmeticSelf(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticSelfParameter *arithmetic_self_param =
reinterpret_cast<ArithmeticSelfParameter *>(malloc(sizeof(ArithmeticSelfParameter)));
if (arithmetic_self_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticSelfParameter failed.";
return nullptr;
}
memset(arithmetic_self_param, 0, sizeof(ArithmeticSelfParameter));
arithmetic_self_param->op_parameter_.type_ = primitive->Type();
return reinterpret_cast<OpParameter *>(arithmetic_self_param);
}

int ArithmeticSelf::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);


+ 2
- 0
mindspore/lite/src/ops/assign.cc View File

@@ -17,7 +17,9 @@
#include "src/ops/assign.h"
#include <memory>

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 18
mindspore/lite/src/ops/batch_norm.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/batch_norm.h"
#include <memory>
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/batchnorm_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -69,22 +70,5 @@ PrimitiveC *BatchNormCreator(const schema::Primitive *primitive) {
Registry BatchNormRegistry(schema::PrimitiveType_BatchNorm, BatchNormCreator);
#endif

OpParameter *PopulateBatchNorm(const mindspore::lite::PrimitiveC *primitive) {
const auto param =
reinterpret_cast<mindspore::lite::BatchNorm *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
BatchNormParameter *batch_norm_param = reinterpret_cast<BatchNormParameter *>(malloc(sizeof(BatchNormParameter)));
if (batch_norm_param == nullptr) {
MS_LOG(ERROR) << "malloc BatchNormParameter failed.";
return nullptr;
}
memset(batch_norm_param, 0, sizeof(BatchNormParameter));
batch_norm_param->op_parameter_.type_ = primitive->Type();
batch_norm_param->epsilon_ = param->GetEpsilon();
batch_norm_param->fused_ = false;
return reinterpret_cast<OpParameter *>(batch_norm_param);
}

Registry BatchNormParameterRegistry(schema::PrimitiveType_BatchNorm, PopulateBatchNorm);

} // namespace lite
} // namespace mindspore

+ 2
- 38
mindspore/lite/src/ops/batch_to_space.cc View File

@@ -20,8 +20,9 @@
#include "src/common/log_adapter.h"
#include "src/tensor.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/batch_to_space.h"
#endif

namespace mindspore {
namespace lite {
@@ -75,43 +76,6 @@ PrimitiveC *BatchToSpaceCreator(const schema::Primitive *primitive) {
Registry BatchToSpaceRegistry(schema::PrimitiveType_BatchToSpace, BatchToSpaceCreator);
#endif

OpParameter *PopulateBatchToSpaceParameter(const mindspore::lite::PrimitiveC *primitive) {
BatchToSpaceParameter *batch_space_param =
reinterpret_cast<BatchToSpaceParameter *>(malloc(sizeof(BatchToSpaceParameter)));
if (batch_space_param == nullptr) {
MS_LOG(ERROR) << "malloc BatchToSpaceParameter failed.";
return nullptr;
}
memset(batch_space_param, 0, sizeof(BatchToSpaceParameter));
batch_space_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::BatchToSpace *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
auto block_shape = param->GetBlockShape();
if (block_shape.size() != BATCH_TO_SPACE_BLOCK_SHAPE_SIZE) {
MS_LOG(ERROR) << "batch_to_space blockShape size should be " << BATCH_TO_SPACE_BLOCK_SHAPE_SIZE;
free(batch_space_param);
return nullptr;
}

auto crops = param->GetCrops();
if (crops.size() != BATCH_TO_SPACE_CROPS_SIZE) {
MS_LOG(ERROR) << "batch_to_space crops size should be " << BATCH_TO_SPACE_CROPS_SIZE;
free(batch_space_param);
return nullptr;
}

for (int i = 0; i < BATCH_TO_SPACE_BLOCK_SHAPE_SIZE; ++i) {
batch_space_param->block_shape_[i] = block_shape[i];
}

for (int i = 0; i < BATCH_TO_SPACE_CROPS_SIZE; ++i) {
batch_space_param->crops_[i] = crops[i];
}
return reinterpret_cast<OpParameter *>(batch_space_param);
}

Registry BatchToSpaceParameterRegistry(schema::PrimitiveType_BatchToSpace, PopulateBatchToSpaceParameter);
Registry BatchToSpaceNDParameterRegistry(schema::PrimitiveType_BatchToSpaceND, PopulateBatchToSpaceParameter);

namespace {
constexpr int kBatchToSpaceOutputNum = 1;
constexpr int kBatchToSpaceInputNum = 1;


+ 3
- 14
mindspore/lite/src/ops/bias_add.cc View File

@@ -16,8 +16,10 @@

#include "src/ops/bias_add.h"
#include <memory>
#include "nnacl/arithmetic_common.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -84,18 +86,5 @@ PrimitiveC *BiasAddCreator(const schema::Primitive *primitive) { return Primitiv
Registry BiasAddRegistry(schema::PrimitiveType_BiasAdd, BiasAddCreator);
#endif

OpParameter *PopulateBiasAddParameter(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticParameter *arithmetic_param = reinterpret_cast<ArithmeticParameter *>(malloc(sizeof(ArithmeticParameter)));
if (arithmetic_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticParameter failed.";
return nullptr;
}
memset(arithmetic_param, 0, sizeof(ArithmeticParameter));
arithmetic_param->op_parameter_.type_ = primitive->Type();

return reinterpret_cast<OpParameter *>(arithmetic_param);
}
Registry BiasAddParameterRegistry(schema::PrimitiveType_BiasAdd, PopulateBiasAddParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 0
mindspore/lite/src/ops/bias_grad.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/bias_grad.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 0
mindspore/lite/src/ops/bn_grad.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/bn_grad.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 21
mindspore/lite/src/ops/broadcast_to.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/broadcast_to.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/broadcast_to.h"
#endif

namespace mindspore {
namespace lite {
@@ -59,26 +60,6 @@ PrimitiveC *BroadcastToCreator(const schema::Primitive *primitive) {
Registry BroadcastToRegistry(schema::PrimitiveType_BroadcastTo, BroadcastToCreator);
#endif

OpParameter *PopulateBroadcastToParameter(const mindspore::lite::PrimitiveC *primitive) {
BroadcastToParameter *broadcast_param =
reinterpret_cast<BroadcastToParameter *>(malloc(sizeof(BroadcastToParameter)));
if (broadcast_param == nullptr) {
MS_LOG(ERROR) << "malloc BroadcastToParameter failed.";
return nullptr;
}
memset(broadcast_param, 0, sizeof(BroadcastToParameter));
auto param = reinterpret_cast<mindspore::lite::BroadcastTo *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
broadcast_param->op_parameter_.type_ = primitive->Type();
auto dst_shape = param->GetDstShape();
broadcast_param->shape_size_ = dst_shape.size();
for (size_t i = 0; i < broadcast_param->shape_size_; ++i) {
broadcast_param->shape_[i] = dst_shape[i];
}
return reinterpret_cast<OpParameter *>(broadcast_param);
}

Registry BroadcastToParameterRegistry(schema::PrimitiveType_BroadcastTo, PopulateBroadcastToParameter);

namespace {
constexpr int kBroadcastToInputNum = 1;
constexpr int kBroadcastToOutputNum = 1;


+ 2
- 17
mindspore/lite/src/ops/cast.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/cast.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/cast.h"
#endif

namespace mindspore {
namespace lite {
@@ -82,22 +83,6 @@ PrimitiveC *CastCreator(const schema::Primitive *primitive) { return PrimitiveC:
Registry CastRegistry(schema::PrimitiveType_Cast, CastCreator);
#endif

OpParameter *PopulateCastParameter(const mindspore::lite::PrimitiveC *primitive) {
CastParameter *cast_param = reinterpret_cast<CastParameter *>(malloc(sizeof(CastParameter)));
if (cast_param == nullptr) {
MS_LOG(ERROR) << "malloc CastParameter failed.";
return nullptr;
}
memset(cast_param, 0, sizeof(CastParameter));
cast_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::Cast *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
cast_param->src_type_ = param->GetSrcT();
cast_param->dst_type_ = param->GetDstT();
return reinterpret_cast<OpParameter *>(cast_param);
}

Registry CastParameterRegistry(schema::PrimitiveType_Cast, PopulateCastParameter);

int Cast::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 0
- 1
mindspore/lite/src/ops/ceil.h View File

@@ -21,7 +21,6 @@
#include <set>
#include <cmath>
#include "src/ops/arithmetic_self.h"
#include "src/ops/ops_register.h"

namespace mindspore {
namespace lite {


+ 2
- 15
mindspore/lite/src/ops/clip.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/clip.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif
#include "nnacl/clip.h"

namespace mindspore {
@@ -48,21 +50,6 @@ float Clip::GetMin() const { return this->primitive_->value_as_Clip()->min(); }
PrimitiveC *ClipCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Clip>(primitive); }
Registry ClipRegistry(schema::PrimitiveType_Clip, ClipCreator);
#endif
OpParameter *PopulateClipParameter(const mindspore::lite::PrimitiveC *primitive) {
ClipParameter *act_param = reinterpret_cast<ClipParameter *>(malloc(sizeof(ClipParameter)));
if (act_param == nullptr) {
MS_LOG(ERROR) << "malloc ClipParameter failed.";
return nullptr;
}
memset(act_param, 0, sizeof(ClipParameter));
act_param->op_parameter_.type_ = primitive->Type();
auto activation = reinterpret_cast<mindspore::lite::Clip *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
act_param->min_val_ = activation->GetMin();
act_param->max_val_ = activation->GetMax();
return reinterpret_cast<OpParameter *>(act_param);
}

Registry ClipParameterRegistry(schema::PrimitiveType_Clip, PopulateClipParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 16
mindspore/lite/src/ops/concat.cc View File

@@ -19,8 +19,9 @@
#include "include/errorcode.h"
#include "src/common/log_adapter.h"
#include "src/tensor.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/concat_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -83,21 +84,6 @@ Registry ConcatRegistry(schema::PrimitiveType_Concat, ConcatCreator);

#endif

OpParameter *PopulateConcatParameter(const mindspore::lite::PrimitiveC *primitive) {
ConcatParameter *concat_param = reinterpret_cast<ConcatParameter *>(malloc(sizeof(ConcatParameter)));
if (concat_param == nullptr) {
MS_LOG(ERROR) << "malloc ConcatParameter failed.";
return nullptr;
}
memset(concat_param, 0, sizeof(ConcatParameter));
concat_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::Concat *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
concat_param->axis_ = param->GetAxis();
return reinterpret_cast<OpParameter *>(concat_param);
}

Registry ConcatParameterRegistry(schema::PrimitiveType_Concat, PopulateConcatParameter);

namespace {
constexpr int kConcatOutputNum = 1;
}


+ 2
- 17
mindspore/lite/src/ops/constant_of_shape.cc View File

@@ -18,8 +18,9 @@
#include "include/errorcode.h"
#include "src/common/log_adapter.h"
#include "src/tensor.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/constant_of_shape.h"
#endif

namespace mindspore::lite {
namespace {
@@ -54,22 +55,6 @@ Registry ConstantOfShapeRegistry(schema::PrimitiveType_ConstantOfShape, Constant

#endif

OpParameter *PopulateConstantOfShapeParameter(const mindspore::lite::PrimitiveC *primitive) {
auto attr =
reinterpret_cast<mindspore::lite::ConstantOfShape *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
ConstantOfShapeParameter *param =
reinterpret_cast<ConstantOfShapeParameter *>(malloc(sizeof(ConstantOfShapeParameter)));
if (param == nullptr) {
MS_LOG(ERROR) << "malloc ConstantOfShapeParameter failed.";
return nullptr;
}
memset(param, 0, sizeof(ConstantOfShapeParameter));
param->op_parameter_.type_ = primitive->Type();
param->value_ = attr->GetValue();
return reinterpret_cast<OpParameter *>(param);
}
Registry ConstantOfShapeParameterRegistry(schema::PrimitiveType_ConstantOfShape, PopulateConstantOfShapeParameter);

int ConstantOfShape::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
if (inputs_.size() != kShapeInputNum) {
MS_LOG(ERROR) << "inputs to ConstantOfShape operator should be 1, but " << inputs_.size() << " is given.";


+ 3
- 42
mindspore/lite/src/ops/conv2d.cc View File

@@ -26,8 +26,10 @@
#include <float.h>
#include "tools/converter/quantizer/quantize_util.h"
#endif
#include "nnacl/conv_parameter.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -324,47 +326,6 @@ int Conv2D::GetActivationType() const { return this->primitive_->value_as_Conv2D
PrimitiveC *Conv2DCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Conv2D>(primitive); }
Registry Conv2DRegistry(schema::PrimitiveType_Conv2D, Conv2DCreator);
#endif
OpParameter *PopulateConvParameter(const mindspore::lite::PrimitiveC *primitive) {
ConvParameter *conv_param = reinterpret_cast<ConvParameter *>(malloc(sizeof(ConvParameter)));
if (conv_param == nullptr) {
MS_LOG(ERROR) << "malloc ConvParameter failed.";
return nullptr;
}
memset(conv_param, 0, sizeof(ConvParameter));
conv_param->op_parameter_.type_ = primitive->Type();
auto conv_primitive =
reinterpret_cast<mindspore::lite::Conv2D *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
conv_param->kernel_h_ = conv_primitive->GetKernelH();
conv_param->kernel_w_ = conv_primitive->GetKernelW();
conv_param->group_ = conv_primitive->GetGroup();
conv_param->stride_h_ = conv_primitive->GetStrideH();
conv_param->stride_w_ = conv_primitive->GetStrideW();

auto conv2d_lite_primitive = (lite::Conv2D *)primitive;
conv_param->pad_u_ = conv2d_lite_primitive->PadUp();
conv_param->pad_d_ = conv2d_lite_primitive->PadDown();
conv_param->pad_l_ = conv2d_lite_primitive->PadLeft();
conv_param->pad_r_ = conv2d_lite_primitive->PadRight();
conv_param->dilation_h_ = conv_primitive->GetDilateH();
conv_param->dilation_w_ = conv_primitive->GetDilateW();
conv_param->input_channel_ = conv_primitive->GetChannelIn();
conv_param->output_channel_ = conv_primitive->GetChannelOut();
conv_param->group_ = conv_primitive->GetGroup();
auto act_type = conv_primitive->GetActivationType();
switch (act_type) {
case schema::ActivationType_RELU:
conv_param->act_type_ = ActType_Relu;
break;
case schema::ActivationType_RELU6:
conv_param->act_type_ = ActType_Relu6;
break;
default:
conv_param->act_type_ = ActType_No;
break;
}
return reinterpret_cast<OpParameter *>(conv_param);
}
Registry Conv2DParameterRegistry(schema::PrimitiveType_Conv2D, PopulateConvParameter);

void Conv2D::ConvInferShape(int input_h, int input_w, int *output_h, int *output_w) {
MS_ASSERT(this->primitive_ != nullptr);


+ 2
- 0
mindspore/lite/src/ops/conv2d_grad_filter.cc View File

@@ -15,7 +15,9 @@
*/

#include "src/ops/conv2d_grad_filter.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 0
mindspore/lite/src/ops/conv2d_grad_input.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/conv2d_grad_input.h"
#include "src/ops/group_conv2d_grad_input.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 1
mindspore/lite/src/ops/cos.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/cos.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -32,7 +34,6 @@ int Cos::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::Fl
PrimitiveC *CosCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Cos>(primitive); }
Registry CosRegistry(schema::PrimitiveType_Cos, CosCreator);
#endif
Registry CosParameterRegistry(schema::PrimitiveType_Cos, PopulateArithmeticSelf);

} // namespace lite
} // namespace mindspore

+ 2
- 24
mindspore/lite/src/ops/crop.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/crop.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/crop_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -58,29 +59,6 @@ PrimitiveC *CropCreator(const schema::Primitive *primitive) { return PrimitiveC:
Registry CropRegistry(schema::PrimitiveType_Crop, CropCreator);
#endif

OpParameter *PopulateCropParameter(const mindspore::lite::PrimitiveC *primitive) {
auto param = reinterpret_cast<mindspore::lite::Crop *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
auto param_offset = param->GetOffsets();
if (param_offset.size() > CROP_OFFSET_MAX_SIZE) {
MS_LOG(ERROR) << "crop_param offset size(" << param_offset.size() << ") should <= " << CROP_OFFSET_MAX_SIZE;
return nullptr;
}
CropParameter *crop_param = reinterpret_cast<CropParameter *>(malloc(sizeof(CropParameter)));
if (crop_param == nullptr) {
MS_LOG(ERROR) << "malloc CropParameter failed.";
return nullptr;
}
memset(crop_param, 0, sizeof(CropParameter));
crop_param->op_parameter_.type_ = primitive->Type();
crop_param->axis_ = param->GetAxis();
crop_param->offset_size_ = param_offset.size();
for (size_t i = 0; i < param_offset.size(); ++i) {
crop_param->offset_[i] = param_offset[i];
}
return reinterpret_cast<OpParameter *>(crop_param);
}
Registry CropParameterRegistry(schema::PrimitiveType_Crop, PopulateCropParameter);

namespace {
constexpr int kCropOutputNum = 1;
constexpr int kCropInputNum = 2;


+ 2
- 13
mindspore/lite/src/ops/custom_extract_features.cc View File

@@ -17,7 +17,9 @@

#include "src/common/string_util.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -39,19 +41,6 @@ PrimitiveC *CustomExtractFeaturesCreator(const schema::Primitive *primitive) {
Registry CustomExtractFeaturesRegistry(schema::PrimitiveType_CustomExtractFeatures, CustomExtractFeaturesCreator);
#endif

OpParameter *PopulateExtractFeaturesParameter(const mindspore::lite::PrimitiveC *primitive) {
OpParameter *param = reinterpret_cast<OpParameter *>(malloc(sizeof(OpParameter)));
if (param == nullptr) {
MS_LOG(ERROR) << "new OpParameter failed.";
return nullptr;
}
memset(param, 0, sizeof(OpParameter));
param->type_ = primitive->Type();
return param;
}
Registry CustomExtractFeaturesParameterRegistry(schema::PrimitiveType_CustomExtractFeatures,
PopulateExtractFeaturesParameter);

int CustomExtractFeatures::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
auto input = inputs_.at(0);
auto output0 = outputs_.at(0);


+ 2
- 12
mindspore/lite/src/ops/custom_normalize.cc View File

@@ -17,7 +17,9 @@

#include "src/common/string_util.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -39,18 +41,6 @@ PrimitiveC *CustomNormalizeCreator(const schema::Primitive *primitive) {
Registry CustomNormalizeRegistry(schema::PrimitiveType_CustomNormalize, CustomNormalizeCreator);
#endif

OpParameter *PopulateCustomNormalizeParameter(const mindspore::lite::PrimitiveC *primitive) {
OpParameter *param = reinterpret_cast<OpParameter *>(malloc(sizeof(OpParameter)));
if (param == nullptr) {
MS_LOG(ERROR) << "new OpParameter failed.";
return nullptr;
}
memset(param, 0, sizeof(OpParameter));
param->type_ = primitive->Type();
return param;
}
Registry CustomNormalizeParameterRegistry(schema::PrimitiveType_CustomNormalize, PopulateCustomNormalizeParameter);

int CustomNormalize::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
auto input = inputs_.at(0);
auto output = outputs_.at(0);


+ 2
- 15
mindspore/lite/src/ops/custom_predict.cc View File

@@ -15,8 +15,9 @@
*/
#include "src/ops/custom_predict.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/predict_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -54,20 +55,6 @@ PrimitiveC *CustomPredictCreator(const schema::Primitive *primitive) {
}
Registry CustomPredictRegistry(schema::PrimitiveType_CustomPredict, CustomPredictCreator);
#endif
OpParameter *PopulateCustomPredictParameter(const mindspore::lite::PrimitiveC *primitive) {
PredictParameter *param = reinterpret_cast<PredictParameter *>(malloc(sizeof(PredictParameter)));
if (param == nullptr) {
MS_LOG(ERROR) << "malloc param failed.";
return nullptr;
}
memset(param, 0, sizeof(PredictParameter));
param->op_parameter_.type_ = primitive->Type();
auto prim = reinterpret_cast<mindspore::lite::CustomPredict *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
param->output_num = prim->GetOutputNum();
param->weight_threshold = prim->GetWeightThreshold();
return reinterpret_cast<OpParameter *>(param);
}
Registry CustomPredictParameterRegistry(schema::PrimitiveType_CustomPredict, PopulateCustomPredictParameter);

int CustomPredict::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
auto input = inputs_.at(0);


+ 2
- 40
mindspore/lite/src/ops/deconv2d.cc View File

@@ -25,8 +25,9 @@
#include "tools/converter/quantizer/quantize_util.h"
#endif

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/conv_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -304,45 +305,6 @@ PrimitiveC *DeConv2DCreator(const schema::Primitive *primitive) {
Registry DeConv2DRegistry(schema::PrimitiveType_DeConv2D, DeConv2DCreator);
#endif

OpParameter *PopulateDeconvParameter(const mindspore::lite::PrimitiveC *primitive) {
ConvParameter *conv_param = reinterpret_cast<ConvParameter *>(malloc(sizeof(ConvParameter)));
if (conv_param == nullptr) {
MS_LOG(ERROR) << "malloc ConvParameter failed.";
return nullptr;
}
memset(conv_param, 0, sizeof(ConvParameter));
conv_param->op_parameter_.type_ = primitive->Type();
auto conv_primitive =
reinterpret_cast<mindspore::lite::DeConv2D *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
conv_param->kernel_h_ = conv_primitive->GetKernelH();
conv_param->kernel_w_ = conv_primitive->GetKernelW();
conv_param->stride_h_ = conv_primitive->GetStrideH();
conv_param->stride_w_ = conv_primitive->GetStrideW();

auto deconv_lite_primitive = (lite::DeConv2D *)primitive;
conv_param->pad_u_ = deconv_lite_primitive->PadUp();
conv_param->pad_d_ = deconv_lite_primitive->PadDown();
conv_param->pad_l_ = deconv_lite_primitive->PadLeft();
conv_param->pad_r_ = deconv_lite_primitive->PadRight();
conv_param->dilation_h_ = conv_primitive->GetDilateH();
conv_param->dilation_w_ = conv_primitive->GetDilateW();
auto act_type = conv_primitive->GetActivationType();
switch (act_type) {
case schema::ActivationType_RELU:
conv_param->act_type_ = ActType_Relu;
break;
case schema::ActivationType_RELU6:
conv_param->act_type_ = ActType_Relu6;
break;
default:
conv_param->act_type_ = ActType_No;
break;
}
return reinterpret_cast<OpParameter *>(conv_param);
}

Registry DeConv2DParameterRegistry(schema::PrimitiveType_DeConv2D, PopulateDeconvParameter);

int DeConv2D::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 2
- 40
mindspore/lite/src/ops/dedepthwise_conv2d.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/dedepthwise_conv2d.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/conv_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -118,45 +119,6 @@ PrimitiveC *DeDepthwiseConv2DCreator(const schema::Primitive *primitive) {
Registry DeDepthwiseConv2DRegistry(schema::PrimitiveType_DeDepthwiseConv2D, DeDepthwiseConv2DCreator);
#endif

OpParameter *PopulateDeconvDwParameter(const mindspore::lite::PrimitiveC *primitive) {
ConvParameter *conv_param = reinterpret_cast<ConvParameter *>(malloc(sizeof(ConvParameter)));
if (conv_param == nullptr) {
MS_LOG(ERROR) << "malloc ConvParameter failed.";
return nullptr;
}
memset(conv_param, 0, sizeof(ConvParameter));
conv_param->op_parameter_.type_ = primitive->Type();
auto conv_primitive =
reinterpret_cast<mindspore::lite::DeDepthwiseConv2D *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
conv_param->kernel_h_ = conv_primitive->GetKernelH();
conv_param->kernel_w_ = conv_primitive->GetKernelW();
conv_param->stride_h_ = conv_primitive->GetStrideH();
conv_param->stride_w_ = conv_primitive->GetStrideW();

auto deconvdw_lite_primitive = (mindspore::lite::DeDepthwiseConv2D *)primitive;
conv_param->pad_u_ = deconvdw_lite_primitive->PadUp();
conv_param->pad_d_ = deconvdw_lite_primitive->PadDown();
conv_param->pad_l_ = deconvdw_lite_primitive->PadLeft();
conv_param->pad_r_ = deconvdw_lite_primitive->PadRight();
conv_param->dilation_h_ = conv_primitive->GetDilateH();
conv_param->dilation_w_ = conv_primitive->GetDilateW();
auto act_type = conv_primitive->GetActivationType();
switch (act_type) {
case schema::ActivationType_RELU:
conv_param->act_type_ = ActType_Relu;
break;
case schema::ActivationType_RELU6:
conv_param->act_type_ = ActType_Relu6;
break;
default:
conv_param->act_type_ = ActType_No;
break;
}
return reinterpret_cast<OpParameter *>(conv_param);
}

Registry DeDepthwiseConv2DParameterRegistry(schema::PrimitiveType_DeDepthwiseConv2D, PopulateDeconvDwParameter);

int DeDepthwiseConv2D::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
if (inputs_.size() != kDoubleNum && inputs_.size() != kMultiNum) {
MS_LOG(ERROR) << "inputs number is invalid";


+ 2
- 0
mindspore/lite/src/ops/depend.cc View File

@@ -17,7 +17,9 @@
#include <vector>
#include <memory>

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 17
mindspore/lite/src/ops/depth_to_space.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/depth_to_space.h"
#include "src/common/common.h"
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/depth_to_space_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -52,22 +53,6 @@ Registry DepthToSpaceRegistry(schema::PrimitiveType_DepthToSpace, DepthToSpaceCr

#endif

OpParameter *PopulateDepthToSpaceParameter(const mindspore::lite::PrimitiveC *primitive) {
DepthToSpaceParameter *depth_space_param =
reinterpret_cast<DepthToSpaceParameter *>(malloc(sizeof(DepthToSpaceParameter)));
if (depth_space_param == nullptr) {
MS_LOG(ERROR) << "malloc DepthToSpaceParameter failed.";
return nullptr;
}
memset(depth_space_param, 0, sizeof(DepthToSpaceParameter));
auto param = reinterpret_cast<mindspore::lite::DepthToSpace *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
depth_space_param->op_parameter_.type_ = primitive->Type();
depth_space_param->block_size_ = param->GetBlockSize();
return reinterpret_cast<OpParameter *>(depth_space_param);
}

Registry DepthToSpaceParameterRegistry(schema::PrimitiveType_DepthToSpace, PopulateDepthToSpaceParameter);

namespace {
constexpr int kDepthToSpaceOutputNum = 1;
constexpr int kDepthToSpaceInputNum = 1;


+ 2
- 42
mindspore/lite/src/ops/depthwise_conv2d.cc View File

@@ -21,8 +21,9 @@
#ifdef PRIMITIVE_WRITEABLE
#include "tools/converter/quantizer/quantize_util.h"
#endif
#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/conv_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -201,47 +202,6 @@ Registry DepthWiseConv2DRegistry(schema::PrimitiveType_DepthwiseConv2D, DepthWis

#endif

OpParameter *PopulateConvDwParameter(const mindspore::lite::PrimitiveC *primitive) {
ConvParameter *conv_param = reinterpret_cast<ConvParameter *>(malloc(sizeof(ConvParameter)));
if (conv_param == nullptr) {
MS_LOG(ERROR) << "malloc ConvParameter failed.";
return nullptr;
}
memset(conv_param, 0, sizeof(ConvParameter));
conv_param->op_parameter_.type_ = primitive->Type();

auto conv_primitive =
reinterpret_cast<mindspore::lite::DepthwiseConv2D *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
conv_param->kernel_h_ = conv_primitive->GetKernelH();
conv_param->kernel_w_ = conv_primitive->GetKernelW();
conv_param->stride_h_ = conv_primitive->GetStrideH();
conv_param->stride_w_ = conv_primitive->GetStrideW();

auto convdw_lite_primitive = (lite::DepthwiseConv2D *)primitive;
conv_param->pad_u_ = convdw_lite_primitive->PadUp();
conv_param->pad_d_ = convdw_lite_primitive->PadDown();
conv_param->pad_l_ = convdw_lite_primitive->PadLeft();
conv_param->pad_r_ = convdw_lite_primitive->PadRight();
conv_param->input_channel_ = convdw_lite_primitive->GetInputChannel();
conv_param->dilation_h_ = conv_primitive->GetDilateH();
conv_param->dilation_w_ = conv_primitive->GetDilateW();
auto act_type = conv_primitive->GetActivationType();
switch (act_type) {
case schema::ActivationType_RELU:
conv_param->act_type_ = ActType_Relu;
break;
case schema::ActivationType_RELU6:
conv_param->act_type_ = ActType_Relu6;
break;
default:
conv_param->act_type_ = ActType_No;
break;
}
return reinterpret_cast<OpParameter *>(conv_param);
}

Registry DepthwiseConv2DParameterRegistry(schema::PrimitiveType_DepthwiseConv2D, PopulateConvDwParameter);

int DepthwiseConv2D::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
if (inputs_.size() != kDoubleNum && inputs_.size() != kMultiNum) {
MS_LOG(ERROR) << "inputs number is invalid";


+ 2
- 28
mindspore/lite/src/ops/detection_post_process.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/detection_post_process.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/detection_post_process_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -147,33 +148,6 @@ PrimitiveC *DetectionPostProcessCreator(const schema::Primitive *primitive) {
}
Registry DetectionPostProcessRegistry(schema::PrimitiveType_DetectionPostProcess, DetectionPostProcessCreator);
#endif
OpParameter *PopulateDetectionPostProcessParameter(const mindspore::lite::PrimitiveC *primitive) {
DetectionPostProcessParameter *detection_post_process_parameter =
reinterpret_cast<DetectionPostProcessParameter *>(malloc(sizeof(DetectionPostProcessParameter)));
if (detection_post_process_parameter == nullptr) {
MS_LOG(ERROR) << "malloc EluParameter failed.";
return nullptr;
}
memset(detection_post_process_parameter, 0, sizeof(DetectionPostProcessParameter));
detection_post_process_parameter->op_parameter_.type_ = primitive->Type();
auto param =
reinterpret_cast<mindspore::lite::DetectionPostProcess *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
detection_post_process_parameter->h_scale_ = param->GetHScale();
detection_post_process_parameter->w_scale_ = param->GetWScale();
detection_post_process_parameter->x_scale_ = param->GetXScale();
detection_post_process_parameter->y_scale_ = param->GetYScale();
detection_post_process_parameter->nms_iou_threshold_ = param->GetNmsIouThreshold();
detection_post_process_parameter->nms_score_threshold_ = param->GetNmsScoreThreshold();
detection_post_process_parameter->max_detections_ = param->GetMaxDetections();
detection_post_process_parameter->detections_per_class_ = param->GetDetectionsPerClass();
detection_post_process_parameter->max_classes_per_detection_ = param->GetMaxClassesPerDetection();
detection_post_process_parameter->num_classes_ = param->GetNumClasses();
detection_post_process_parameter->use_regular_nms_ = param->GetUseRegularNms();
return reinterpret_cast<OpParameter *>(detection_post_process_parameter);
}
Registry DetectionPostProcessParameterRegistry(schema::PrimitiveType_DetectionPostProcess,
PopulateDetectionPostProcessParameter);

namespace {
constexpr int kDetectionPostProcessOutputNum = 4;
constexpr int kDetectionPostProcessInputNum = 3;


+ 2
- 21
mindspore/lite/src/ops/div.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/div.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -46,27 +48,6 @@ int Div::GetActivationType() const { return this->primitive_->value_as_Div()->ac
PrimitiveC *DivCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Div>(primitive); }
Registry DivRegistry(schema::PrimitiveType_Div, DivCreator);
#endif
OpParameter *PopulateDivParameter(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticParameter *arithmetic_param = reinterpret_cast<ArithmeticParameter *>(malloc(sizeof(ArithmeticParameter)));
if (arithmetic_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticParameter failed.";
return nullptr;
}
memset(arithmetic_param, 0, sizeof(ArithmeticParameter));
arithmetic_param->op_parameter_.type_ = primitive->Type();
arithmetic_param->broadcasting_ = ((lite::Arithmetic *)primitive)->Broadcasting();
arithmetic_param->ndim_ = ((lite::Arithmetic *)primitive)->NDims();
arithmetic_param->activation_type_ =
reinterpret_cast<mindspore::lite::Div *>(const_cast<mindspore::lite::PrimitiveC *>(primitive))->GetActivationType();
auto tmp_shape = ((lite::Arithmetic *)primitive)->InShape0();
memcpy(arithmetic_param->in_shape0_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->InShape1();
memcpy(arithmetic_param->in_shape1_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->OutputShape();
memcpy(arithmetic_param->out_shape_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
return reinterpret_cast<OpParameter *>(arithmetic_param);
}
Registry DivParameterRegistry(schema::PrimitiveType_Div, PopulateDivParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 0
mindspore/lite/src/ops/dropout.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/dropout.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 27
mindspore/lite/src/ops/eltwise.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/eltwise.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/arithmetic_common.h"
#endif

namespace mindspore {
namespace lite {
@@ -46,31 +47,5 @@ PrimitiveC *EltwiseCreator(const schema::Primitive *primitive) { return Primitiv
Registry EltwiseRegistry(schema::PrimitiveType_Eltwise, EltwiseCreator);
#endif

OpParameter *PopulateEltwiseParameter(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticParameter *arithmetic_param = reinterpret_cast<ArithmeticParameter *>(malloc(sizeof(ArithmeticParameter)));
if (arithmetic_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticParameter failed.";
return nullptr;
}
memset(arithmetic_param, 0, sizeof(ArithmeticParameter));
auto eltwise = reinterpret_cast<mindspore::lite::Eltwise *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
switch (eltwise->GetMode()) {
case schema::EltwiseMode_PROD:
arithmetic_param->op_parameter_.type_ = schema::PrimitiveType_Mul;
break;
case schema::EltwiseMode_SUM:
arithmetic_param->op_parameter_.type_ = schema::PrimitiveType_Add;
break;
case schema::EltwiseMode_MAXIMUM:
arithmetic_param->op_parameter_.type_ = schema::PrimitiveType_Maximum;
break;
default:
free(arithmetic_param);
return nullptr;
}
return reinterpret_cast<OpParameter *>(arithmetic_param);
}
Registry EltwiseParameterRegistry(schema::PrimitiveType_Eltwise, PopulateEltwiseParameter);

} // namespace lite
} // namespace mindspore

+ 3
- 14
mindspore/lite/src/ops/elu.cc View File

@@ -16,8 +16,10 @@

#include "src/ops/elu.h"
#include <memory>
#include "nnacl/fp32/elu.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -67,18 +69,5 @@ PrimitiveC *EluCreator(const schema::Primitive *primitive) { return PrimitiveC::
Registry EluRegistry(schema::PrimitiveType_Elu, EluCreator);
#endif

OpParameter *PopulateEluParameter(const mindspore::lite::PrimitiveC *primitive) {
EluParameter *elu_parameter = reinterpret_cast<EluParameter *>(malloc(sizeof(EluParameter)));
if (elu_parameter == nullptr) {
MS_LOG(ERROR) << "malloc EluParameter failed.";
return nullptr;
}
memset(elu_parameter, 0, sizeof(EluParameter));
elu_parameter->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::Elu *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
elu_parameter->alpha_ = param->GetAlpha();
return reinterpret_cast<OpParameter *>(elu_parameter);
}
Registry EluParameterRegistry(schema::PrimitiveType_Elu, PopulateEluParameter);
} // namespace lite
} // namespace mindspore

+ 2
- 24
mindspore/lite/src/ops/embedding_lookup.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/embedding_lookup.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/embedding_lookup.h"
#endif

namespace mindspore {
namespace lite {
@@ -50,29 +51,6 @@ PrimitiveC *EmbeddingLookupCreator(const schema::Primitive *primitive) {
Registry EmbeddingLookupRegistry(schema::PrimitiveType_EmbeddingLookup, EmbeddingLookupCreator);
#endif

OpParameter *PopulateEmbeddingLookupParameter(const mindspore::lite::PrimitiveC *primitive) {
EmbeddingLookupParameter *embedding_lookup_parameter =
reinterpret_cast<EmbeddingLookupParameter *>(malloc(sizeof(EmbeddingLookupParameter)));
if (embedding_lookup_parameter == nullptr) {
MS_LOG(ERROR) << "malloc EmbeddingLookupParameter failed.";
return nullptr;
}
memset(embedding_lookup_parameter, 0, sizeof(EmbeddingLookupParameter));
embedding_lookup_parameter->op_parameter_.type_ = primitive->Type();
auto param =
reinterpret_cast<mindspore::lite::EmbeddingLookup *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
embedding_lookup_parameter->max_norm_ = param->GetMaxNorm();
if (embedding_lookup_parameter->max_norm_ < 0) {
MS_LOG(ERROR) << "Embedding lookup max norm should be positive number, got "
<< embedding_lookup_parameter->max_norm_;
free(embedding_lookup_parameter);
return nullptr;
}
return reinterpret_cast<OpParameter *>(embedding_lookup_parameter);
}

Registry EmbeddingLookupParameterRegistry(schema::PrimitiveType_EmbeddingLookup, PopulateEmbeddingLookupParameter);

int EmbeddingLookup::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
if (inputs_.size() < kDoubleNum) {


+ 2
- 0
mindspore/lite/src/ops/embedding_lookup_sparse.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/embedding_lookup_sparse.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 3
- 1
mindspore/lite/src/ops/equal.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/equal.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -43,6 +45,6 @@ int Equal::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outpu
output->SetFormat(input->GetFormat());
return RET_OK;
}
Registry EqualParameterRegistry(schema::PrimitiveType_Equal, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 1
mindspore/lite/src/ops/exp.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/exp.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif
#include "src/ops/arithmetic_self.h"

namespace mindspore {
@@ -77,7 +79,6 @@ float Exp::GetShift() const { return this->primitive_->value_as_Exp()->shift();
PrimitiveC *ExpCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Exp>(primitive); }
Registry ExpRegistry(schema::PrimitiveType_Exp, ExpCreator);
#endif
Registry ExpParameterRegistry(schema::PrimitiveType_Exp, PopulateArithmeticSelf);

} // namespace lite
} // namespace mindspore

+ 2
- 16
mindspore/lite/src/ops/expand_dims.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/expand_dims.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/expandDims.h"
#endif

namespace mindspore {
namespace lite {
@@ -49,21 +50,6 @@ PrimitiveC *ExpandDimsCreator(const schema::Primitive *primitive) {
Registry ExpandDimsRegistry(schema::PrimitiveType_ExpandDims, ExpandDimsCreator);
#endif

OpParameter *PopulateExpandDimsParameter(const mindspore::lite::PrimitiveC *primitive) {
auto param = reinterpret_cast<mindspore::lite::ExpandDims *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
ExpandDimsParameter *expand_dims_param = reinterpret_cast<ExpandDimsParameter *>(malloc(sizeof(ExpandDimsParameter)));
if (expand_dims_param == nullptr) {
MS_LOG(ERROR) << "malloc ExpandDimsParameter failed.";
return nullptr;
}
memset(expand_dims_param, 0, sizeof(ExpandDimsParameter));
expand_dims_param->op_parameter_.type_ = primitive->Type();
expand_dims_param->dim_ = param->GetDim();
return reinterpret_cast<OpParameter *>(expand_dims_param);
}

Registry ExpandDimsParameterRegistry(schema::PrimitiveType_ExpandDims, PopulateExpandDimsParameter);

int ExpandDims::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 2
- 0
mindspore/lite/src/ops/fake_quant_with_min_max_vars.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/fake_quant_with_min_max_vars.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 21
mindspore/lite/src/ops/fill.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/fill.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/fill.h"
#endif

namespace mindspore {
namespace lite {
@@ -55,26 +56,6 @@ PrimitiveC *FillCreator(const schema::Primitive *primitive) { return PrimitiveC:
Registry FillRegistry(schema::PrimitiveType_Fill, FillCreator);
#endif

OpParameter *PopulateFillParameter(const mindspore::lite::PrimitiveC *primitive) {
const auto param = reinterpret_cast<mindspore::lite::Fill *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
FillParameter *fill_param = reinterpret_cast<FillParameter *>(malloc(sizeof(FillParameter)));
if (fill_param == nullptr) {
MS_LOG(ERROR) << "malloc FillParameter failed.";
return nullptr;
}
memset(fill_param, 0, sizeof(FillParameter));
fill_param->op_parameter_.type_ = primitive->Type();
auto flatDims = param->GetDims();
fill_param->num_dims_ = flatDims.size();
int i = 0;
for (auto iter = flatDims.begin(); iter != flatDims.end(); iter++) {
fill_param->dims_[i++] = *iter;
}
return reinterpret_cast<OpParameter *>(fill_param);
}

Registry FillParameterRegistry(schema::PrimitiveType_Fill, PopulateFillParameter);

int Fill::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 2
- 14
mindspore/lite/src/ops/flatten.cc View File

@@ -17,8 +17,9 @@
#include "src/ops/flatten.h"
#include <memory>

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/flatten.h"
#endif

namespace mindspore {
namespace lite {
@@ -93,18 +94,5 @@ PrimitiveC *FlattenCreator(const schema::Primitive *primitive) { return Primitiv
Registry FlattenRegistry(schema::PrimitiveType_Flatten, FlattenCreator);
#endif

OpParameter *PopulateFlattenParameter(const mindspore::lite::PrimitiveC *primitive) {
FlattenParameter *flatten_param = reinterpret_cast<FlattenParameter *>(malloc(sizeof(FlattenParameter)));
if (flatten_param == nullptr) {
MS_LOG(ERROR) << "malloc FlattenParameter failed.";
return nullptr;
}
memset(flatten_param, 0, sizeof(FlattenParameter));
flatten_param->op_parameter_.type_ = primitive->Type();
return reinterpret_cast<OpParameter *>(flatten_param);
}

Registry FlattenParameterRegistry(schema::PrimitiveType_Flatten, PopulateFlattenParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 0
mindspore/lite/src/ops/flatten_grad.cc View File

@@ -17,7 +17,9 @@
#include "src/ops/flatten_grad.h"
#include <memory>

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 1
mindspore/lite/src/ops/floor.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/floor.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -33,7 +35,6 @@ int Floor::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::
PrimitiveC *FloorCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Floor>(primitive); }
Registry FloorRegistry(schema::PrimitiveType_Floor, FloorCreator);
#endif
Registry FloorParameterRegistry(schema::PrimitiveType_Floor, PopulateArithmeticSelf);

} // namespace lite
} // namespace mindspore

+ 3
- 1
mindspore/lite/src/ops/floor_div.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/floor_div.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -36,6 +38,6 @@ PrimitiveC *FloorDivCreator(const schema::Primitive *primitive) {
}
Registry FloorDivRegistry(schema::PrimitiveType_FloorDiv, FloorDivCreator);
#endif
Registry FloorDivParameterRegistry(schema::PrimitiveType_FloorDiv, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 3
- 1
mindspore/lite/src/ops/floor_mod.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/floor_mod.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -35,6 +37,6 @@ PrimitiveC *FloorModCreator(const schema::Primitive *primitive) {
}
Registry FloorModRegistry(schema::PrimitiveType_FloorMod, FloorModCreator);
#endif
Registry FloorModParameterRegistry(schema::PrimitiveType_FloorMod, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 27
mindspore/lite/src/ops/full_connection.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/full_connection.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/matmul_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -60,32 +61,6 @@ PrimitiveC *FullConnectionCreator(const schema::Primitive *primitive) {
Registry FullConnectionRegistry(schema::PrimitiveType_FullConnection, FullConnectionCreator);
#endif

OpParameter *PopulateFullconnectionParameter(const mindspore::lite::PrimitiveC *primitive) {
auto param =
reinterpret_cast<mindspore::lite::FullConnection *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
MatMulParameter *matmul_param = reinterpret_cast<MatMulParameter *>(malloc(sizeof(MatMulParameter)));
if (matmul_param == nullptr) {
MS_LOG(ERROR) << "malloc MatMulParameter failed.";
return nullptr;
}
memset(matmul_param, 0, sizeof(MatMulParameter));
matmul_param->op_parameter_.type_ = primitive->Type();
matmul_param->b_transpose_ = true;
matmul_param->a_transpose_ = false;
matmul_param->has_bias_ = param->GetHasBias();
if (param->GetActivationType() == schema::ActivationType_RELU) {
matmul_param->act_type_ = ActType_Relu;
} else if (param->GetActivationType() == schema::ActivationType_RELU6) {
matmul_param->act_type_ = ActType_Relu6;
} else {
matmul_param->act_type_ = ActType_No;
}

return reinterpret_cast<OpParameter *>(matmul_param);
}

Registry FullConnectionParameterRegistry(schema::PrimitiveType_FullConnection, PopulateFullconnectionParameter);

int FullConnection::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input0 = inputs_.front();


+ 2
- 18
mindspore/lite/src/ops/fused_batchnorm.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/fused_batchnorm.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/batchnorm_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -80,23 +81,6 @@ PrimitiveC *FusedBatchNormCreator(const schema::Primitive *primitive) {
}
Registry FusedBatchNormRegistry(schema::PrimitiveType_FusedBatchNorm, FusedBatchNormCreator);
#endif
OpParameter *PopulateFusedBatchNorm(const mindspore::lite::PrimitiveC *primitive) {
BatchNormParameter *batch_norm_param = reinterpret_cast<BatchNormParameter *>(malloc(sizeof(BatchNormParameter)));
if (batch_norm_param == nullptr) {
MS_LOG(ERROR) << "malloc BatchNormParameter failed.";
return nullptr;
}
memset(batch_norm_param, 0, sizeof(BatchNormParameter));
batch_norm_param->op_parameter_.type_ = primitive->Type();
auto param =
reinterpret_cast<mindspore::lite::FusedBatchNorm *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
batch_norm_param->epsilon_ = param->GetEpsilon();
batch_norm_param->momentum_ = param->GetMomentum();
batch_norm_param->fused_ = true;
return reinterpret_cast<OpParameter *>(batch_norm_param);
}

Registry FusedBatchNormParameterRegistry(schema::PrimitiveType_FusedBatchNorm, PopulateFusedBatchNorm);

int FusedBatchNorm::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
for (size_t i = 0; i < inputs_.size(); i++) {


+ 2
- 16
mindspore/lite/src/ops/gather.cc View File

@@ -19,8 +19,9 @@
#include "src/common/log_adapter.h"
#include "src/tensor.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/gather_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -53,21 +54,6 @@ PrimitiveC *GatherCreator(const schema::Primitive *primitive) { return Primitive
Registry GatherRegistry(schema::PrimitiveType_Gather, GatherCreator);
#endif

OpParameter *PopulateGatherParameter(const mindspore::lite::PrimitiveC *primitive) {
auto gather_attr = reinterpret_cast<mindspore::lite::Gather *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
GatherParameter *gather_param = reinterpret_cast<GatherParameter *>(malloc(sizeof(GatherParameter)));
if (gather_param == nullptr) {
MS_LOG(ERROR) << "malloc GatherParameter failed.";
return nullptr;
}
memset(gather_param, 0, sizeof(GatherParameter));
gather_param->op_parameter_.type_ = primitive->Type();
gather_param->axis_ = gather_attr->GetAxis();
gather_param->batchDims_ = gather_attr->GetBatchDims();
return reinterpret_cast<OpParameter *>(gather_param);
}
Registry GatherParameterRegistry(schema::PrimitiveType_Gather, PopulateGatherParameter);

int Gather::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
if (inputs_.size() != kDoubleNum) {


+ 2
- 17
mindspore/lite/src/ops/gather_nd.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/gather_nd.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/gatherNd.h"
#endif

namespace mindspore {
namespace lite {
@@ -49,22 +50,6 @@ PrimitiveC *GatherNdCreator(const schema::Primitive *primitive) {
Registry GatherNdRegistry(schema::PrimitiveType_GatherNd, GatherNdCreator);
#endif

OpParameter *PopulateGatherNdParameter(const mindspore::lite::PrimitiveC *primitive) {
GatherNdParameter *gather_nd_param = reinterpret_cast<GatherNdParameter *>(malloc(sizeof(GatherNdParameter)));
if (gather_nd_param == nullptr) {
MS_LOG(ERROR) << "malloc GatherNdParameter failed.";
return nullptr;
}
memset(gather_nd_param, 0, sizeof(GatherNdParameter));
gather_nd_param->op_parameter_.type_ = primitive->Type();
auto gatherNd_attr =
reinterpret_cast<mindspore::lite::GatherNd *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
gather_nd_param->batchDims_ = gatherNd_attr->GetBatchDims();
return reinterpret_cast<OpParameter *>(gather_nd_param);
}

Registry GatherNdParameterRegistry(schema::PrimitiveType_GatherNd, PopulateGatherNdParameter);

int GatherNd::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
if (inputs_.size() != kDoubleNum) {


+ 3
- 1
mindspore/lite/src/ops/greater.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/greater.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -44,6 +46,6 @@ int Greater::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> out
output->SetFormat(input->GetFormat());
return RET_OK;
}
Registry GreaterParameterRegistry(schema::PrimitiveType_Greater, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 3
- 1
mindspore/lite/src/ops/greater_equal.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/greater_equal.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -46,6 +48,6 @@ int GreaterEqual::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *
output->SetFormat(input->GetFormat());
return RET_OK;
}
Registry GreaterEqualParameterRegistry(schema::PrimitiveType_GreaterEqual, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 0
mindspore/lite/src/ops/group_conv2d_grad_input.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/group_conv2d_grad_input.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 12
mindspore/lite/src/ops/hashtable_lookup.cc View File

@@ -17,7 +17,9 @@

#include "src/common/string_util.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -38,18 +40,6 @@ PrimitiveC *HashtableLookupCreator(const schema::Primitive *primitive) {
Registry HashtableLookupRegistry(schema::PrimitiveType_HashtableLookup, HashtableLookupCreator);
#endif

OpParameter *PopulateHashtableLookupParameter(const mindspore::lite::PrimitiveC *primitive) {
OpParameter *param = reinterpret_cast<OpParameter *>(malloc(sizeof(OpParameter)));
if (param == nullptr) {
MS_LOG(ERROR) << "new OpParameter failed.";
return nullptr;
}
memset(param, 0, sizeof(OpParameter));
param->type_ = primitive->Type();
return param;
}
Registry HashtableLookupParameterRegistry(schema::PrimitiveType_HashtableLookup, PopulateHashtableLookupParameter);

int HashtableLookup::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
auto input = inputs_.at(0);
auto values = inputs_.at(2);


+ 2
- 36
mindspore/lite/src/ops/l2_norm.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/l2_norm.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/l2_norm_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -63,41 +64,6 @@ int L2Norm::GetActivationType() const { return this->primitive_->value_as_L2Norm
PrimitiveC *L2NormCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<L2Norm>(primitive); }
Registry L2NormRegistry(schema::PrimitiveType_L2Norm, L2NormCreator);
#endif
OpParameter *PopulateL2NormParameter(const mindspore::lite::PrimitiveC *primitive) {
L2NormParameter *l2_norm_parameter = reinterpret_cast<L2NormParameter *>(malloc(sizeof(L2NormParameter)));
if (l2_norm_parameter == nullptr) {
MS_LOG(ERROR) << "malloc L2NormParameter failed.";
return nullptr;
}
memset(l2_norm_parameter, 0, sizeof(L2NormParameter));
l2_norm_parameter->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::L2Norm *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
auto axis_vec = param->GetAxis();
l2_norm_parameter->axis_num_ = axis_vec.size();
l2_norm_parameter->axis_ = reinterpret_cast<int *>(malloc(axis_vec.size() * sizeof(int)));
if (l2_norm_parameter->axis_ == nullptr) {
MS_LOG(ERROR) << "malloc axis_ data failed";
free(l2_norm_parameter);
return nullptr;
}
for (size_t i = 0; i < axis_vec.size(); i++) {
l2_norm_parameter->axis_[i] = axis_vec[i];
}
if (param->GetEpsilon() < 1e-6) {
l2_norm_parameter->epsilon_ = 1e-6;
} else {
l2_norm_parameter->epsilon_ = param->GetEpsilon();
}
if (param->GetActivationType() == static_cast<int>(schema::ActivationType_RELU)) {
l2_norm_parameter->act_type_ = ActType_Relu;
} else if (param->GetActivationType() == static_cast<int>(schema::ActivationType_RELU6)) {
l2_norm_parameter->act_type_ = ActType_Relu6;
} else {
l2_norm_parameter->act_type_ = ActType_No;
}
return reinterpret_cast<OpParameter *>(l2_norm_parameter);
}
Registry L2NormParameterRegistry(schema::PrimitiveType_L2Norm, PopulateL2NormParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 0
mindspore/lite/src/ops/leaky_relu.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/leaky_relu.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 3
- 1
mindspore/lite/src/ops/less.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/less.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -46,6 +48,6 @@ int Less::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> output
output->SetFormat(input->GetFormat());
return RET_OK;
}
Registry LessParameterRegistry(schema::PrimitiveType_Less, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 3
- 1
mindspore/lite/src/ops/less_equal.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/less_equal.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -45,6 +47,6 @@ int LessEqual::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> o
output->SetFormat(input->GetFormat());
return RET_OK;
}
Registry LessEqualParameterRegistry(schema::PrimitiveType_LessEqual, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 23
mindspore/lite/src/ops/local_response_normalization.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/local_response_normalization.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/local_response_norm.h"
#endif

namespace mindspore {
namespace lite {
@@ -86,27 +87,5 @@ Registry LocalResponseNormalizationRegistry(schema::PrimitiveType_LocalResponseN
LocalResponseNormalizationCreator);

#endif

OpParameter *PopulateLocalResponseNormParameter(const mindspore::lite::PrimitiveC *primitive) {
auto local_response_norm_attr = reinterpret_cast<mindspore::lite::LocalResponseNormalization *>(
const_cast<mindspore::lite::PrimitiveC *>(primitive));
LocalResponseNormParameter *lrn_param =
reinterpret_cast<LocalResponseNormParameter *>(malloc(sizeof(LocalResponseNormParameter)));
if (lrn_param == nullptr) {
MS_LOG(ERROR) << "malloc LocalResponseNormParameter failed.";
return nullptr;
}
memset(lrn_param, 0, sizeof(LocalResponseNormParameter));
lrn_param->op_parameter_.type_ = primitive->Type();
lrn_param->depth_radius_ = local_response_norm_attr->GetDepthRadius();
lrn_param->bias_ = local_response_norm_attr->GetBias();
lrn_param->alpha_ = local_response_norm_attr->GetAlpha();
lrn_param->beta_ = local_response_norm_attr->GetBeta();
return reinterpret_cast<OpParameter *>(lrn_param);
}

Registry LocalResponseNormalizationParameterRegistry(schema::PrimitiveType_LocalResponseNormalization,
PopulateLocalResponseNormParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 1
mindspore/lite/src/ops/log.cc View File

@@ -17,7 +17,9 @@
#include "src/ops/log.h"
#include <memory>

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -56,7 +58,6 @@ PrimitiveC *LogCreator(const schema::Primitive *primitive) { return PrimitiveC::
Registry LogRegistry(schema::PrimitiveType_Log, LogCreator);

#endif
Registry LogParameterRegistry(schema::PrimitiveType_Log, PopulateArithmeticSelf);

} // namespace lite
} // namespace mindspore

+ 2
- 1
mindspore/lite/src/ops/log_grad.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/log_grad.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif
#include "src/ops/arithmetic_self.h"

namespace mindspore {
@@ -39,7 +41,6 @@ int LogGrad::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers
PrimitiveC *LogGradCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<LogGrad>(primitive); }
Registry LogGradRegistry(schema::PrimitiveType_LogGrad, LogGradCreator);
#endif
Registry LogGradParameterRegistry(schema::PrimitiveType_LogGrad, PopulateArithmeticSelf);

} // namespace lite
} // namespace mindspore

+ 2
- 1
mindspore/lite/src/ops/logical_and.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/logical_and.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -37,6 +39,5 @@ PrimitiveC *LogicalAndCreator(const schema::Primitive *primitive) {
Registry LogicalAndRegistry(schema::PrimitiveType_LogicalAnd, LogicalAndCreator);
#endif

Registry LogicalAndParameterRegistry(schema::PrimitiveType_LogicalAnd, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 1
mindspore/lite/src/ops/logical_not.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/logical_not.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -35,7 +37,6 @@ PrimitiveC *LogicalNotCreator(const schema::Primitive *primitive) {
}
Registry LogicalNotRegistry(schema::PrimitiveType_LogicalNot, LogicalNotCreator);
#endif
Registry LogicalNotParameterRegistry(schema::PrimitiveType_LogicalNot, PopulateArithmeticSelf);

} // namespace lite
} // namespace mindspore

+ 3
- 1
mindspore/lite/src/ops/logical_or.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/logical_or.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -36,6 +38,6 @@ PrimitiveC *LogicalOrCreator(const schema::Primitive *primitive) {
}
Registry LogicalOrRegistry(schema::PrimitiveType_LogicalOr, LogicalOrCreator);
#endif
Registry LogicalOrParameterRegistry(schema::PrimitiveType_LogicalOr, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 0
mindspore/lite/src/ops/lrn.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/lrn.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 17
mindspore/lite/src/ops/lsh_projection.cc View File

@@ -15,9 +15,9 @@
*/
#include "src/ops/lsh_projection.h"

#include "nnacl/lsh_projection_parameter.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -48,21 +48,6 @@ Registry LshProjectionRegistry(schema::PrimitiveType_LshProjection, LshProjectio

#endif

OpParameter *PopulateLshProjectionParameter(const mindspore::lite::PrimitiveC *primitive) {
LshProjectionParameter *lsh_project_param =
reinterpret_cast<LshProjectionParameter *>(malloc(sizeof(LshProjectionParameter)));
if (lsh_project_param == nullptr) {
MS_LOG(ERROR) << "malloc LshProjectionParameter failed.";
return nullptr;
}
memset(lsh_project_param, 0, sizeof(LshProjectionParameter));
lsh_project_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::LshProjection *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
lsh_project_param->lsh_type_ = param->GetLshType();
return reinterpret_cast<OpParameter *>(lsh_project_param);
}
Registry LshProjectionParameterRegistry(schema::PrimitiveType_LshProjection, PopulateLshProjectionParameter);

int LshProjection::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
if (inputs_.size() != kDoubleNum && inputs_.size() != kMultiNum) {
MS_LOG(ERROR) << "inputs to LshProjection operator should be 2 or 3, but " << inputs_.size() << " is given.";


+ 2
- 20
mindspore/lite/src/ops/lstm.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/lstm.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/lstm.h"
#endif

namespace mindspore {
namespace lite {
@@ -48,25 +49,6 @@ Registry LstmRegistry(schema::PrimitiveType_Lstm, LstmCreator);

#endif

OpParameter *PopulateLstmParameter(const mindspore::lite::PrimitiveC *primitive) {
LstmParameter *lstm_param = reinterpret_cast<LstmParameter *>(malloc(sizeof(LstmParameter)));
if (lstm_param == nullptr) {
MS_LOG(ERROR) << "malloc LstmParameter failed.";
return nullptr;
}
memset(lstm_param, 0, sizeof(LstmParameter));
lstm_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::Lstm *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
if (param == nullptr) {
free(lstm_param);
MS_LOG(ERROR) << "get Lstm param nullptr.";
return nullptr;
}
lstm_param->bidirectional_ = param->GetBidirection();
return reinterpret_cast<OpParameter *>(lstm_param);
}
Registry LstmParameterRegistry(schema::PrimitiveType_Lstm, PopulateLstmParameter);

const int kLstmInputNum = 6;
const int kLstmOutputNum = 3;
int Lstm::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {


+ 2
- 0
mindspore/lite/src/ops/make_tuple.cc View File

@@ -18,7 +18,9 @@
#include <vector>
#include <memory>

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 18
mindspore/lite/src/ops/matmul.cc View File

@@ -21,8 +21,9 @@
#include "tools/converter/quantizer/quantize_util.h"
#endif

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/matmul_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -93,23 +94,6 @@ PrimitiveC *MatMulCreator(const schema::Primitive *primitive) { return Primitive
Registry MatMulRegistry(schema::PrimitiveType_MatMul, MatMulCreator);
#endif

OpParameter *PopulateMatMulParameter(const mindspore::lite::PrimitiveC *primitive) {
auto param = reinterpret_cast<mindspore::lite::MatMul *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
MatMulParameter *matmul_param = reinterpret_cast<MatMulParameter *>(malloc(sizeof(MatMulParameter)));
if (matmul_param == nullptr) {
MS_LOG(ERROR) << "malloc MatMulParameter failed.";
return nullptr;
}
memset(matmul_param, 0, sizeof(MatMulParameter));
matmul_param->op_parameter_.type_ = primitive->Type();
matmul_param->b_transpose_ = param->GetTransposeB();
matmul_param->a_transpose_ = param->GetTransposeA();
matmul_param->has_bias_ = false;
matmul_param->act_type_ = ActType_No;
return reinterpret_cast<OpParameter *>(matmul_param);
}
Registry MatMulParameterRegistry(schema::PrimitiveType_MatMul, PopulateMatMulParameter);

int MatMul::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input0 = inputs_.front();


+ 2
- 0
mindspore/lite/src/ops/matrix_diag.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/matrix_diag.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 3
- 1
mindspore/lite/src/ops/maximum.cc View File

@@ -23,7 +23,9 @@
#include "tools/converter/quantizer/quantize_util.h"
#endif

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -68,6 +70,6 @@ int Maximum::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers
PrimitiveC *MaximumCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Maximum>(primitive); }
Registry MaximumRegistry(schema::PrimitiveType_Maximum, MaximumCreator);
#endif
Registry MaximumParameterRegistry(schema::PrimitiveType_Maximum, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 27
mindspore/lite/src/ops/mean.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/mean.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/reduce_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -60,32 +61,6 @@ PrimitiveC *MeanCreator(const schema::Primitive *primitive) { return PrimitiveC:
Registry MeanRegistry(schema::PrimitiveType_Mean, MeanCreator);
#endif

OpParameter *PopulateMeanParameter(const mindspore::lite::PrimitiveC *primitive) {
ReduceParameter *mean_param = reinterpret_cast<ReduceParameter *>(malloc(sizeof(ReduceParameter)));
if (mean_param == nullptr) {
MS_LOG(ERROR) << "malloc ReduceParameter failed.";
return nullptr;
}
memset(mean_param, 0, sizeof(ReduceParameter));
mean_param->op_parameter_.type_ = primitive->Type();
auto mean = reinterpret_cast<mindspore::lite::Mean *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
mean_param->keep_dims_ = mean->GetKeepDims();
auto axisVector = mean->GetAxis();
if (axisVector.size() > REDUCE_MAX_AXES_NUM) {
MS_LOG(ERROR) << "Reduce axes size " << axisVector.size() << " exceed limit " << REDUCE_MAX_AXES_NUM;
free(mean_param);
return nullptr;
}
mean_param->num_axes_ = static_cast<int>(axisVector.size());
int i = 0;
for (auto iter = axisVector.begin(); iter != axisVector.end(); iter++) {
mean_param->axes_[i++] = *iter;
}
mean_param->mode_ = static_cast<int>(schema::ReduceMode_ReduceMean);
return reinterpret_cast<OpParameter *>(mean_param);
}
Registry MeanParameterRegistry(schema::PrimitiveType_Mean, PopulateMeanParameter);

namespace {
constexpr size_t kInputSize = 1;
constexpr size_t kOutputSize = 1;


+ 2
- 1
mindspore/lite/src/ops/minimum.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/minimum.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -34,6 +36,5 @@ PrimitiveC *MinimumCreator(const schema::Primitive *primitive) { return Primitiv
Registry MinimumRegistry(schema::PrimitiveType_Minimum, MinimumCreator);
#endif

Registry MinimumParameterRegistry(schema::PrimitiveType_Minimum, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 3
- 22
mindspore/lite/src/ops/mul.cc View File

@@ -16,8 +16,10 @@

#include "src/ops/mul.h"
#include <memory>
#include "nnacl/arithmetic_common.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -77,27 +79,6 @@ int Mul::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::Fl
PrimitiveC *MulCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Mul>(primitive); }
Registry MulRegistry(schema::PrimitiveType_Mul, MulCreator);
#endif
OpParameter *PopulateMulParameter(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticParameter *arithmetic_param = reinterpret_cast<ArithmeticParameter *>(malloc(sizeof(ArithmeticParameter)));
if (arithmetic_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticParameter failed.";
return nullptr;
}
memset(arithmetic_param, 0, sizeof(ArithmeticParameter));
arithmetic_param->op_parameter_.type_ = primitive->Type();
arithmetic_param->broadcasting_ = ((lite::Arithmetic *)primitive)->Broadcasting();
arithmetic_param->ndim_ = ((lite::Arithmetic *)primitive)->NDims();
arithmetic_param->activation_type_ =
reinterpret_cast<mindspore::lite::Mul *>(const_cast<mindspore::lite::PrimitiveC *>(primitive))->GetActivationType();
auto tmp_shape = ((lite::Arithmetic *)primitive)->InShape0();
memcpy(arithmetic_param->in_shape0_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->InShape1();
memcpy(arithmetic_param->in_shape1_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->OutputShape();
memcpy(arithmetic_param->out_shape_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
return reinterpret_cast<OpParameter *>(arithmetic_param);
}
Registry MulParameterRegistry(schema::PrimitiveType_Mul, PopulateMulParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 18
mindspore/lite/src/ops/nchw2nhwc.cc View File

@@ -17,8 +17,9 @@
#include "src/ops/nchw2nhwc.h"
#include "src/common/common.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/transpose.h"
#endif

namespace mindspore {
namespace lite {
@@ -38,23 +39,6 @@ PrimitiveC *Nchw2NhwcCreator(const schema::Primitive *primitive) {
Registry Nchw2NhwcRegistry(schema::PrimitiveType_Nchw2Nhwc, Nchw2NhwcCreator);
#endif

OpParameter *PopulateNchw2NhwcParameter(const mindspore::lite::PrimitiveC *primitive) {
TransposeParameter *parameter = reinterpret_cast<TransposeParameter *>(malloc(sizeof(TransposeParameter)));
if (parameter == nullptr) {
MS_LOG(ERROR) << "malloc OpParameter failed.";
return nullptr;
}
memset(parameter, 0, sizeof(OpParameter));
parameter->op_parameter_.type_ = primitive->Type();
parameter->num_axes_ = 4;
parameter->perm_[0] = 0;
parameter->perm_[1] = 2;
parameter->perm_[2] = 3;
parameter->perm_[3] = 1;
return reinterpret_cast<OpParameter *>(parameter);
}
Registry Nchw2NhwcParameterRegistry(schema::PrimitiveType_Nchw2Nhwc, PopulateNchw2NhwcParameter);

int Nchw2Nhwc::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 3
- 1
mindspore/lite/src/ops/neg.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/neg.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -57,6 +59,6 @@ int Neg::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::Fl
PrimitiveC *NegCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Neg>(primitive); }
Registry NegRegistry(schema::PrimitiveType_Neg, NegCreator);
#endif
Registry NegParameterRegistry(schema::PrimitiveType_Neg, PopulateArithmeticSelf);
} // namespace lite
} // namespace mindspore

+ 2
- 1
mindspore/lite/src/ops/neg_grad.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/neg_grad.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -34,7 +36,6 @@ PrimitiveC *NegGradCreator(const schema::Primitive *primitive) { return Primitiv
Registry NegGradRegistry(schema::PrimitiveType_NegGrad, NegGradCreator);

#endif
Registry NegGradParameterRegistry(schema::PrimitiveType_NegGrad, PopulateArithmeticSelf);

} // namespace lite
} // namespace mindspore

+ 2
- 19
mindspore/lite/src/ops/nhwc2nchw.cc View File

@@ -17,8 +17,9 @@
#include "src/ops/nhwc2nchw.h"
#include "src/common/common.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/transpose.h"
#endif

namespace mindspore {
namespace lite {
@@ -39,24 +40,6 @@ PrimitiveC *Nhwc2NchwCreator(const schema::Primitive *primitive) {
Registry Nhwc2NchwRegistry(schema::PrimitiveType_Nhwc2Nchw, Nhwc2NchwCreator);
#endif

OpParameter *PopulateNhwc2NchwParameter(const mindspore::lite::PrimitiveC *primitive) {
TransposeParameter *parameter = reinterpret_cast<TransposeParameter *>(malloc(sizeof(TransposeParameter)));
if (parameter == nullptr) {
MS_LOG(ERROR) << "malloc OpParameter failed.";
return nullptr;
}
memset(parameter, 0, sizeof(OpParameter));
parameter->op_parameter_.type_ = primitive->Type();
parameter->num_axes_ = 4;
parameter->perm_[0] = 0;
parameter->perm_[1] = 3;
parameter->perm_[2] = 1;
parameter->perm_[3] = 2;
return reinterpret_cast<OpParameter *>(parameter);
}

Registry Nhwc2NchwParameterRegistry(schema::PrimitiveType_Nhwc2Nchw, PopulateNhwc2NchwParameter);

int Nhwc2Nchw::InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) {
MS_ASSERT(this->primitive_ != nullptr);
auto input = inputs_.front();


+ 3
- 1
mindspore/lite/src/ops/not_equal.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/not_equal.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {
@@ -46,6 +48,6 @@ int NotEqual::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> ou
output->SetFormat(input->GetFormat());
return RET_OK;
}
Registry NotEqualParameterRegistry(schema::PrimitiveType_NotEqual, PopulateArithmetic);
} // namespace lite
} // namespace mindspore

+ 2
- 20
mindspore/lite/src/ops/one_hot.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/one_hot.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/fp32/one_hot.h"
#endif

namespace mindspore {
namespace lite {
@@ -79,25 +80,6 @@ PrimitiveC *OneHotCreator(const schema::Primitive *primitive) { return Primitive
Registry OneHotRegistry(schema::PrimitiveType_OneHot, OneHotCreator);
#endif

OpParameter *PopulateOneHotParameter(const mindspore::lite::PrimitiveC *primitive) {
OneHotParameter *one_hot_param = reinterpret_cast<OneHotParameter *>(malloc(sizeof(OneHotParameter)));
if (one_hot_param == nullptr) {
MS_LOG(ERROR) << "malloc OneHotParameter failed.";
return nullptr;
}
memset(one_hot_param, 0, sizeof(OneHotParameter));
one_hot_param->op_parameter_.type_ = primitive->Type();
auto param = reinterpret_cast<mindspore::lite::OneHot *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
if (param == nullptr) {
free(one_hot_param);
MS_LOG(ERROR) << "get OneHot param nullptr.";
return nullptr;
}
one_hot_param->axis_ = param->GetAxis();
return reinterpret_cast<OpParameter *>(one_hot_param);
}
Registry OneHotParameterRegistry(schema::PrimitiveType_OneHot, PopulateOneHotParameter);

namespace {
constexpr size_t kOneHotInputNum = 4;
}


+ 0
- 15
mindspore/lite/src/ops/ops_register.h View File

@@ -40,20 +40,8 @@ class OpsRegistry {
}
}

void insertParameterMap(schema::PrimitiveType type, ParameterCreator creator) { parameter_creators[type] = creator; }

ParameterCreator getParameterCreator(schema::PrimitiveType type) {
if (parameter_creators.find(type) != parameter_creators.end()) {
return parameter_creators[type];
} else {
MS_LOG(ERROR) << "Unsupported parameter type in Create : " << schema::EnumNamePrimitiveType(type);
return nullptr;
}
}

protected:
std::map<schema::PrimitiveType, PrimitiveCCreator> primitive_creators;
std::map<schema::PrimitiveType, ParameterCreator> parameter_creators;
};

class Registry {
@@ -61,9 +49,6 @@ class Registry {
Registry(schema::PrimitiveType primitive_type, PrimitiveCCreator creator) {
OpsRegistry::GetInstance()->insertPrimitiveCMap(primitive_type, creator);
}
Registry(schema::PrimitiveType primitive_type, ParameterCreator creator) {
OpsRegistry::GetInstance()->insertParameterMap(primitive_type, creator);
}
};

} // namespace lite


+ 2
- 15
mindspore/lite/src/ops/p_relu.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/p_relu.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/prelu_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -54,19 +55,5 @@ Registry PReLURegistry(schema::PrimitiveType_PReLU, PReLUCreator);

#endif

OpParameter *PopulatePReLUParameter(const mindspore::lite::PrimitiveC *primitive) {
auto param = reinterpret_cast<mindspore::lite::PReLU *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
PReluParameter *prelu_param = reinterpret_cast<PReluParameter *>(malloc(sizeof(PReluParameter)));
if (prelu_param == nullptr) {
MS_LOG(ERROR) << "malloc PReluParameter failed.";
return nullptr;
}
memset(prelu_param, 0, sizeof(PReluParameter));
prelu_param->op_parameter_.type_ = primitive->Type();
prelu_param->channelShared = param->GetChannelShared();
return reinterpret_cast<OpParameter *>(prelu_param);
}
Registry PReLUParameterRegistry(schema::PrimitiveType_PReLU, PopulatePReLUParameter);

} // namespace lite
} // namespace mindspore

+ 2
- 32
mindspore/lite/src/ops/pad.cc View File

@@ -16,8 +16,9 @@

#include "src/ops/pad.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/pad_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -64,37 +65,6 @@ int Pad::UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::Fl
PrimitiveC *PadCreator(const schema::Primitive *primitive) { return PrimitiveC::NewPrimitiveC<Pad>(primitive); }
Registry PadRegistry(schema::PrimitiveType_Pad, PadCreator);
#endif
OpParameter *PopulatePadParameter(const mindspore::lite::PrimitiveC *primitive) {
PadParameter *pad_param = reinterpret_cast<PadParameter *>(malloc(sizeof(PadParameter)));
if (pad_param == nullptr) {
MS_LOG(ERROR) << "malloc PadParameter failed.";
return nullptr;
}
memset(pad_param, 0, sizeof(PadParameter));
pad_param->op_parameter_.type_ = primitive->Type();
auto pad_node = reinterpret_cast<mindspore::lite::Pad *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
pad_param->pad_mode_ = pad_node->GetPaddingMode();
if (pad_param->pad_mode_ == static_cast<int>(schema::PaddingMode_CONSTANT)) {
pad_param->constant_value_ = pad_node->GetConstantValue();
auto size = pad_node->GetPaddings().size();
if (size > MAX_PAD_SIZE) {
MS_LOG(ERROR) << "Invalid padding size: " << size;
free(pad_param);
return nullptr;
}

for (size_t i = 0; i < MAX_PAD_SIZE - size; ++i) {
pad_param->paddings_[i] = 0;
}
for (size_t i = 0; i < size; i++) {
pad_param->paddings_[MAX_PAD_SIZE - size + i] = pad_node->GetPaddings()[i];
}
pad_param->padding_length = MAX_PAD_SIZE;
}

return reinterpret_cast<OpParameter *>(pad_param);
}
Registry PadParameterRegistry(schema::PrimitiveType_Pad, PopulatePadParameter);

int Pad::InferShape(std::vector<Tensor *> inputs, std::vector<Tensor *> outputs) {
MS_ASSERT(this->primitive_ != nullptr);


+ 2
- 0
mindspore/lite/src/ops/permute.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/permute.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 2
- 63
mindspore/lite/src/ops/pooling.cc View File

@@ -19,8 +19,9 @@
#include <string>
#include <vector>

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#include "nnacl/pooling_parameter.h"
#endif

namespace mindspore {
namespace lite {
@@ -166,68 +167,6 @@ Registry PoolingRegistry(schema::PrimitiveType_Pooling, PoolingCreator);

#endif

OpParameter *PopulatePoolingParameter(const mindspore::lite::PrimitiveC *primitive) {
auto pooling_primitive =
reinterpret_cast<mindspore::lite::Pooling *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
PoolingParameter *pooling_param = reinterpret_cast<PoolingParameter *>(malloc(sizeof(PoolingParameter)));
if (pooling_param == nullptr) {
MS_LOG(ERROR) << "malloc PoolingParameter failed.";
return nullptr;
}
memset(pooling_param, 0, sizeof(PoolingParameter));
pooling_param->op_parameter_.type_ = primitive->Type();
pooling_param->global_ = pooling_primitive->GetGlobal();
pooling_param->window_w_ = pooling_primitive->GetWindowW();
pooling_param->window_h_ = pooling_primitive->GetWindowH();
auto pooling_lite_primitive = (lite::Pooling *)primitive;
pooling_param->pad_u_ = pooling_lite_primitive->PadUp();
pooling_param->pad_d_ = pooling_lite_primitive->PadDown();
pooling_param->pad_l_ = pooling_lite_primitive->PadLeft();
pooling_param->pad_r_ = pooling_lite_primitive->PadRight();
pooling_param->stride_w_ = pooling_primitive->GetStrideW();
pooling_param->stride_h_ = pooling_primitive->GetStrideH();
pooling_param->avg_mode_ = pooling_primitive->GetAvgMode();

auto is_global = pooling_primitive->GetGlobal();
pooling_param->global_ = is_global;
auto pool_mode = pooling_primitive->GetPoolingMode();
switch (pool_mode) {
case schema::PoolMode_MAX_POOLING:
pooling_param->pool_mode_ = PoolMode_MaxPool;
break;
case schema::PoolMode_MEAN_POOLING:
pooling_param->pool_mode_ = PoolMode_AvgPool;
break;
default:
pooling_param->pool_mode_ = PoolMode_No;
break;
}

auto round_mode = pooling_primitive->GetRoundMode();
switch (round_mode) {
case schema::RoundMode_FLOOR:
pooling_param->round_mode_ = RoundMode_Floor;
break;
case schema::RoundMode_CEIL:
pooling_param->round_mode_ = RoundMode_Ceil;
break;
default:
pooling_param->round_mode_ = RoundMode_No;
break;
}

if (pooling_primitive->GetActivationType() == schema::ActivationType_RELU) {
pooling_param->act_type_ = ActType_Relu;
} else if (pooling_primitive->GetActivationType() == schema::ActivationType_RELU6) {
pooling_param->act_type_ = ActType_Relu6;
} else {
pooling_param->act_type_ = ActType_No;
}
return reinterpret_cast<OpParameter *>(pooling_param);
}

Registry PoolingParameterRegistry(schema::PrimitiveType_Pooling, PopulatePoolingParameter);

int Pooling::PadUp() const { return this->pad_u_; }
int Pooling::PadDown() const { return this->pad_d_; }
int Pooling::PadLeft() const { return this->pad_l_; }


+ 2
- 0
mindspore/lite/src/ops/pooling_grad.cc View File

@@ -16,7 +16,9 @@

#include "src/ops/pooling_grad.h"

#ifndef PRIMITIVE_WRITEABLE
#include "src/ops/ops_register.h"
#endif

namespace mindspore {
namespace lite {


+ 42
- 0
mindspore/lite/src/ops/populate/activation_populate.cc View File

@@ -0,0 +1,42 @@
/**
* Copyright 2019-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/ops/activation.h"
#include "src/ops/primitive_c.h"
#include "src/ops/populate/populate_register.h"
#include "nnacl/fp32/activation.h"

namespace mindspore {
namespace lite {
OpParameter *PopulateActivationParameter(const mindspore::lite::PrimitiveC *primitive) {
ActivationParameter *act_param = reinterpret_cast<ActivationParameter *>(malloc(sizeof(ActivationParameter)));
if (act_param == nullptr) {
MS_LOG(ERROR) << "malloc ActivationParameter failed.";
return nullptr;
}
memset(act_param, 0, sizeof(ActivationParameter));
act_param->op_parameter_.type_ = primitive->Type();
auto activation =
reinterpret_cast<mindspore::lite::Activation *>(const_cast<mindspore::lite::PrimitiveC *>(primitive));
act_param->type_ = static_cast<int>(activation->GetType());
act_param->alpha_ = activation->GetAlpha();
act_param->min_val_ = activation->GetMinVal();
act_param->max_val_ = activation->GetMaxVal();
return reinterpret_cast<OpParameter *>(act_param);
}
Registry ActivationParameterRegistry(schema::PrimitiveType_Activation, PopulateActivationParameter);
} // namespace lite
} // namespace mindspore

+ 46
- 0
mindspore/lite/src/ops/populate/add_populate.cc View File

@@ -0,0 +1,46 @@
/**
* Copyright 2019-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/ops/add.h"
#include "src/ops/primitive_c.h"
#include "src/ops/populate/populate_register.h"
#include "nnacl/arithmetic_common.h"

namespace mindspore {
namespace lite {
OpParameter *PopulateAddParameter(const mindspore::lite::PrimitiveC *primitive) {
ArithmeticParameter *arithmetic_param = reinterpret_cast<ArithmeticParameter *>(malloc(sizeof(ArithmeticParameter)));
if (arithmetic_param == nullptr) {
MS_LOG(ERROR) << "malloc ArithmeticParameter failed.";
return nullptr;
}
memset(arithmetic_param, 0, sizeof(ArithmeticParameter));
arithmetic_param->op_parameter_.type_ = primitive->Type();
arithmetic_param->broadcasting_ = ((lite::Arithmetic *)primitive)->Broadcasting();
arithmetic_param->ndim_ = ((lite::Arithmetic *)primitive)->NDims();
arithmetic_param->activation_type_ =
reinterpret_cast<mindspore::lite::Add *>(const_cast<mindspore::lite::PrimitiveC *>(primitive))->GetActivationType();
auto tmp_shape = ((lite::Arithmetic *)primitive)->InShape0();
memcpy(arithmetic_param->in_shape0_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->InShape1();
memcpy(arithmetic_param->in_shape1_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
tmp_shape = ((lite::Arithmetic *)primitive)->OutputShape();
memcpy(arithmetic_param->out_shape_, static_cast<void *>(tmp_shape.data()), tmp_shape.size() * sizeof(int));
return reinterpret_cast<OpParameter *>(arithmetic_param);
}
Registry AddParameterRegistry(schema::PrimitiveType_Add, PopulateAddParameter);
} // namespace lite
} // namespace mindspore

mindspore/lite/src/ops/ceil.cc → mindspore/lite/src/ops/populate/addn_populate.cc View File

@@ -14,14 +14,22 @@
* limitations under the License.
*/

#include "src/ops/ceil.h"
#include "src/ops/ops_register.h"
#include "src/ops/primitive_c.h"
#include "src/ops/populate/populate_register.h"
#include "nnacl/op_base.h"

namespace mindspore {
namespace lite {

Registry CeilParameterRegistry(schema::PrimitiveType_Ceil, PopulateArithmeticSelf);

OpParameter *PopulateAddNParameter(const mindspore::lite::PrimitiveC *primitive) {
OpParameter *addn_param = reinterpret_cast<OpParameter *>(malloc(sizeof(OpParameter)));
if (addn_param == nullptr) {
MS_LOG(ERROR) << "malloc OpParameter failed.";
return nullptr;
}
memset(addn_param, 0, sizeof(OpParameter));
addn_param->type_ = primitive->Type();
return reinterpret_cast<OpParameter *>(addn_param);
}
Registry AddNParameterRegistry(schema::PrimitiveType_AddN, PopulateAddNParameter);
} // namespace lite
} // namespace mindspore

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save