From 055bcc180fcca0f2dcd4b2f5d7672ace815144ed Mon Sep 17 00:00:00 2001 From: sunsuodong Date: Thu, 12 Nov 2020 11:21:41 +0800 Subject: [PATCH] fix code check --- mindspore/lite/src/ops/abs.h | 5 ++--- mindspore/lite/src/ops/activation.h | 5 ++--- mindspore/lite/src/ops/activation_grad.h | 5 ++--- mindspore/lite/src/ops/adam.h | 5 ++--- mindspore/lite/src/ops/add.h | 5 ++--- mindspore/lite/src/ops/addn.h | 5 ++--- mindspore/lite/src/ops/apply_momentum.h | 5 ++--- mindspore/lite/src/ops/argmax.h | 5 ++--- mindspore/lite/src/ops/argmin.h | 5 ++--- mindspore/lite/src/ops/arithmetic.h | 4 ++-- mindspore/lite/src/ops/arithmetic_grad.h | 4 ++-- mindspore/lite/src/ops/arithmetic_self.h | 4 ++-- mindspore/lite/src/ops/assign.h | 4 ++-- mindspore/lite/src/ops/assign_add.h | 5 ++--- mindspore/lite/src/ops/audio_spectrogram.h | 5 ++--- mindspore/lite/src/ops/batch_norm.h | 5 ++--- mindspore/lite/src/ops/batch_to_space.h | 5 ++--- mindspore/lite/src/ops/bias_add.h | 5 ++--- mindspore/lite/src/ops/bias_grad.h | 5 ++--- mindspore/lite/src/ops/binary_cross_entropy.h | 6 ++---- mindspore/lite/src/ops/binary_cross_entropy_grad.h | 6 ++---- mindspore/lite/src/ops/bn_grad.h | 4 ++-- mindspore/lite/src/ops/broadcast_to.h | 5 ++--- mindspore/lite/src/ops/cast.h | 5 ++--- mindspore/lite/src/ops/ceil.h | 5 ++--- mindspore/lite/src/ops/clip.h | 5 ++--- mindspore/lite/src/ops/concat.h | 5 ++--- mindspore/lite/src/ops/constant_of_shape.h | 5 ++--- mindspore/lite/src/ops/control_depend.h | 4 ++-- mindspore/lite/src/ops/conv2d.h | 10 +++------- mindspore/lite/src/ops/conv2d_grad_filter.h | 5 ++--- mindspore/lite/src/ops/conv2d_grad_input.h | 5 ++--- mindspore/lite/src/ops/cos.h | 5 ++--- mindspore/lite/src/ops/crop.h | 5 ++--- mindspore/lite/src/ops/custom_extract_features.h | 4 ++-- mindspore/lite/src/ops/custom_normalize.h | 4 ++-- mindspore/lite/src/ops/custom_predict.h | 4 ++-- mindspore/lite/src/ops/deconv2d.h | 6 ++---- mindspore/lite/src/ops/dedepthwise_conv2d.h | 5 ++--- mindspore/lite/src/ops/depend.h | 4 ++-- mindspore/lite/src/ops/depth_to_space.h | 5 ++--- mindspore/lite/src/ops/depthwise_conv2d.h | 12 +++--------- mindspore/lite/src/ops/dequant.h | 5 ++--- mindspore/lite/src/ops/detection_post_process.h | 5 ++--- mindspore/lite/src/ops/div.h | 5 ++--- mindspore/lite/src/ops/dropout.h | 5 ++--- mindspore/lite/src/ops/eltwise.h | 4 ++-- mindspore/lite/src/ops/elu.h | 5 ++--- mindspore/lite/src/ops/embedding_lookup.h | 5 ++--- mindspore/lite/src/ops/embedding_lookup_sparse.h | 5 ++--- mindspore/lite/src/ops/equal.h | 5 ++--- mindspore/lite/src/ops/exp.h | 5 ++--- mindspore/lite/src/ops/expand_dims.h | 5 ++--- .../lite/src/ops/fake_quant_with_min_max_vars.h | 5 ++--- mindspore/lite/src/ops/fft_imag.h | 5 ++--- mindspore/lite/src/ops/fft_real.h | 5 ++--- mindspore/lite/src/ops/fill.h | 5 ++--- mindspore/lite/src/ops/flatten.h | 5 ++--- mindspore/lite/src/ops/flatten_grad.h | 5 ++--- mindspore/lite/src/ops/floor.h | 5 ++--- mindspore/lite/src/ops/floor_div.h | 5 ++--- mindspore/lite/src/ops/floor_mod.h | 5 ++--- mindspore/lite/src/ops/full_connection.h | 5 ++--- mindspore/lite/src/ops/fused_batchnorm.h | 5 ++--- mindspore/lite/src/ops/gather.h | 5 ++--- mindspore/lite/src/ops/gather_nd.h | 5 ++--- mindspore/lite/src/ops/greater.h | 5 ++--- mindspore/lite/src/ops/greater_equal.h | 5 ++--- mindspore/lite/src/ops/group_conv2d_grad_input.h | 5 ++--- mindspore/lite/src/ops/hashtable_lookup.h | 4 ++-- mindspore/lite/src/ops/identity.h | 1 + mindspore/lite/src/ops/instance_norm.h | 5 ++--- mindspore/lite/src/ops/l2_norm.h | 5 ++--- mindspore/lite/src/ops/layer_norm.h | 5 ++--- mindspore/lite/src/ops/leaky_relu.h | 5 ++--- mindspore/lite/src/ops/less.h | 5 ++--- mindspore/lite/src/ops/less_equal.h | 5 ++--- .../lite/src/ops/local_response_normalization.h | 5 ++--- mindspore/lite/src/ops/log.h | 5 ++--- mindspore/lite/src/ops/log_grad.h | 5 ++--- mindspore/lite/src/ops/logical_and.h | 5 ++--- mindspore/lite/src/ops/logical_not.h | 5 ++--- mindspore/lite/src/ops/logical_or.h | 5 ++--- mindspore/lite/src/ops/lrn.h | 5 ++--- mindspore/lite/src/ops/lsh_projection.h | 4 ++-- mindspore/lite/src/ops/lstm.h | 5 ++--- mindspore/lite/src/ops/make_tuple.h | 5 ++--- mindspore/lite/src/ops/matmul.h | 13 +++---------- mindspore/lite/src/ops/matrix_diag.h | 5 ++--- mindspore/lite/src/ops/maximum.h | 5 ++--- mindspore/lite/src/ops/mean.h | 5 ++--- mindspore/lite/src/ops/mfcc.h | 5 ++--- mindspore/lite/src/ops/minimum.h | 5 ++--- mindspore/lite/src/ops/mul.h | 5 ++--- mindspore/lite/src/ops/nchw2nhwc.h | 5 ++--- mindspore/lite/src/ops/neg.h | 5 ++--- mindspore/lite/src/ops/neg_grad.h | 5 ++--- mindspore/lite/src/ops/nhwc2nchw.h | 5 ++--- mindspore/lite/src/ops/non_max_suppression.h | 5 ++--- mindspore/lite/src/ops/not_equal.h | 5 ++--- mindspore/lite/src/ops/one_hot.h | 5 ++--- mindspore/lite/src/ops/oneslike.h | 5 ++--- mindspore/lite/src/ops/p_relu.h | 6 ++---- mindspore/lite/src/ops/pad.h | 5 ++--- mindspore/lite/src/ops/permute.h | 4 ++-- mindspore/lite/src/ops/pooling.h | 5 ++--- mindspore/lite/src/ops/pooling_grad.h | 5 ++--- mindspore/lite/src/ops/power.h | 5 ++--- mindspore/lite/src/ops/power_grad.h | 5 ++--- mindspore/lite/src/ops/prior_box.h | 5 ++--- mindspore/lite/src/ops/quant.h | 5 ++--- mindspore/lite/src/ops/quant_dtype_cast.h | 5 ++--- mindspore/lite/src/ops/range.h | 5 ++--- mindspore/lite/src/ops/rank.h | 5 ++--- mindspore/lite/src/ops/real_div.h | 5 ++--- mindspore/lite/src/ops/reduce.h | 5 ++--- mindspore/lite/src/ops/reshape.h | 5 ++--- mindspore/lite/src/ops/resize.h | 5 ++--- mindspore/lite/src/ops/return.h | 5 ++--- mindspore/lite/src/ops/reverse.h | 5 ++--- mindspore/lite/src/ops/reverse_sequence.h | 5 ++--- mindspore/lite/src/ops/rfft.h | 5 ++--- mindspore/lite/src/ops/roi_pooling.h | 5 ++--- mindspore/lite/src/ops/round.h | 5 ++--- mindspore/lite/src/ops/rsqrt.h | 5 ++--- mindspore/lite/src/ops/scale.h | 6 ++---- mindspore/lite/src/ops/scatter_nd.h | 5 ++--- mindspore/lite/src/ops/sgd.h | 5 ++--- mindspore/lite/src/ops/shape.h | 5 ++--- mindspore/lite/src/ops/sin.h | 5 ++--- mindspore/lite/src/ops/skip_gram.h | 5 ++--- mindspore/lite/src/ops/slice.h | 5 ++--- mindspore/lite/src/ops/softmax.h | 5 ++--- mindspore/lite/src/ops/softmax_cross_entropy.h | 5 ++--- mindspore/lite/src/ops/space_to_batch.h | 5 ++--- mindspore/lite/src/ops/space_to_batch_nd.h | 5 ++--- mindspore/lite/src/ops/space_to_depth.h | 5 ++--- mindspore/lite/src/ops/sparse_to_dense.h | 5 ++--- mindspore/lite/src/ops/split.h | 5 ++--- mindspore/lite/src/ops/sqrt.h | 5 ++--- mindspore/lite/src/ops/square.h | 5 ++--- mindspore/lite/src/ops/squared_difference.h | 5 ++--- mindspore/lite/src/ops/squeeze.h | 5 ++--- mindspore/lite/src/ops/stack.h | 5 ++--- mindspore/lite/src/ops/strided_slice.h | 5 ++--- mindspore/lite/src/ops/sub.h | 5 ++--- mindspore/lite/src/ops/tile.h | 5 ++--- mindspore/lite/src/ops/topk.h | 5 ++--- mindspore/lite/src/ops/transpose.h | 5 ++--- mindspore/lite/src/ops/tuple_get_item.h | 4 ++-- mindspore/lite/src/ops/unique.h | 4 ++-- mindspore/lite/src/ops/unsorted_segment_sum.h | 5 ++--- mindspore/lite/src/ops/unsqueeze.h | 6 ++---- mindspore/lite/src/ops/unstack.h | 5 ++--- mindspore/lite/src/ops/upsample.h | 4 ++-- mindspore/lite/src/ops/where.h | 6 ++---- mindspore/lite/src/ops/while.h | 5 ++--- mindspore/lite/src/ops/zeros_like.h | 4 ++-- .../kernel/arm/fp16/convolution_winograd_fp16.cc | 1 + 159 files changed, 319 insertions(+), 477 deletions(-) diff --git a/mindspore/lite/src/ops/abs.h b/mindspore/lite/src/ops/abs.h index 9d04b1aa2d..1e8b50dcaa 100644 --- a/mindspore/lite/src/ops/abs.h +++ b/mindspore/lite/src/ops/abs.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Abs : public ArithmeticSelf { public: + Abs() = default; + ~Abs() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Abs, ArithmeticSelf); - Abs() = default; explicit Abs(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Abs() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/activation.h b/mindspore/lite/src/ops/activation.h index 5dfed611a1..7157248bf6 100644 --- a/mindspore/lite/src/ops/activation.h +++ b/mindspore/lite/src/ops/activation.h @@ -26,9 +26,10 @@ namespace mindspore { namespace lite { class Activation : public PrimitiveC { public: + Activation() = default; + ~Activation() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Activation, PrimitiveC); - Activation() = default; explicit Activation(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetType(int type); @@ -36,8 +37,6 @@ class Activation : public PrimitiveC { void SetMinVal(float minVal); void SetMaxVal(float maxVal); #else - Activation() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetType() const; diff --git a/mindspore/lite/src/ops/activation_grad.h b/mindspore/lite/src/ops/activation_grad.h index 04c35ce9be..c6c6181efc 100644 --- a/mindspore/lite/src/ops/activation_grad.h +++ b/mindspore/lite/src/ops/activation_grad.h @@ -28,16 +28,15 @@ namespace mindspore { namespace lite { class ActivationGrad : public PrimitiveC { public: + ActivationGrad() = default; + ~ActivationGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ActivationGrad, PrimitiveC); - ActivationGrad() = default; explicit ActivationGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetType(int type); void SetAlpha(float alpha); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - ActivationGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetType() const; diff --git a/mindspore/lite/src/ops/adam.h b/mindspore/lite/src/ops/adam.h index 6ffee993ad..6258da7d40 100644 --- a/mindspore/lite/src/ops/adam.h +++ b/mindspore/lite/src/ops/adam.h @@ -28,14 +28,13 @@ namespace mindspore { namespace lite { class Adam : public PrimitiveC { public: + Adam() = default; + ~Adam() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Adam, PrimitiveC); - Adam() = default; explicit Adam(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Adam() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/add.h b/mindspore/lite/src/ops/add.h index 1d2ca6767f..4bb4cddf77 100644 --- a/mindspore/lite/src/ops/add.h +++ b/mindspore/lite/src/ops/add.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class Add : public Arithmetic { public: + Add() = default; + ~Add() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Add, Arithmetic); - Add() = default; explicit Add(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetActivationType(int activation_type); #else - Add() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetActivationType() const; diff --git a/mindspore/lite/src/ops/addn.h b/mindspore/lite/src/ops/addn.h index cf726a3b05..775556e095 100644 --- a/mindspore/lite/src/ops/addn.h +++ b/mindspore/lite/src/ops/addn.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class AddN : public PrimitiveC { public: + AddN() = default; + ~AddN() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(AddN, PrimitiveC); - AddN() = default; explicit AddN(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetN(int n); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - AddN() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/apply_momentum.h b/mindspore/lite/src/ops/apply_momentum.h index 12cd392525..0d9454018a 100644 --- a/mindspore/lite/src/ops/apply_momentum.h +++ b/mindspore/lite/src/ops/apply_momentum.h @@ -28,14 +28,13 @@ namespace mindspore { namespace lite { class ApplyMomentum : public PrimitiveC { public: + ApplyMomentum() = default; + ~ApplyMomentum() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ApplyMomentum, PrimitiveC); - ApplyMomentum() = default; explicit ApplyMomentum(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - ApplyMomentum() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/argmax.h b/mindspore/lite/src/ops/argmax.h index 5bfbacd3b2..4fe49309af 100644 --- a/mindspore/lite/src/ops/argmax.h +++ b/mindspore/lite/src/ops/argmax.h @@ -27,9 +27,10 @@ namespace mindspore { namespace lite { class ArgMax : public PrimitiveC { public: + ArgMax() = default; + ~ArgMax() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ArgMax, PrimitiveC); - ArgMax() = default; explicit ArgMax(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(int axis); void SetOutMaxValue(bool out_max_value); @@ -37,8 +38,6 @@ class ArgMax : public PrimitiveC { void SetKeepDims(bool keep_dims); void SetAxisType(int axis_type); #else - ArgMax() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/argmin.h b/mindspore/lite/src/ops/argmin.h index 2a6e0eebdf..d159f99959 100644 --- a/mindspore/lite/src/ops/argmin.h +++ b/mindspore/lite/src/ops/argmin.h @@ -26,9 +26,10 @@ namespace mindspore { namespace lite { class ArgMin : public PrimitiveC { public: + ArgMin() = default; + ~ArgMin() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ArgMin, PrimitiveC); - ArgMin() = default; explicit ArgMin(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(int axis); void SetOutMaxValue(bool out_max_value); @@ -36,8 +37,6 @@ class ArgMin : public PrimitiveC { void SetKeepDims(bool keep_dims); void SetAxisType(int axis_type); #else - ArgMin() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/arithmetic.h b/mindspore/lite/src/ops/arithmetic.h index fb35d11415..d7f4d46165 100644 --- a/mindspore/lite/src/ops/arithmetic.h +++ b/mindspore/lite/src/ops/arithmetic.h @@ -27,13 +27,13 @@ namespace mindspore { namespace lite { class Arithmetic : public PrimitiveC { public: + Arithmetic() = default; + ~Arithmetic() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Arithmetic, PrimitiveC); - Arithmetic() = default; explicit Arithmetic(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else // explicit Arithmetic(schema::Primitive *primitive) : PrimitiveC(primitive) {} - Arithmetic() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override { return RET_ERROR; } diff --git a/mindspore/lite/src/ops/arithmetic_grad.h b/mindspore/lite/src/ops/arithmetic_grad.h index dc851666c5..d4a1cf666d 100644 --- a/mindspore/lite/src/ops/arithmetic_grad.h +++ b/mindspore/lite/src/ops/arithmetic_grad.h @@ -27,13 +27,13 @@ namespace mindspore { namespace lite { class ArithmeticGrad : public PrimitiveC { public: + ArithmeticGrad() = default; + ~ArithmeticGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ArithmeticGrad, PrimitiveC); - ArithmeticGrad() = default; explicit ArithmeticGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else // explicit ArithmeticGrad(const schema::Primitive &primitive) : PrimitiveC(primitive) {} - ArithmeticGrad() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override { return RET_ERROR; } diff --git a/mindspore/lite/src/ops/arithmetic_self.h b/mindspore/lite/src/ops/arithmetic_self.h index 71ae5ea30a..dafba50a81 100644 --- a/mindspore/lite/src/ops/arithmetic_self.h +++ b/mindspore/lite/src/ops/arithmetic_self.h @@ -25,13 +25,13 @@ namespace mindspore { namespace lite { class ArithmeticSelf : public PrimitiveC { public: + ArithmeticSelf() = default; + ~ArithmeticSelf() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ArithmeticSelf, PrimitiveC); - ArithmeticSelf() = default; explicit ArithmeticSelf(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else // explicit ArithmeticSelf(schema::Primitive *primitive) : PrimitiveC(primitive) {} - ArithmeticSelf() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override { return RET_ERROR; } diff --git a/mindspore/lite/src/ops/assign.h b/mindspore/lite/src/ops/assign.h index 0316031b9a..e53ac0a636 100644 --- a/mindspore/lite/src/ops/assign.h +++ b/mindspore/lite/src/ops/assign.h @@ -26,13 +26,13 @@ namespace mindspore { namespace lite { class Assign : public PrimitiveC { public: + Assign() = default; + ~Assign() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Assign, PrimitiveC); - Assign() = default; explicit Assign(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Assign() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/assign_add.h b/mindspore/lite/src/ops/assign_add.h index b956165ee3..6e0e94edab 100644 --- a/mindspore/lite/src/ops/assign_add.h +++ b/mindspore/lite/src/ops/assign_add.h @@ -24,14 +24,13 @@ namespace mindspore { namespace lite { class AssignAdd : public PrimitiveC { public: + AssignAdd() = default; + ~AssignAdd() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(AssignAdd, PrimitiveC); - AssignAdd() = default; explicit AssignAdd(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - AssignAdd() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/audio_spectrogram.h b/mindspore/lite/src/ops/audio_spectrogram.h index 53e679a097..e996543ad3 100644 --- a/mindspore/lite/src/ops/audio_spectrogram.h +++ b/mindspore/lite/src/ops/audio_spectrogram.h @@ -26,16 +26,15 @@ namespace mindspore { namespace lite { class AudioSpectrogram : public PrimitiveC { public: + AudioSpectrogram() = default; + ~AudioSpectrogram() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(AudioSpectrogram, PrimitiveC); - AudioSpectrogram() = default; explicit AudioSpectrogram(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetWindowSize(int window_size) { this->primitive_->value.AsAudioSpectrogram()->windowSize = window_size; } void SetStride(int stride) { this->primitive_->value.AsAudioSpectrogram()->stride = stride; } void SetMagSquare(bool mag_square) { this->primitive_->value.AsAudioSpectrogram()->magSquare = mag_square; } #else - AudioSpectrogram() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetWindowSize() const; diff --git a/mindspore/lite/src/ops/batch_norm.h b/mindspore/lite/src/ops/batch_norm.h index cfa599fc4c..f4f98648b4 100644 --- a/mindspore/lite/src/ops/batch_norm.h +++ b/mindspore/lite/src/ops/batch_norm.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class BatchNorm : public PrimitiveC { public: + BatchNorm() = default; + ~BatchNorm() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BatchNorm, PrimitiveC); - BatchNorm() = default; explicit BatchNorm(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetEpsilon(float epsilon); #else - BatchNorm() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetEpsilon() const; diff --git a/mindspore/lite/src/ops/batch_to_space.h b/mindspore/lite/src/ops/batch_to_space.h index cc6105d824..ce3e5756e3 100644 --- a/mindspore/lite/src/ops/batch_to_space.h +++ b/mindspore/lite/src/ops/batch_to_space.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class BatchToSpace : public PrimitiveC { public: + BatchToSpace() = default; + ~BatchToSpace() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BatchToSpace, PrimitiveC); - BatchToSpace() = default; explicit BatchToSpace(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBlockShape(const std::vector &block_shape); void SetCrops(const std::vector &crops); #else - BatchToSpace() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/bias_add.h b/mindspore/lite/src/ops/bias_add.h index 8aed794a56..218db90506 100644 --- a/mindspore/lite/src/ops/bias_add.h +++ b/mindspore/lite/src/ops/bias_add.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class BiasAdd : public PrimitiveC { public: + BiasAdd() = default; + ~BiasAdd() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BiasAdd, PrimitiveC); - BiasAdd() = default; explicit BiasAdd(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetAxis(const std::vector &axis); #else - BiasAdd() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetAxis() const; diff --git a/mindspore/lite/src/ops/bias_grad.h b/mindspore/lite/src/ops/bias_grad.h index b15f8d2f28..44df55a8cd 100644 --- a/mindspore/lite/src/ops/bias_grad.h +++ b/mindspore/lite/src/ops/bias_grad.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class BiasGrad : public PrimitiveC { public: + BiasGrad() = default; + ~BiasGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BiasGrad, PrimitiveC); - BiasGrad() = default; explicit BiasGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(const std::vector &axis); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - BiasGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs, std::vector outputs) override; diff --git a/mindspore/lite/src/ops/binary_cross_entropy.h b/mindspore/lite/src/ops/binary_cross_entropy.h index 75e0e1224f..c9ad936770 100644 --- a/mindspore/lite/src/ops/binary_cross_entropy.h +++ b/mindspore/lite/src/ops/binary_cross_entropy.h @@ -25,19 +25,17 @@ namespace mindspore { namespace lite { class BinaryCrossEntropy : public PrimitiveC { public: + BinaryCrossEntropy() = default; + ~BinaryCrossEntropy() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BinaryCrossEntropy, PrimitiveC); - BinaryCrossEntropy() = default; - explicit BinaryCrossEntropy(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; int GetReduction() const; #else - BinaryCrossEntropy() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; int GetReduction() const; diff --git a/mindspore/lite/src/ops/binary_cross_entropy_grad.h b/mindspore/lite/src/ops/binary_cross_entropy_grad.h index 2c900090ef..bb21020541 100644 --- a/mindspore/lite/src/ops/binary_cross_entropy_grad.h +++ b/mindspore/lite/src/ops/binary_cross_entropy_grad.h @@ -25,19 +25,17 @@ namespace mindspore { namespace lite { class BinaryCrossEntropyGrad : public PrimitiveC { public: + BinaryCrossEntropyGrad() = default; + ~BinaryCrossEntropyGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BinaryCrossEntropyGrad, PrimitiveC); - BinaryCrossEntropyGrad() = default; - explicit BinaryCrossEntropyGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; int GetReduction() const; #else - BinaryCrossEntropyGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; int GetReduction() const; diff --git a/mindspore/lite/src/ops/bn_grad.h b/mindspore/lite/src/ops/bn_grad.h index 45120ca58a..a0b68ea45e 100644 --- a/mindspore/lite/src/ops/bn_grad.h +++ b/mindspore/lite/src/ops/bn_grad.h @@ -26,15 +26,15 @@ namespace mindspore { namespace lite { class BNGrad : public PrimitiveC { public: + BNGrad() = default; + ~BNGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BNGrad, PrimitiveC); - BNGrad() = default; explicit BNGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetEps(float eps); void SetMomentum(float momentum); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - BNGrad() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/broadcast_to.h b/mindspore/lite/src/ops/broadcast_to.h index 53c5dca8ed..4794a38bac 100644 --- a/mindspore/lite/src/ops/broadcast_to.h +++ b/mindspore/lite/src/ops/broadcast_to.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class BroadcastTo : public PrimitiveC { public: + BroadcastTo() = default; + ~BroadcastTo() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(BroadcastTo, PrimitiveC); - BroadcastTo() = default; explicit BroadcastTo(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetDstShape(const std::vector &dst_shape); #else - BroadcastTo() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/cast.h b/mindspore/lite/src/ops/cast.h index ab12731367..4ef1d67cce 100644 --- a/mindspore/lite/src/ops/cast.h +++ b/mindspore/lite/src/ops/cast.h @@ -26,16 +26,15 @@ namespace mindspore { namespace lite { class Cast : public PrimitiveC { public: + Cast() = default; + ~Cast() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Cast, PrimitiveC); - Cast() = default; explicit Cast(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetSrcT(int src_t); void SetDstT(int dst_t); int UnPackAttr(const Primitive &prim, const std::vector &inputs); #else - Cast() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/ceil.h b/mindspore/lite/src/ops/ceil.h index 1f8d88d8bb..41d56ac797 100644 --- a/mindspore/lite/src/ops/ceil.h +++ b/mindspore/lite/src/ops/ceil.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class Ceil : public ArithmeticSelf { public: + Ceil() = default; + ~Ceil() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Ceil, ArithmeticSelf); - Ceil() = default; explicit Ceil(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Ceil() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override { MS_ASSERT(nullptr != primitive); MS_ASSERT(nullptr != fbb); diff --git a/mindspore/lite/src/ops/clip.h b/mindspore/lite/src/ops/clip.h index 4b5217db4b..6c451d9e57 100644 --- a/mindspore/lite/src/ops/clip.h +++ b/mindspore/lite/src/ops/clip.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class Clip : public PrimitiveC { public: + Clip() = default; + ~Clip() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Clip, PrimitiveC); - Clip() = default; explicit Clip(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetMax(float max); void SetMin(float min); #else - Clip() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetMax() const; diff --git a/mindspore/lite/src/ops/concat.h b/mindspore/lite/src/ops/concat.h index 671fac8841..08dfa10021 100644 --- a/mindspore/lite/src/ops/concat.h +++ b/mindspore/lite/src/ops/concat.h @@ -26,16 +26,15 @@ namespace mindspore { namespace lite { class Concat : public PrimitiveC { public: + Concat() = default; + ~Concat() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Concat, PrimitiveC); - Concat() = default; explicit Concat(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetAxis(int axis); void SetN(int n); #else - Concat() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/constant_of_shape.h b/mindspore/lite/src/ops/constant_of_shape.h index 6dbf5ec527..a72979a62a 100644 --- a/mindspore/lite/src/ops/constant_of_shape.h +++ b/mindspore/lite/src/ops/constant_of_shape.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class ConstantOfShape : public PrimitiveC { public: + ConstantOfShape() = default; + ~ConstantOfShape() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ConstantOfShape, PrimitiveC); - ConstantOfShape() = default; explicit ConstantOfShape(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - ConstantOfShape() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/control_depend.h b/mindspore/lite/src/ops/control_depend.h index 6a8f6b8079..0737dbc4c2 100644 --- a/mindspore/lite/src/ops/control_depend.h +++ b/mindspore/lite/src/ops/control_depend.h @@ -24,13 +24,13 @@ namespace mindspore { namespace lite { class ControlDepend : public PrimitiveC { public: + ControlDepend() = default; + ~ControlDepend() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ControlDepend, PrimitiveC); - ControlDepend() = default; explicit ControlDepend(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - ControlDepend() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/conv2d.h b/mindspore/lite/src/ops/conv2d.h index 42e8dfe70f..5f424b40b2 100644 --- a/mindspore/lite/src/ops/conv2d.h +++ b/mindspore/lite/src/ops/conv2d.h @@ -26,11 +26,11 @@ namespace mindspore { namespace lite { class Conv2D : public PrimitiveC { -#ifdef PRIMITIVE_WRITEABLE - MS_DECLARE_PARENT(Conv2D, PrimitiveC); - public: Conv2D() = default; + ~Conv2D() = default; +#ifdef PRIMITIVE_WRITEABLE + MS_DECLARE_PARENT(Conv2D, PrimitiveC); explicit Conv2D(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; @@ -57,10 +57,6 @@ class Conv2D : public PrimitiveC { const std::vector &inputs); void PopulaterConv2DSingleGroup(const Primitive &prim, schema::PrimitiveT *primitive, const int &group); #else - - public: - Conv2D() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif diff --git a/mindspore/lite/src/ops/conv2d_grad_filter.h b/mindspore/lite/src/ops/conv2d_grad_filter.h index b723308982..93cd81c245 100644 --- a/mindspore/lite/src/ops/conv2d_grad_filter.h +++ b/mindspore/lite/src/ops/conv2d_grad_filter.h @@ -28,9 +28,10 @@ namespace mindspore { namespace lite { class Conv2DGradFilter : public PrimitiveC { public: + Conv2DGradFilter() = default; + ~Conv2DGradFilter() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Conv2DGradFilter, PrimitiveC); - Conv2DGradFilter() = default; explicit Conv2DGradFilter(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetGroup(int group); @@ -51,8 +52,6 @@ class Conv2DGradFilter : public PrimitiveC { void SetActivationType(int activation_type); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Conv2DGradFilter() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/conv2d_grad_input.h b/mindspore/lite/src/ops/conv2d_grad_input.h index 1247676087..73e8f39402 100644 --- a/mindspore/lite/src/ops/conv2d_grad_input.h +++ b/mindspore/lite/src/ops/conv2d_grad_input.h @@ -28,9 +28,10 @@ namespace mindspore { namespace lite { class Conv2DGradInput : public PrimitiveC { public: + Conv2DGradInput() = default; + ~Conv2DGradInput() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Conv2DGradInput, PrimitiveC); - Conv2DGradInput() = default; explicit Conv2DGradInput(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetGroup(int group); @@ -51,8 +52,6 @@ class Conv2DGradInput : public PrimitiveC { void SetActivationType(int activation_type); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Conv2DGradInput() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/cos.h b/mindspore/lite/src/ops/cos.h index e241edf78f..aa570378bc 100644 --- a/mindspore/lite/src/ops/cos.h +++ b/mindspore/lite/src/ops/cos.h @@ -26,12 +26,11 @@ namespace mindspore { namespace lite { class Cos : public ArithmeticSelf { public: -#ifdef PRIMITIVE_WRITEABLE Cos() = default; + ~Cos() = default; +#ifdef PRIMITIVE_WRITEABLE explicit Cos(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Cos() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/crop.h b/mindspore/lite/src/ops/crop.h index aa586110f8..002843d677 100644 --- a/mindspore/lite/src/ops/crop.h +++ b/mindspore/lite/src/ops/crop.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class Crop : public PrimitiveC { public: + Crop() = default; + ~Crop() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Crop, PrimitiveC); - Crop() = default; explicit Crop(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(int64_t axis); void SetOffsets(const std::vector &offsets); #else - Crop() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/custom_extract_features.h b/mindspore/lite/src/ops/custom_extract_features.h index 41e2eedc47..c9718a6b45 100644 --- a/mindspore/lite/src/ops/custom_extract_features.h +++ b/mindspore/lite/src/ops/custom_extract_features.h @@ -23,13 +23,13 @@ namespace mindspore { namespace lite { class CustomExtractFeatures : public PrimitiveC { public: + CustomExtractFeatures() = default; + ~CustomExtractFeatures() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(CustomExtractFeatures, PrimitiveC); - CustomExtractFeatures() = default; explicit CustomExtractFeatures(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - CustomExtractFeatures() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/custom_normalize.h b/mindspore/lite/src/ops/custom_normalize.h index 65dc91030c..799df336aa 100644 --- a/mindspore/lite/src/ops/custom_normalize.h +++ b/mindspore/lite/src/ops/custom_normalize.h @@ -23,13 +23,13 @@ namespace mindspore { namespace lite { class CustomNormalize : public PrimitiveC { public: + CustomNormalize() = default; + ~CustomNormalize() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(CustomNormalize, PrimitiveC); - CustomNormalize() = default; explicit CustomNormalize(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - CustomNormalize() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/custom_predict.h b/mindspore/lite/src/ops/custom_predict.h index fc29961fb4..404558829d 100644 --- a/mindspore/lite/src/ops/custom_predict.h +++ b/mindspore/lite/src/ops/custom_predict.h @@ -23,9 +23,10 @@ namespace mindspore { namespace lite { class CustomPredict : public PrimitiveC { public: + CustomPredict() = default; + ~CustomPredict() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(CustomPredict, PrimitiveC); - CustomPredict() = default; explicit CustomPredict(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int GetOutputNum() const; float GetWeightThreshold() const; @@ -33,7 +34,6 @@ class CustomPredict : public PrimitiveC { void SetWeightThreshold(float weight_threshold); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - CustomPredict() = default; int GetOutputNum() const; float GetWeightThreshold() const; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; diff --git a/mindspore/lite/src/ops/deconv2d.h b/mindspore/lite/src/ops/deconv2d.h index 77c7a3ced9..262c5cb0da 100644 --- a/mindspore/lite/src/ops/deconv2d.h +++ b/mindspore/lite/src/ops/deconv2d.h @@ -26,9 +26,10 @@ namespace mindspore { namespace lite { class DeConv2D : public PrimitiveC { public: + DeConv2D() = default; + ~DeConv2D() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(DeConv2D, PrimitiveC); - DeConv2D() = default; explicit DeConv2D(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetGroup(int group); @@ -51,10 +52,7 @@ class DeConv2D : public PrimitiveC { void PopulaterConv2DMultiGroup(const Primitive &prim, schema::PrimitiveT *primitive, const int &group, const std::vector &inputs); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; - #else - DeConv2D() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/dedepthwise_conv2d.h b/mindspore/lite/src/ops/dedepthwise_conv2d.h index 7ab1b19390..a153f14046 100644 --- a/mindspore/lite/src/ops/dedepthwise_conv2d.h +++ b/mindspore/lite/src/ops/dedepthwise_conv2d.h @@ -26,9 +26,10 @@ namespace mindspore { namespace lite { class DeDepthwiseConv2D : public PrimitiveC { public: + DeDepthwiseConv2D() = default; + ~DeDepthwiseConv2D() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(DeDepthwiseConv2D, PrimitiveC); - DeDepthwiseConv2D() = default; explicit DeDepthwiseConv2D(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetChannelIn(int channel_in); @@ -47,8 +48,6 @@ class DeDepthwiseConv2D : public PrimitiveC { void SetHasBias(bool has_bias); void SetActivationType(int activation_type); #else - DeDepthwiseConv2D() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/depend.h b/mindspore/lite/src/ops/depend.h index 909c429935..cc7f797308 100644 --- a/mindspore/lite/src/ops/depend.h +++ b/mindspore/lite/src/ops/depend.h @@ -24,13 +24,13 @@ namespace mindspore { namespace lite { class Depend : public PrimitiveC { public: + Depend() = default; + ~Depend() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Depend, PrimitiveC); - Depend() = default; explicit Depend(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Depend() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/depth_to_space.h b/mindspore/lite/src/ops/depth_to_space.h index 699e1a0575..c9066fea37 100644 --- a/mindspore/lite/src/ops/depth_to_space.h +++ b/mindspore/lite/src/ops/depth_to_space.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class DepthToSpace : public PrimitiveC { public: + DepthToSpace() = default; + ~DepthToSpace() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(DepthToSpace, PrimitiveC); - DepthToSpace() = default; explicit DepthToSpace(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBlockSize(int block_size); void SetFormat(int format); #else - DepthToSpace() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/depthwise_conv2d.h b/mindspore/lite/src/ops/depthwise_conv2d.h index b1bf570788..d52fcf26be 100644 --- a/mindspore/lite/src/ops/depthwise_conv2d.h +++ b/mindspore/lite/src/ops/depthwise_conv2d.h @@ -25,11 +25,11 @@ namespace mindspore { namespace lite { class DepthwiseConv2D : public PrimitiveC { -#ifdef PRIMITIVE_WRITEABLE - MS_DECLARE_PARENT(DepthwiseConv2D, PrimitiveC); - public: DepthwiseConv2D() = default; + ~DepthwiseConv2D() = default; +#ifdef PRIMITIVE_WRITEABLE + MS_DECLARE_PARENT(DepthwiseConv2D, PrimitiveC); explicit DepthwiseConv2D(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; @@ -49,16 +49,10 @@ class DepthwiseConv2D : public PrimitiveC { void SetDilateH(int dilate_h); void SetHasBias(bool has_bias); void SetActivationType(int activation_type); - #else - - public: - DepthwiseConv2D() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif - public: int InferShape(std::vector inputs_, std::vector outputs_) override; int GetFormat() const; int GetChannelIn() const; diff --git a/mindspore/lite/src/ops/dequant.h b/mindspore/lite/src/ops/dequant.h index 73fd1391f3..046055abbd 100644 --- a/mindspore/lite/src/ops/dequant.h +++ b/mindspore/lite/src/ops/dequant.h @@ -24,13 +24,12 @@ namespace mindspore { namespace lite { class Dequant : public PrimitiveC { public: + Dequant() = default; + ~Dequant() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Dequant, PrimitiveC); - Dequant() = default; explicit Dequant(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; -#else - Dequant() = default; #endif }; } // namespace lite diff --git a/mindspore/lite/src/ops/detection_post_process.h b/mindspore/lite/src/ops/detection_post_process.h index 930e436534..d93d5807a2 100644 --- a/mindspore/lite/src/ops/detection_post_process.h +++ b/mindspore/lite/src/ops/detection_post_process.h @@ -26,9 +26,10 @@ namespace mindspore { namespace lite { class DetectionPostProcess : public PrimitiveC { public: + DetectionPostProcess() = default; + ~DetectionPostProcess() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(DetectionPostProcess, PrimitiveC); - DetectionPostProcess() = default; explicit DetectionPostProcess(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetInputSize(int input_size); @@ -45,8 +46,6 @@ class DetectionPostProcess : public PrimitiveC { void SetUseRegularNms(bool use_regular_nms); void SetOutQuantized(bool out_quantized); #else - DetectionPostProcess() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/div.h b/mindspore/lite/src/ops/div.h index b26b2d4763..0398245c0c 100644 --- a/mindspore/lite/src/ops/div.h +++ b/mindspore/lite/src/ops/div.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class Div : public Arithmetic { public: + Div() = default; + ~Div() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Div, Arithmetic); - Div() = default; explicit Div(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} void SetActivationType(int activation_type); #else - Div() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetActivationType() const; diff --git a/mindspore/lite/src/ops/dropout.h b/mindspore/lite/src/ops/dropout.h index 1edb13bb59..5bb645f765 100644 --- a/mindspore/lite/src/ops/dropout.h +++ b/mindspore/lite/src/ops/dropout.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class Dropout : public PrimitiveC { public: + Dropout() = default; + ~Dropout() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Dropout, PrimitiveC); - Dropout() = default; explicit Dropout(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetRatio(float ratio); #else - Dropout() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetRatio() const; diff --git a/mindspore/lite/src/ops/eltwise.h b/mindspore/lite/src/ops/eltwise.h index 0f3dd38f34..1f6222144c 100644 --- a/mindspore/lite/src/ops/eltwise.h +++ b/mindspore/lite/src/ops/eltwise.h @@ -27,14 +27,14 @@ namespace mindspore { namespace lite { class Eltwise : public Arithmetic { public: + Eltwise() = default; + ~Eltwise() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Eltwise, Arithmetic); - Eltwise() = default; explicit Eltwise(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} void SetMode(int mode); #else - Eltwise() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetMode() const; diff --git a/mindspore/lite/src/ops/elu.h b/mindspore/lite/src/ops/elu.h index f076be6d4f..9b025e69bd 100644 --- a/mindspore/lite/src/ops/elu.h +++ b/mindspore/lite/src/ops/elu.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class Elu : public PrimitiveC { public: + Elu() = default; + ~Elu() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Elu, PrimitiveC); - Elu() = default; explicit Elu(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAlpha(float alpha); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Elu() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetAlpha() const; diff --git a/mindspore/lite/src/ops/embedding_lookup.h b/mindspore/lite/src/ops/embedding_lookup.h index 19f7494d8c..01898bb7fb 100644 --- a/mindspore/lite/src/ops/embedding_lookup.h +++ b/mindspore/lite/src/ops/embedding_lookup.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class EmbeddingLookup : public PrimitiveC { public: + EmbeddingLookup() = default; + ~EmbeddingLookup() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(EmbeddingLookup, PrimitiveC); - EmbeddingLookup() = default; explicit EmbeddingLookup(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetMaxNorm(float max_norm); #else - EmbeddingLookup() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/embedding_lookup_sparse.h b/mindspore/lite/src/ops/embedding_lookup_sparse.h index 99fe7d78fe..e49e08ec75 100644 --- a/mindspore/lite/src/ops/embedding_lookup_sparse.h +++ b/mindspore/lite/src/ops/embedding_lookup_sparse.h @@ -27,16 +27,15 @@ namespace mindspore { namespace lite { class EmbeddingLookupSparse : public PrimitiveC { public: + EmbeddingLookupSparse() = default; + ~EmbeddingLookupSparse() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(EmbeddingLookupSparse, PrimitiveC); - EmbeddingLookupSparse() = default; explicit EmbeddingLookupSparse(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetSpIds(const std::vector &sp_ids); void SetSpWeights(const std::vector &sp_weights); void SetMaxNortm(float max_nortm); #else - EmbeddingLookupSparse() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetSpIds() const; diff --git a/mindspore/lite/src/ops/equal.h b/mindspore/lite/src/ops/equal.h index e492e03d65..9d88d92853 100644 --- a/mindspore/lite/src/ops/equal.h +++ b/mindspore/lite/src/ops/equal.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class Equal : public Arithmetic { public: + Equal() = default; + ~Equal() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Equal, PrimitiveC); - Equal() = default; explicit Equal(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - Equal() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/exp.h b/mindspore/lite/src/ops/exp.h index b72a5a1c9b..681326efea 100644 --- a/mindspore/lite/src/ops/exp.h +++ b/mindspore/lite/src/ops/exp.h @@ -26,17 +26,16 @@ namespace mindspore { namespace lite { class Exp : public PrimitiveC { public: + Exp() = default; + ~Exp() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Exp, PrimitiveC); - Exp() = default; explicit Exp(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBase(float base); void SetShift(float shift); void SetScale(float scale); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Exp() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetBase() const; diff --git a/mindspore/lite/src/ops/expand_dims.h b/mindspore/lite/src/ops/expand_dims.h index 17488517f9..bb580b8411 100644 --- a/mindspore/lite/src/ops/expand_dims.h +++ b/mindspore/lite/src/ops/expand_dims.h @@ -26,16 +26,15 @@ namespace mindspore { namespace lite { class ExpandDims : public PrimitiveC { public: + ExpandDims() = default; + ~ExpandDims() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ExpandDims, PrimitiveC); - ExpandDims() = default; explicit ExpandDims(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetDim(int dim); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - ExpandDims() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/fake_quant_with_min_max_vars.h b/mindspore/lite/src/ops/fake_quant_with_min_max_vars.h index 5aadd3d633..7b9e6dd1c5 100644 --- a/mindspore/lite/src/ops/fake_quant_with_min_max_vars.h +++ b/mindspore/lite/src/ops/fake_quant_with_min_max_vars.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class FakeQuantWithMinMaxVars : public PrimitiveC { public: + FakeQuantWithMinMaxVars() = default; + ~FakeQuantWithMinMaxVars() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FakeQuantWithMinMaxVars, PrimitiveC); - FakeQuantWithMinMaxVars() = default; explicit FakeQuantWithMinMaxVars(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetNarrowRange(bool narrow_range); void SetNumBits(int num_bits); #else - FakeQuantWithMinMaxVars() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif bool GetNarrowRange() const; diff --git a/mindspore/lite/src/ops/fft_imag.h b/mindspore/lite/src/ops/fft_imag.h index 1b35e77a16..c804630b10 100644 --- a/mindspore/lite/src/ops/fft_imag.h +++ b/mindspore/lite/src/ops/fft_imag.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class FftImag : public PrimitiveC { public: + FftImag() = default; + ~FftImag() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FftImag, PrimitiveC); - FftImag() = default; explicit FftImag(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - FftImag() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/fft_real.h b/mindspore/lite/src/ops/fft_real.h index b35e4af5b1..f61493956e 100644 --- a/mindspore/lite/src/ops/fft_real.h +++ b/mindspore/lite/src/ops/fft_real.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class FftReal : public PrimitiveC { public: + FftReal() = default; + ~FftReal() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FftReal, PrimitiveC); - FftReal() = default; explicit FftReal(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - FftReal() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/fill.h b/mindspore/lite/src/ops/fill.h index 0d89ad6ea3..5af4037c3c 100644 --- a/mindspore/lite/src/ops/fill.h +++ b/mindspore/lite/src/ops/fill.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class Fill : public PrimitiveC { public: + Fill() = default; + ~Fill() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Fill, PrimitiveC); - Fill() = default; explicit Fill(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetDims(const std::vector &dims); #else - Fill() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/flatten.h b/mindspore/lite/src/ops/flatten.h index 76f440b207..04b5d97550 100644 --- a/mindspore/lite/src/ops/flatten.h +++ b/mindspore/lite/src/ops/flatten.h @@ -26,14 +26,13 @@ namespace mindspore { namespace lite { class Flatten : public PrimitiveC { public: + Flatten() = default; + ~Flatten() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Flatten, PrimitiveC); - Flatten() = default; explicit Flatten(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Flatten() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/flatten_grad.h b/mindspore/lite/src/ops/flatten_grad.h index d674da0084..59fb1823e0 100644 --- a/mindspore/lite/src/ops/flatten_grad.h +++ b/mindspore/lite/src/ops/flatten_grad.h @@ -26,14 +26,13 @@ namespace mindspore { namespace lite { class FlattenGrad : public PrimitiveC { public: + FlattenGrad() = default; + ~FlattenGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FlattenGrad, PrimitiveC); - FlattenGrad() = default; explicit FlattenGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - FlattenGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/floor.h b/mindspore/lite/src/ops/floor.h index e2e735259d..285fa61ca9 100644 --- a/mindspore/lite/src/ops/floor.h +++ b/mindspore/lite/src/ops/floor.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class Floor : public ArithmeticSelf { public: + Floor() = default; + ~Floor() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Floor, ArithmeticSelf); - Floor() = default; explicit Floor(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Floor() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/floor_div.h b/mindspore/lite/src/ops/floor_div.h index 255873a696..9a0d43fe9e 100644 --- a/mindspore/lite/src/ops/floor_div.h +++ b/mindspore/lite/src/ops/floor_div.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class FloorDiv : public Arithmetic { public: + FloorDiv() = default; + ~FloorDiv() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FloorDiv, Arithmetic); - FloorDiv() = default; explicit FloorDiv(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - FloorDiv() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/floor_mod.h b/mindspore/lite/src/ops/floor_mod.h index 946f20dbbf..ecd4a44f16 100644 --- a/mindspore/lite/src/ops/floor_mod.h +++ b/mindspore/lite/src/ops/floor_mod.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class FloorMod : public Arithmetic { public: + FloorMod() = default; + ~FloorMod() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FloorMod, Arithmetic); - FloorMod() = default; explicit FloorMod(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - FloorMod() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/full_connection.h b/mindspore/lite/src/ops/full_connection.h index 3001899485..53e3ddd524 100644 --- a/mindspore/lite/src/ops/full_connection.h +++ b/mindspore/lite/src/ops/full_connection.h @@ -26,17 +26,16 @@ namespace mindspore { namespace lite { class FullConnection : public PrimitiveC { public: + FullConnection() = default; + ~FullConnection() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FullConnection, PrimitiveC); - FullConnection() = default; explicit FullConnection(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetHasBias(bool has_bias); void SetAxis(int axis); void SetUseAxis(bool use_axis); void SetActivationType(int activationType); #else - FullConnection() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/fused_batchnorm.h b/mindspore/lite/src/ops/fused_batchnorm.h index c73b083942..3da196b580 100644 --- a/mindspore/lite/src/ops/fused_batchnorm.h +++ b/mindspore/lite/src/ops/fused_batchnorm.h @@ -26,17 +26,16 @@ namespace mindspore { namespace lite { class FusedBatchNorm : public PrimitiveC { public: + FusedBatchNorm() = default; + ~FusedBatchNorm() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(FusedBatchNorm, PrimitiveC); - FusedBatchNorm() = default; explicit FusedBatchNorm(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetEpsilon(float epsilon); void SetMomentum(float momentum); void SetSpatial(int spatial); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - FusedBatchNorm() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/gather.h b/mindspore/lite/src/ops/gather.h index d398391bb7..f7dbc2adce 100644 --- a/mindspore/lite/src/ops/gather.h +++ b/mindspore/lite/src/ops/gather.h @@ -27,16 +27,15 @@ namespace mindspore { namespace lite { class Gather : public PrimitiveC { public: + Gather() = default; + ~Gather() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Gather, PrimitiveC); - Gather() = default; explicit Gather(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(int axis); void SetBatchDims(int batch_dims); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Gather() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/gather_nd.h b/mindspore/lite/src/ops/gather_nd.h index 50ca265784..dd42473df7 100644 --- a/mindspore/lite/src/ops/gather_nd.h +++ b/mindspore/lite/src/ops/gather_nd.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class GatherNd : public PrimitiveC { public: + GatherNd() = default; + ~GatherNd() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(GatherNd, PrimitiveC); - GatherNd() = default; explicit GatherNd(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBatchDims(int batch_dims); #else - GatherNd() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/greater.h b/mindspore/lite/src/ops/greater.h index a2024488ed..61a7773f03 100644 --- a/mindspore/lite/src/ops/greater.h +++ b/mindspore/lite/src/ops/greater.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class Greater : public Arithmetic { public: + Greater() = default; + ~Greater() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Greater, Arithmetic); - Greater() = default; explicit Greater(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - Greater() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/greater_equal.h b/mindspore/lite/src/ops/greater_equal.h index 5a5531a27e..1bd8f5bcc4 100644 --- a/mindspore/lite/src/ops/greater_equal.h +++ b/mindspore/lite/src/ops/greater_equal.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class GreaterEqual : public Arithmetic { public: + GreaterEqual() = default; + ~GreaterEqual() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(GreaterEqual, Arithmetic); - GreaterEqual() = default; explicit GreaterEqual(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - GreaterEqual() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/group_conv2d_grad_input.h b/mindspore/lite/src/ops/group_conv2d_grad_input.h index 2026a524ef..a005ced74d 100644 --- a/mindspore/lite/src/ops/group_conv2d_grad_input.h +++ b/mindspore/lite/src/ops/group_conv2d_grad_input.h @@ -28,9 +28,10 @@ namespace mindspore { namespace lite { class GroupConv2DGradInput : public PrimitiveC { public: + GroupConv2DGradInput() = default; + ~GroupConv2DGradInput() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(GroupConv2DGradInput, PrimitiveC); - GroupConv2DGradInput() = default; explicit GroupConv2DGradInput(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetGroup(int group); @@ -50,8 +51,6 @@ class GroupConv2DGradInput : public PrimitiveC { void SetHasBias(bool has_bias); void SetActivationType(int activation_type); #else - GroupConv2DGradInput() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/hashtable_lookup.h b/mindspore/lite/src/ops/hashtable_lookup.h index ae005444f6..fd8fa86be3 100644 --- a/mindspore/lite/src/ops/hashtable_lookup.h +++ b/mindspore/lite/src/ops/hashtable_lookup.h @@ -23,13 +23,13 @@ namespace mindspore { namespace lite { class HashtableLookup : public PrimitiveC { public: + HashtableLookup() = default; + ~HashtableLookup() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(HashtableLookup, PrimitiveC); - HashtableLookup() = default; explicit HashtableLookup(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - HashtableLookup() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/identity.h b/mindspore/lite/src/ops/identity.h index b58083edbd..a66091e1b7 100644 --- a/mindspore/lite/src/ops/identity.h +++ b/mindspore/lite/src/ops/identity.h @@ -25,6 +25,7 @@ class Identity : public PrimitiveC { public: MS_DECLARE_PARENT(Identity, PrimitiveC); Identity() = default; + ~Identity() = default; explicit Identity(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} }; } // namespace lite diff --git a/mindspore/lite/src/ops/instance_norm.h b/mindspore/lite/src/ops/instance_norm.h index eb12e2a7c3..7f74fc0da2 100644 --- a/mindspore/lite/src/ops/instance_norm.h +++ b/mindspore/lite/src/ops/instance_norm.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class InstanceNorm : public PrimitiveC { public: + InstanceNorm() = default; + ~InstanceNorm() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(InstanceNorm, PrimitiveC); - InstanceNorm() = default; explicit InstanceNorm(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetEpsilon(float epsilon); #else - InstanceNorm() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetEpsilon() const; diff --git a/mindspore/lite/src/ops/l2_norm.h b/mindspore/lite/src/ops/l2_norm.h index 65f3c10967..e4e0aefb25 100644 --- a/mindspore/lite/src/ops/l2_norm.h +++ b/mindspore/lite/src/ops/l2_norm.h @@ -28,16 +28,15 @@ namespace mindspore { namespace lite { class L2Norm : public PrimitiveC { public: + L2Norm() = default; + ~L2Norm() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(L2Norm, PrimitiveC); - L2Norm() = default; explicit L2Norm(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(const std::vector &axis); void SetEpsilon(float epsilon); void SetActivationType(int activationType); #else - L2Norm() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetAxis() const; diff --git a/mindspore/lite/src/ops/layer_norm.h b/mindspore/lite/src/ops/layer_norm.h index 4eca3e242b..7e3d947665 100644 --- a/mindspore/lite/src/ops/layer_norm.h +++ b/mindspore/lite/src/ops/layer_norm.h @@ -27,16 +27,15 @@ namespace mindspore { namespace lite { class LayerNorm : public PrimitiveC { public: + LayerNorm() = default; + ~LayerNorm() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LayerNorm, PrimitiveC); - LayerNorm() = default; explicit LayerNorm(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetNormalizedShape(const std::vector &normalizedShape); void SetEpsilon(float epsilon); void SetElementwiseAffine(bool elementwiseAffine); #else - LayerNorm() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/leaky_relu.h b/mindspore/lite/src/ops/leaky_relu.h index 07382dfd3e..64922f1afa 100644 --- a/mindspore/lite/src/ops/leaky_relu.h +++ b/mindspore/lite/src/ops/leaky_relu.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class LeakyReLU : public PrimitiveC { public: + LeakyReLU() = default; + ~LeakyReLU() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LeakyReLU, PrimitiveC); - LeakyReLU() = default; explicit LeakyReLU(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetNegativeSlope(float negative_slope); #else - LeakyReLU() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetNegativeSlope() const; diff --git a/mindspore/lite/src/ops/less.h b/mindspore/lite/src/ops/less.h index 6bf7bf35c6..09eeeccebb 100644 --- a/mindspore/lite/src/ops/less.h +++ b/mindspore/lite/src/ops/less.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Less : public Arithmetic { public: + Less() = default; + ~Less() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Less, Arithmetic); - Less() = default; explicit Less(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - Less() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/less_equal.h b/mindspore/lite/src/ops/less_equal.h index a86395497a..20589b4eca 100644 --- a/mindspore/lite/src/ops/less_equal.h +++ b/mindspore/lite/src/ops/less_equal.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class LessEqual : public Arithmetic { public: + LessEqual() = default; + ~LessEqual() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LessEqual, Arithmetic); - LessEqual() = default; explicit LessEqual(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - LessEqual() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/local_response_normalization.h b/mindspore/lite/src/ops/local_response_normalization.h index 6403b58458..972a38c4b0 100644 --- a/mindspore/lite/src/ops/local_response_normalization.h +++ b/mindspore/lite/src/ops/local_response_normalization.h @@ -27,17 +27,16 @@ namespace mindspore { namespace lite { class LocalResponseNormalization : public PrimitiveC { public: + LocalResponseNormalization() = default; + ~LocalResponseNormalization() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LocalResponseNormalization, PrimitiveC); - LocalResponseNormalization() = default; explicit LocalResponseNormalization(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetDepthRadius(int depth_radius); void SetBias(float bias); void SetAlpha(float alpha); void SetBeta(float beta); #else - LocalResponseNormalization() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetDepthRadius() const; diff --git a/mindspore/lite/src/ops/log.h b/mindspore/lite/src/ops/log.h index 3cb6008183..f742e087e8 100644 --- a/mindspore/lite/src/ops/log.h +++ b/mindspore/lite/src/ops/log.h @@ -27,14 +27,13 @@ namespace mindspore { namespace lite { class Log : public ArithmeticSelf { public: + Log() = default; + ~Log() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Log, ArithmeticSelf); - Log() = default; explicit Log(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Log() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/log_grad.h b/mindspore/lite/src/ops/log_grad.h index 0ba5673b15..6c88dd5a1a 100644 --- a/mindspore/lite/src/ops/log_grad.h +++ b/mindspore/lite/src/ops/log_grad.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class LogGrad : public PrimitiveC { public: + LogGrad() = default; + ~LogGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LogGrad, PrimitiveC); - LogGrad() = default; explicit LogGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - LogGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/logical_and.h b/mindspore/lite/src/ops/logical_and.h index 0ec574bccf..765a7cb5d9 100644 --- a/mindspore/lite/src/ops/logical_and.h +++ b/mindspore/lite/src/ops/logical_and.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class LogicalAnd : public Arithmetic { public: + LogicalAnd() = default; + ~LogicalAnd() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LogicalAnd, Arithmetic); - LogicalAnd() = default; explicit LogicalAnd(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - LogicalAnd() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/logical_not.h b/mindspore/lite/src/ops/logical_not.h index 74737744c0..53b511c104 100644 --- a/mindspore/lite/src/ops/logical_not.h +++ b/mindspore/lite/src/ops/logical_not.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class LogicalNot : public ArithmeticSelf { public: + LogicalNot() = default; + ~LogicalNot() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LogicalNot, ArithmeticSelf); - LogicalNot() = default; explicit LogicalNot(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - LogicalNot() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/logical_or.h b/mindspore/lite/src/ops/logical_or.h index 5499c45a7a..5c342410bf 100644 --- a/mindspore/lite/src/ops/logical_or.h +++ b/mindspore/lite/src/ops/logical_or.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class LogicalOr : public Arithmetic { public: + LogicalOr() = default; + ~LogicalOr() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LogicalOr, Arithmetic); - LogicalOr() = default; explicit LogicalOr(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - LogicalOr() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/lrn.h b/mindspore/lite/src/ops/lrn.h index 746cad03e1..fac65bd8ef 100644 --- a/mindspore/lite/src/ops/lrn.h +++ b/mindspore/lite/src/ops/lrn.h @@ -27,17 +27,16 @@ namespace mindspore { namespace lite { class Lrn : public PrimitiveC { public: + Lrn() = default; + ~Lrn() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Lrn, PrimitiveC); - Lrn() = default; explicit Lrn(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAlpha(float alpha); void SetBeta(float beta); void SetBias(float bias); void SetSize(int size); #else - Lrn() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetAlpha() const; diff --git a/mindspore/lite/src/ops/lsh_projection.h b/mindspore/lite/src/ops/lsh_projection.h index 4c4696e72f..8888d4d73f 100644 --- a/mindspore/lite/src/ops/lsh_projection.h +++ b/mindspore/lite/src/ops/lsh_projection.h @@ -23,13 +23,13 @@ namespace mindspore { namespace lite { class LshProjection : public PrimitiveC { public: + LshProjection() = default; + ~LshProjection() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(LshProjection, PrimitiveC); - LshProjection() = default; explicit LshProjection(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - LshProjection() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/lstm.h b/mindspore/lite/src/ops/lstm.h index 7c8fe7b708..7944b97370 100644 --- a/mindspore/lite/src/ops/lstm.h +++ b/mindspore/lite/src/ops/lstm.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class Lstm : public PrimitiveC { public: + Lstm() = default; + ~Lstm() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Lstm, PrimitiveC); - Lstm() = default; explicit Lstm(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBidirection(bool bidirection); #else - Lstm() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/make_tuple.h b/mindspore/lite/src/ops/make_tuple.h index 689ae0efdc..5a7611af48 100644 --- a/mindspore/lite/src/ops/make_tuple.h +++ b/mindspore/lite/src/ops/make_tuple.h @@ -23,14 +23,13 @@ namespace mindspore { namespace lite { class MakeTuple : public PrimitiveC { public: + MakeTuple() = default; + ~MakeTuple() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(MakeTuple, PrimitiveC); - MakeTuple() = default; explicit MakeTuple(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - MakeTuple() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/matmul.h b/mindspore/lite/src/ops/matmul.h index 0ee3239836..9c2d1b650a 100644 --- a/mindspore/lite/src/ops/matmul.h +++ b/mindspore/lite/src/ops/matmul.h @@ -25,25 +25,18 @@ namespace mindspore { namespace lite { class MatMul : public PrimitiveC { -#ifdef PRIMITIVE_WRITEABLE - MS_DECLARE_PARENT(MatMul, PrimitiveC); - public: MatMul() = default; + ~MatMul() = default; +#ifdef PRIMITIVE_WRITEABLE + MS_DECLARE_PARENT(MatMul, PrimitiveC); explicit MatMul(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetTransposeA(bool transpose_a); void SetTransposeB(bool transpose_b); - #else - - public: - MatMul() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif - - public: int InferShape(std::vector inputs_, std::vector outputs_) override; bool GetTransposeA() const; bool GetTransposeB() const; diff --git a/mindspore/lite/src/ops/matrix_diag.h b/mindspore/lite/src/ops/matrix_diag.h index ec75d58944..7e5cd52ae0 100644 --- a/mindspore/lite/src/ops/matrix_diag.h +++ b/mindspore/lite/src/ops/matrix_diag.h @@ -27,17 +27,16 @@ namespace mindspore { namespace lite { class MatrixDiag : public PrimitiveC { public: + MatrixDiag() = default; + ~MatrixDiag() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(MatrixDiag, PrimitiveC); - MatrixDiag() = default; explicit MatrixDiag(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetK(int k); void SetNumRows(int num_rows); void SetNumCols(int num_cols); void SetPaddingValue(float padding_value); #else - MatrixDiag() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetK() const; diff --git a/mindspore/lite/src/ops/maximum.h b/mindspore/lite/src/ops/maximum.h index e8c0ae6eec..9b85e202c3 100644 --- a/mindspore/lite/src/ops/maximum.h +++ b/mindspore/lite/src/ops/maximum.h @@ -28,14 +28,13 @@ namespace mindspore { namespace lite { class Maximum : public Arithmetic { public: + Maximum() = default; + ~Maximum() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Arithmetic, Arithmetic); - Maximum() = default; explicit Maximum(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Maximum() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/mean.h b/mindspore/lite/src/ops/mean.h index 97b3835434..d875bf2451 100644 --- a/mindspore/lite/src/ops/mean.h +++ b/mindspore/lite/src/ops/mean.h @@ -28,15 +28,14 @@ namespace mindspore { namespace lite { class Mean : public PrimitiveC { public: + Mean() = default; + ~Mean() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Mean, PrimitiveC); - Mean() = default; explicit Mean(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(const std::vector &axis); void SetKeepDims(bool keep_dims); #else - Mean() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/mfcc.h b/mindspore/lite/src/ops/mfcc.h index 063a7ddb4b..8b94599226 100644 --- a/mindspore/lite/src/ops/mfcc.h +++ b/mindspore/lite/src/ops/mfcc.h @@ -26,9 +26,10 @@ namespace mindspore { namespace lite { class Mfcc : public PrimitiveC { public: + Mfcc() = default; + ~Mfcc() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Mfcc, PrimitiveC); - Mfcc() = default; explicit Mfcc(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFreqUpperLimit(float freq_upper_limit) { this->primitive_->value.AsMfcc()->freqUpperLimit = freq_upper_limit; @@ -41,8 +42,6 @@ class Mfcc : public PrimitiveC { } void SetDctCoeffNum(int dct_coeff_num) { this->primitive_->value.AsMfcc()->dctCoeffNum = dct_coeff_num; } #else - Mfcc() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetFreqUpperLimit() const; diff --git a/mindspore/lite/src/ops/minimum.h b/mindspore/lite/src/ops/minimum.h index d69e5c1597..72f3ae26c2 100644 --- a/mindspore/lite/src/ops/minimum.h +++ b/mindspore/lite/src/ops/minimum.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Minimum : public Arithmetic { public: + Minimum() = default; + ~Minimum() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Arithmetic, Arithmetic); - Minimum() = default; explicit Minimum(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - Minimum() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/mul.h b/mindspore/lite/src/ops/mul.h index bcddee5fe4..65b31556d7 100644 --- a/mindspore/lite/src/ops/mul.h +++ b/mindspore/lite/src/ops/mul.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class Mul : public Arithmetic { public: + Mul() = default; + ~Mul() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Mul, Arithmetic); - Mul() = default; explicit Mul(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} void SetActivationType(int activation_type); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Mul() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetActivationType() const; diff --git a/mindspore/lite/src/ops/nchw2nhwc.h b/mindspore/lite/src/ops/nchw2nhwc.h index 77a9b8fbc0..5894e993b5 100644 --- a/mindspore/lite/src/ops/nchw2nhwc.h +++ b/mindspore/lite/src/ops/nchw2nhwc.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Nchw2Nhwc : public PrimitiveC { public: + Nchw2Nhwc() = default; + ~Nchw2Nhwc() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Nchw2Nhwc, PrimitiveC); - Nchw2Nhwc() = default; explicit Nchw2Nhwc(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - Nchw2Nhwc() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/neg.h b/mindspore/lite/src/ops/neg.h index e68b5c0c12..e22c346d12 100644 --- a/mindspore/lite/src/ops/neg.h +++ b/mindspore/lite/src/ops/neg.h @@ -27,14 +27,13 @@ namespace mindspore { namespace lite { class Neg : public ArithmeticSelf { public: + Neg() = default; + ~Neg() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Neg, ArithmeticSelf); - Neg() = default; explicit Neg(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Neg() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/neg_grad.h b/mindspore/lite/src/ops/neg_grad.h index 94def48398..dd31995eaa 100644 --- a/mindspore/lite/src/ops/neg_grad.h +++ b/mindspore/lite/src/ops/neg_grad.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class NegGrad : public ArithmeticSelf { public: + NegGrad() = default; + ~NegGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(NegGrad, ArithmeticSelf); - NegGrad() = default; explicit NegGrad(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - NegGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/nhwc2nchw.h b/mindspore/lite/src/ops/nhwc2nchw.h index ad0c2f56e4..f76d22695a 100644 --- a/mindspore/lite/src/ops/nhwc2nchw.h +++ b/mindspore/lite/src/ops/nhwc2nchw.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Nhwc2Nchw : public PrimitiveC { public: + Nhwc2Nchw() = default; + ~Nhwc2Nchw() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Nhwc2Nchw, PrimitiveC); - Nhwc2Nchw() = default; explicit Nhwc2Nchw(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - Nhwc2Nchw() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/non_max_suppression.h b/mindspore/lite/src/ops/non_max_suppression.h index 3de72b980e..ecfcaa3fbc 100644 --- a/mindspore/lite/src/ops/non_max_suppression.h +++ b/mindspore/lite/src/ops/non_max_suppression.h @@ -24,14 +24,13 @@ namespace mindspore { namespace lite { class NonMaxSuppression : public PrimitiveC { public: + NonMaxSuppression() = default; + ~NonMaxSuppression() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(NonMaxSuppression, PrimitiveC); - NonMaxSuppression() = default; explicit NonMaxSuppression(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetCenterPointBox(int centerPointBox); #else - NonMaxSuppression() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/not_equal.h b/mindspore/lite/src/ops/not_equal.h index 77b4cb0fe7..d6c112e4e5 100644 --- a/mindspore/lite/src/ops/not_equal.h +++ b/mindspore/lite/src/ops/not_equal.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class NotEqual : public Arithmetic { public: + NotEqual() = default; + ~NotEqual() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(NotEqual, Arithmetic); - NotEqual() = default; explicit NotEqual(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - NotEqual() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/one_hot.h b/mindspore/lite/src/ops/one_hot.h index b92dc49767..61b3dc522c 100644 --- a/mindspore/lite/src/ops/one_hot.h +++ b/mindspore/lite/src/ops/one_hot.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class OneHot : public PrimitiveC { public: + OneHot() = default; + ~OneHot() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(OneHot, PrimitiveC); - OneHot() = default; explicit OneHot(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(int axis); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - OneHot() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/oneslike.h b/mindspore/lite/src/ops/oneslike.h index dd6cbeadc7..e89095e0d4 100644 --- a/mindspore/lite/src/ops/oneslike.h +++ b/mindspore/lite/src/ops/oneslike.h @@ -25,14 +25,13 @@ namespace mindspore { namespace lite { class OnesLike : public PrimitiveC { public: + OnesLike() = default; + ~OnesLike() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(OnesLike, PrimitiveC); - OnesLike() = default; explicit OnesLike(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - OnesLike() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/p_relu.h b/mindspore/lite/src/ops/p_relu.h index 0d67de0fc2..c8fb191266 100644 --- a/mindspore/lite/src/ops/p_relu.h +++ b/mindspore/lite/src/ops/p_relu.h @@ -28,15 +28,13 @@ namespace mindspore { namespace lite { class PReLU : public Activation { public: + PReLU() = default; + ~PReLU() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(PReLU, Activation); - PReLU() = default; explicit PReLU(schema::PrimitiveT *primitive) : Activation(primitive) {} void SetChannelShared(bool channel_shared); - #else - PReLU() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif bool GetChannelShared() const; diff --git a/mindspore/lite/src/ops/pad.h b/mindspore/lite/src/ops/pad.h index 0e94851446..d7d1348e46 100644 --- a/mindspore/lite/src/ops/pad.h +++ b/mindspore/lite/src/ops/pad.h @@ -28,16 +28,15 @@ namespace mindspore { namespace lite { class Pad : public PrimitiveC { public: + Pad() = default; + ~Pad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Pad, PrimitiveC); - Pad() = default; explicit Pad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetPaddings(const std::vector &paddings); void SetPaddingMode(int padding_mode); void SetConstantValue(float constant_value); #else - Pad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/permute.h b/mindspore/lite/src/ops/permute.h index 75a8704d97..a4b5acfd4b 100644 --- a/mindspore/lite/src/ops/permute.h +++ b/mindspore/lite/src/ops/permute.h @@ -28,12 +28,12 @@ namespace mindspore { namespace lite { class Permute : public PrimitiveC { public: + Permute() = default; + ~Permute() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Permute, PrimitiveC); explicit Permute(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - Permute() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetOrder() const; diff --git a/mindspore/lite/src/ops/pooling.h b/mindspore/lite/src/ops/pooling.h index d782a781d0..5e7572ffa3 100644 --- a/mindspore/lite/src/ops/pooling.h +++ b/mindspore/lite/src/ops/pooling.h @@ -27,9 +27,10 @@ namespace mindspore { namespace lite { class Pooling : public PrimitiveC { public: + Pooling() = default; + ~Pooling() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Pooling, PrimitiveC); - Pooling() = default; explicit Pooling(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetPoolingMode(int pooling_mode); @@ -48,8 +49,6 @@ class Pooling : public PrimitiveC { void SetAvgMode(int avg_mode); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Pooling() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/pooling_grad.h b/mindspore/lite/src/ops/pooling_grad.h index c1feeb0313..1f47d57e60 100644 --- a/mindspore/lite/src/ops/pooling_grad.h +++ b/mindspore/lite/src/ops/pooling_grad.h @@ -28,9 +28,10 @@ namespace mindspore { namespace lite { class PoolingGrad : public PrimitiveC { public: + PoolingGrad() = default; + ~PoolingGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(PoolingGrad, PrimitiveC); - PoolingGrad() = default; explicit PoolingGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetPoolingMode(int pooling_mode); @@ -47,8 +48,6 @@ class PoolingGrad : public PrimitiveC { void SetRoundMode(int round_mode); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - PoolingGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/power.h b/mindspore/lite/src/ops/power.h index d0c9f001ec..2da7dcb86a 100644 --- a/mindspore/lite/src/ops/power.h +++ b/mindspore/lite/src/ops/power.h @@ -27,17 +27,16 @@ namespace mindspore { namespace lite { class Power : public PrimitiveC { public: + Power() = default; + ~Power() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Power, PrimitiveC); - Power() = default; explicit Power(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetPower(float power); void SetScale(float scale); void SetShift(float shift); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Power() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/power_grad.h b/mindspore/lite/src/ops/power_grad.h index 9dd8c9976f..48e67994fd 100644 --- a/mindspore/lite/src/ops/power_grad.h +++ b/mindspore/lite/src/ops/power_grad.h @@ -27,17 +27,16 @@ namespace mindspore { namespace lite { class PowerGrad : public PrimitiveC { public: + PowerGrad() = default; + ~PowerGrad() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(PowerGrad, PrimitiveC); - PowerGrad() = default; explicit PowerGrad(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetPower(float power); void SetScale(float scale); void SetShift(float shift); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - PowerGrad() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif float GetPower() const; diff --git a/mindspore/lite/src/ops/prior_box.h b/mindspore/lite/src/ops/prior_box.h index e89acf609a..4976ea425f 100644 --- a/mindspore/lite/src/ops/prior_box.h +++ b/mindspore/lite/src/ops/prior_box.h @@ -28,9 +28,10 @@ namespace mindspore { namespace lite { class PriorBox : public PrimitiveC { public: + PriorBox() = default; + ~PriorBox() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(PriorBox, PrimitiveC); - PriorBox() = default; explicit PriorBox(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetMinSizes(const std::vector &min_sizes); void SetMaxSizes(const std::vector &max_sizes); @@ -44,8 +45,6 @@ class PriorBox : public PrimitiveC { void SetFlip(bool flip); void SetOffset(float offset); #else - PriorBox() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/quant.h b/mindspore/lite/src/ops/quant.h index 8717585aab..dd854768cf 100644 --- a/mindspore/lite/src/ops/quant.h +++ b/mindspore/lite/src/ops/quant.h @@ -23,13 +23,12 @@ namespace mindspore { namespace lite { class Quant : public PrimitiveC { public: + Quant() = default; + ~Quant() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Quant, PrimitiveC); - Quant() = default; explicit Quant(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; -#else - Quant() = default; #endif }; } // namespace lite diff --git a/mindspore/lite/src/ops/quant_dtype_cast.h b/mindspore/lite/src/ops/quant_dtype_cast.h index 577ad5afac..ec9f75c18f 100644 --- a/mindspore/lite/src/ops/quant_dtype_cast.h +++ b/mindspore/lite/src/ops/quant_dtype_cast.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class QuantDTypeCast : public PrimitiveC { public: + QuantDTypeCast() = default; + ~QuantDTypeCast() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(QuantDTypeCast, PrimitiveC); - QuantDTypeCast() = default; explicit QuantDTypeCast(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetSrcT(int src_t); void SetDstT(int dst_t); #else - QuantDTypeCast() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/range.h b/mindspore/lite/src/ops/range.h index efb541b5ad..1bf8c8b882 100644 --- a/mindspore/lite/src/ops/range.h +++ b/mindspore/lite/src/ops/range.h @@ -27,17 +27,16 @@ namespace mindspore { namespace lite { class Range : public PrimitiveC { public: + Range() = default; + ~Range() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Range, PrimitiveC); - Range() = default; explicit Range(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetDType(int d_type); void SetStart(int start); void SetLimit(int limit); void SetDelta(int delta); #else - Range() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/rank.h b/mindspore/lite/src/ops/rank.h index 0481480577..4ee203ef88 100644 --- a/mindspore/lite/src/ops/rank.h +++ b/mindspore/lite/src/ops/rank.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Rank : public PrimitiveC { public: + Rank() = default; + ~Rank() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Rank, PrimitiveC); - Rank() = default; explicit Rank(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - Rank() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/real_div.h b/mindspore/lite/src/ops/real_div.h index d24647633b..97e1e8c74f 100644 --- a/mindspore/lite/src/ops/real_div.h +++ b/mindspore/lite/src/ops/real_div.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class RealDiv : public Arithmetic { public: + RealDiv() = default; + ~RealDiv() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(RealDiv, Arithmetic); - RealDiv() = default; explicit RealDiv(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - RealDiv() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/reduce.h b/mindspore/lite/src/ops/reduce.h index 3341750ca8..321c942a2d 100644 --- a/mindspore/lite/src/ops/reduce.h +++ b/mindspore/lite/src/ops/reduce.h @@ -29,9 +29,10 @@ namespace mindspore { namespace lite { class Reduce : public PrimitiveC { public: + Reduce() = default; + ~Reduce() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Reduce, PrimitiveC); - Reduce() = default; explicit Reduce(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetAxes(const std::vector &axes); @@ -40,8 +41,6 @@ class Reduce : public PrimitiveC { void SetReduceToEnd(bool reduce_to_end); void SetCoeff(float coeff); #else - Reduce() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/reshape.h b/mindspore/lite/src/ops/reshape.h index 5dadacdb6a..0f423236c1 100644 --- a/mindspore/lite/src/ops/reshape.h +++ b/mindspore/lite/src/ops/reshape.h @@ -28,16 +28,15 @@ namespace mindspore { namespace lite { class Reshape : public PrimitiveC { public: + Reshape() = default; + ~Reshape() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Reshape, PrimitiveC); - Reshape() = default; explicit Reshape(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetFormat(int format); void SetShape(const std::vector &shape); #else - Reshape() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/resize.h b/mindspore/lite/src/ops/resize.h index 4dd40c2895..0dd24033b7 100644 --- a/mindspore/lite/src/ops/resize.h +++ b/mindspore/lite/src/ops/resize.h @@ -27,9 +27,10 @@ namespace mindspore { namespace lite { class Resize : public PrimitiveC { public: + Resize() = default; + ~Resize() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Resize, PrimitiveC); - Resize() = default; explicit Resize(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetMethod(int method); @@ -39,8 +40,6 @@ class Resize : public PrimitiveC { void SetPreserveAspectRatio(bool preserve_aspect_ratio); int UnPackAttr(const Primitive &prim, const std::vector &inputs); #else - Resize() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/return.h b/mindspore/lite/src/ops/return.h index 6896df7e9d..f1c4c389c6 100644 --- a/mindspore/lite/src/ops/return.h +++ b/mindspore/lite/src/ops/return.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Return : public PrimitiveC { public: + Return() = default; + ~Return() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Return, PrimitiveC); - Return() = default; explicit Return(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; -#else - Return() = default; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; }; diff --git a/mindspore/lite/src/ops/reverse.h b/mindspore/lite/src/ops/reverse.h index 5cd8507746..f29d3414a6 100644 --- a/mindspore/lite/src/ops/reverse.h +++ b/mindspore/lite/src/ops/reverse.h @@ -28,15 +28,14 @@ namespace mindspore { namespace lite { class Reverse : public PrimitiveC { public: + Reverse() = default; + ~Reverse() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Reverse, PrimitiveC); - Reverse() = default; explicit Reverse(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(const std::vector &axis); #else - Reverse() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetAxis() const; diff --git a/mindspore/lite/src/ops/reverse_sequence.h b/mindspore/lite/src/ops/reverse_sequence.h index 270f5bdbf1..dd473d1d6f 100644 --- a/mindspore/lite/src/ops/reverse_sequence.h +++ b/mindspore/lite/src/ops/reverse_sequence.h @@ -28,15 +28,14 @@ namespace mindspore { namespace lite { class ReverseSequence : public PrimitiveC { public: + ReverseSequence() = default; + ~ReverseSequence() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ReverseSequence, PrimitiveC); - ReverseSequence() = default; explicit ReverseSequence(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetSeqAxis(int seq_axis); void SetBatchAxis(int batch_axis); #else - ReverseSequence() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/rfft.h b/mindspore/lite/src/ops/rfft.h index 08c01d03ac..0ec0ccd877 100644 --- a/mindspore/lite/src/ops/rfft.h +++ b/mindspore/lite/src/ops/rfft.h @@ -26,14 +26,13 @@ namespace mindspore { namespace lite { class Rfft : public PrimitiveC { public: + Rfft() = default; + ~Rfft() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Rfft, PrimitiveC); - Rfft() = default; explicit Rfft(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFftLength(int fft_length); #else - Rfft() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetFftLength() const; diff --git a/mindspore/lite/src/ops/roi_pooling.h b/mindspore/lite/src/ops/roi_pooling.h index 25432010e9..c1b942fb61 100644 --- a/mindspore/lite/src/ops/roi_pooling.h +++ b/mindspore/lite/src/ops/roi_pooling.h @@ -27,16 +27,15 @@ namespace mindspore { namespace lite { class ROIPooling : public PrimitiveC { public: + ROIPooling() = default; + ~ROIPooling() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ROIPooling, PrimitiveC); - ROIPooling() = default; explicit ROIPooling(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetPooledH(int pooled_h); void SetPooledW(int pooled_w); void SetScale(float scale); #else - ROIPooling() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/round.h b/mindspore/lite/src/ops/round.h index bbff197ef4..9586a797fe 100644 --- a/mindspore/lite/src/ops/round.h +++ b/mindspore/lite/src/ops/round.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Round : public ArithmeticSelf { public: + Round() = default; + ~Round() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Round, ArithmeticSelf); - Round() = default; explicit Round(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Round() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/rsqrt.h b/mindspore/lite/src/ops/rsqrt.h index 91d8364b3a..0ac3c34834 100644 --- a/mindspore/lite/src/ops/rsqrt.h +++ b/mindspore/lite/src/ops/rsqrt.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Rsqrt : public ArithmeticSelf { public: + Rsqrt() = default; + ~Rsqrt() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Rsqrt, ArithmeticSelf); - Rsqrt() = default; explicit Rsqrt(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Rsqrt() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/scale.h b/mindspore/lite/src/ops/scale.h index f7a7ca4985..b0d42762c1 100644 --- a/mindspore/lite/src/ops/scale.h +++ b/mindspore/lite/src/ops/scale.h @@ -27,16 +27,14 @@ namespace mindspore { namespace lite { class Scale : public PrimitiveC { public: + Scale() = default; + ~Scale() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Scale, PrimitiveC); - Scale() = default; explicit Scale(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(int axis); void SetActivationType(int activation_type); - #else - Scale() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetAxis() const; diff --git a/mindspore/lite/src/ops/scatter_nd.h b/mindspore/lite/src/ops/scatter_nd.h index 70fd8096c6..35d33cb540 100644 --- a/mindspore/lite/src/ops/scatter_nd.h +++ b/mindspore/lite/src/ops/scatter_nd.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class ScatterND : public PrimitiveC { public: + ScatterND() = default; + ~ScatterND() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ScatterND, PrimitiveC); - ScatterND() = default; explicit ScatterND(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - ScatterND() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/sgd.h b/mindspore/lite/src/ops/sgd.h index f5b6326ee3..6d4903d77a 100644 --- a/mindspore/lite/src/ops/sgd.h +++ b/mindspore/lite/src/ops/sgd.h @@ -28,14 +28,13 @@ namespace mindspore { namespace lite { class Sgd : public PrimitiveC { public: + Sgd() = default; + ~Sgd() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Sgd, PrimitiveC); - Sgd() = default; explicit Sgd(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Sgd() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/shape.h b/mindspore/lite/src/ops/shape.h index 3f00b2d665..b38efd28b4 100644 --- a/mindspore/lite/src/ops/shape.h +++ b/mindspore/lite/src/ops/shape.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class Shape : public PrimitiveC { public: + Shape() = default; + ~Shape() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Shape, PrimitiveC); - Shape() = default; explicit Shape(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - Shape() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/sin.h b/mindspore/lite/src/ops/sin.h index 3e798e7266..ecae5ddccd 100644 --- a/mindspore/lite/src/ops/sin.h +++ b/mindspore/lite/src/ops/sin.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Sin : public ArithmeticSelf { public: + Sin() = default; + ~Sin() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Sin, ArithmeticSelf); - Sin() = default; explicit Sin(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Sin() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/skip_gram.h b/mindspore/lite/src/ops/skip_gram.h index 90c28a871f..b2a7a570d7 100644 --- a/mindspore/lite/src/ops/skip_gram.h +++ b/mindspore/lite/src/ops/skip_gram.h @@ -26,17 +26,16 @@ namespace mindspore { namespace lite { class SkipGram : public PrimitiveC { public: + SkipGram() = default; + ~SkipGram() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SkipGram, PrimitiveC); - SkipGram() = default; explicit SkipGram(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetNgramSize(int ngram_size); void SetMaxSkipSize(int max_skip_size); void SetIncludeAllNgrams(bool include_all_ngrams); #else - SkipGram() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/slice.h b/mindspore/lite/src/ops/slice.h index eb520be8db..73c26c49be 100644 --- a/mindspore/lite/src/ops/slice.h +++ b/mindspore/lite/src/ops/slice.h @@ -28,17 +28,16 @@ namespace mindspore { namespace lite { class Slice : public PrimitiveC { public: + Slice() = default; + ~Slice() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Slice, PrimitiveC); - Slice() = default; explicit Slice(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetFormat(int format); void SetBegin(const std::vector &begin); void SetSize(const std::vector &size); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Slice() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/softmax.h b/mindspore/lite/src/ops/softmax.h index 8dd425162f..656cbbc1cb 100644 --- a/mindspore/lite/src/ops/softmax.h +++ b/mindspore/lite/src/ops/softmax.h @@ -27,16 +27,15 @@ namespace mindspore { namespace lite { class SoftMax : public PrimitiveC { public: + SoftMax() = default; + ~SoftMax() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SoftMax, PrimitiveC); - SoftMax() = default; explicit SoftMax(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetAxis(int axis); #else - SoftMax() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/softmax_cross_entropy.h b/mindspore/lite/src/ops/softmax_cross_entropy.h index fb61220994..5eb028dd91 100644 --- a/mindspore/lite/src/ops/softmax_cross_entropy.h +++ b/mindspore/lite/src/ops/softmax_cross_entropy.h @@ -28,15 +28,14 @@ namespace mindspore { namespace lite { class SoftmaxCrossEntropy : public PrimitiveC { public: + SoftmaxCrossEntropy() = default; + ~SoftmaxCrossEntropy() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SoftmaxCrossEntropy, PrimitiveC); - SoftmaxCrossEntropy() = default; explicit SoftmaxCrossEntropy(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(const std::vector &axis); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - SoftmaxCrossEntropy() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/space_to_batch.h b/mindspore/lite/src/ops/space_to_batch.h index 087a2eea30..982120dfc1 100644 --- a/mindspore/lite/src/ops/space_to_batch.h +++ b/mindspore/lite/src/ops/space_to_batch.h @@ -28,15 +28,14 @@ namespace mindspore { namespace lite { class SpaceToBatch : public PrimitiveC { public: + SpaceToBatch() = default; + ~SpaceToBatch() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SpaceToBatch, PrimitiveC); - SpaceToBatch() = default; explicit SpaceToBatch(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBlockShape(const std::vector &block_shape); void SetPaddings(const std::vector &paddings); #else - SpaceToBatch() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs, std::vector outputs) override; diff --git a/mindspore/lite/src/ops/space_to_batch_nd.h b/mindspore/lite/src/ops/space_to_batch_nd.h index 386e322498..3b92211990 100644 --- a/mindspore/lite/src/ops/space_to_batch_nd.h +++ b/mindspore/lite/src/ops/space_to_batch_nd.h @@ -26,15 +26,14 @@ namespace mindspore { namespace lite { class SpaceToBatchND : public PrimitiveC { public: + SpaceToBatchND() = default; + ~SpaceToBatchND() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SpaceToBatchND, PrimitiveC); - SpaceToBatchND() = default; explicit SpaceToBatchND(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBlockShape(const std::vector &block_shape); void SetPaddings(const std::vector &paddings); #else - SpaceToBatchND() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetBlockShape() const; diff --git a/mindspore/lite/src/ops/space_to_depth.h b/mindspore/lite/src/ops/space_to_depth.h index 40801ca618..3c85c2d272 100644 --- a/mindspore/lite/src/ops/space_to_depth.h +++ b/mindspore/lite/src/ops/space_to_depth.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class SpaceToDepth : public PrimitiveC { public: + SpaceToDepth() = default; + ~SpaceToDepth() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SpaceToDepth, PrimitiveC); - SpaceToDepth() = default; explicit SpaceToDepth(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBlockSize(int block_size); void SetFormat(int format); #else - SpaceToDepth() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/sparse_to_dense.h b/mindspore/lite/src/ops/sparse_to_dense.h index 92183768dd..54599efc88 100644 --- a/mindspore/lite/src/ops/sparse_to_dense.h +++ b/mindspore/lite/src/ops/sparse_to_dense.h @@ -28,17 +28,16 @@ namespace mindspore { namespace lite { class SparseToDense : public PrimitiveC { public: + SparseToDense() = default; + ~SparseToDense() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SparseToDense, PrimitiveC); - SparseToDense() = default; explicit SparseToDense(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetOutputShape(const std::vector &output_shape); void SetSparseValue(const std::vector &sparse_value); void SetDefaultValue(const std::vector &default_value); void SetValidateIndices(bool validate_indices); #else - SparseToDense() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif std::vector GetOutputShape() const; diff --git a/mindspore/lite/src/ops/split.h b/mindspore/lite/src/ops/split.h index edc52349be..959bb9a86a 100644 --- a/mindspore/lite/src/ops/split.h +++ b/mindspore/lite/src/ops/split.h @@ -28,17 +28,16 @@ namespace mindspore { namespace lite { class Split : public PrimitiveC { public: + Split() = default; + ~Split() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Split, PrimitiveC); - Split() = default; explicit Split(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetNumberSplit(int number_split); void SetSizeSplits(const std::vector &size_splits); void SetSplitDim(int split_dim); int UnPackAttr(const Primitive &prim, const std::vector &inputs); #else - Split() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/sqrt.h b/mindspore/lite/src/ops/sqrt.h index bc6c573d13..12c7412baf 100644 --- a/mindspore/lite/src/ops/sqrt.h +++ b/mindspore/lite/src/ops/sqrt.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class Sqrt : public ArithmeticSelf { public: + Sqrt() = default; + ~Sqrt() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Sqrt, ArithmeticSelf); - Sqrt() = default; explicit Sqrt(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Sqrt() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/square.h b/mindspore/lite/src/ops/square.h index 9482330b5b..890087cc63 100644 --- a/mindspore/lite/src/ops/square.h +++ b/mindspore/lite/src/ops/square.h @@ -26,13 +26,12 @@ namespace mindspore { namespace lite { class Square : public ArithmeticSelf { public: + Square() = default; + ~Square() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Square, ArithmeticSelf); - Square() = default; explicit Square(schema::PrimitiveT *primitive) : ArithmeticSelf(primitive) {} #else - Square() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/squared_difference.h b/mindspore/lite/src/ops/squared_difference.h index 79be11a5e0..1847979bb4 100644 --- a/mindspore/lite/src/ops/squared_difference.h +++ b/mindspore/lite/src/ops/squared_difference.h @@ -27,13 +27,12 @@ namespace mindspore { namespace lite { class SquaredDifference : public Arithmetic { public: + SquaredDifference() = default; + ~SquaredDifference() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(SquaredDifference, Arithmetic); - SquaredDifference() = default; explicit SquaredDifference(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} #else - SquaredDifference() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/squeeze.h b/mindspore/lite/src/ops/squeeze.h index 6929e5035d..16f95eaddc 100644 --- a/mindspore/lite/src/ops/squeeze.h +++ b/mindspore/lite/src/ops/squeeze.h @@ -28,16 +28,15 @@ namespace mindspore { namespace lite { class Squeeze : public PrimitiveC { public: + Squeeze() = default; + ~Squeeze() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Squeeze, PrimitiveC); - Squeeze() = default; explicit Squeeze(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(const std::vector &axis); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Squeeze() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/stack.h b/mindspore/lite/src/ops/stack.h index ffdcaa4a46..dab5637028 100644 --- a/mindspore/lite/src/ops/stack.h +++ b/mindspore/lite/src/ops/stack.h @@ -28,16 +28,15 @@ namespace mindspore { namespace lite { class Stack : public PrimitiveC { public: + Stack() = default; + ~Stack() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Stack, PrimitiveC); - Stack() = default; explicit Stack(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(int axis); void SetN(int n); void SetIsScale(const std::vector &is_scale); #else - Stack() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/strided_slice.h b/mindspore/lite/src/ops/strided_slice.h index 03343c8788..8924cfcebe 100644 --- a/mindspore/lite/src/ops/strided_slice.h +++ b/mindspore/lite/src/ops/strided_slice.h @@ -28,9 +28,10 @@ namespace mindspore { namespace lite { class StridedSlice : public PrimitiveC { public: + StridedSlice() = default; + ~StridedSlice() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(StridedSlice, PrimitiveC); - StridedSlice() = default; explicit StridedSlice(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetBeginMask(int begin_mask); void SetEndMask(int end_mask); @@ -43,8 +44,6 @@ class StridedSlice : public PrimitiveC { void SetIsScale(const std::vector &is_scale); int UnPackAttr(const Primitive &prim, const std::vector &inputs); #else - StridedSlice() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/sub.h b/mindspore/lite/src/ops/sub.h index 375a816695..559c1df443 100644 --- a/mindspore/lite/src/ops/sub.h +++ b/mindspore/lite/src/ops/sub.h @@ -27,16 +27,15 @@ namespace mindspore { namespace lite { class Sub : public Arithmetic { public: + Sub() = default; + ~Sub() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Sub, Arithmetic); - Sub() = default; explicit Sub(schema::PrimitiveT *primitive) : Arithmetic(primitive) {} void SetActivationType(int activation_type); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Sub() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int GetActivationType() const; diff --git a/mindspore/lite/src/ops/tile.h b/mindspore/lite/src/ops/tile.h index 475018ed6c..70e266d8a1 100644 --- a/mindspore/lite/src/ops/tile.h +++ b/mindspore/lite/src/ops/tile.h @@ -28,17 +28,16 @@ namespace mindspore { namespace lite { class Tile : public PrimitiveC { public: + Tile() = default; + ~Tile() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Tile, PrimitiveC); - Tile() = default; explicit Tile(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetMultiples(const std::vector &multiples); void SetDims(const std::vector &dims); int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - Tile() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/topk.h b/mindspore/lite/src/ops/topk.h index 054952718d..2a1cb57ce7 100644 --- a/mindspore/lite/src/ops/topk.h +++ b/mindspore/lite/src/ops/topk.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class TopK : public PrimitiveC { public: + TopK() = default; + ~TopK() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(TopK, PrimitiveC); - TopK() = default; explicit TopK(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetK(int k); void SetSorted(bool sorted); #else - TopK() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/transpose.h b/mindspore/lite/src/ops/transpose.h index 4f38f318c4..6d907716a2 100644 --- a/mindspore/lite/src/ops/transpose.h +++ b/mindspore/lite/src/ops/transpose.h @@ -28,16 +28,15 @@ namespace mindspore { namespace lite { class Transpose : public PrimitiveC { public: + Transpose() = default; + ~Transpose() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Transpose, PrimitiveC); - Transpose() = default; explicit Transpose(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetPerm(const std::vector &perm); void SetConjugate(bool conjugate); #else - Transpose() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/tuple_get_item.h b/mindspore/lite/src/ops/tuple_get_item.h index e816c122b6..eb4f8472fd 100644 --- a/mindspore/lite/src/ops/tuple_get_item.h +++ b/mindspore/lite/src/ops/tuple_get_item.h @@ -24,13 +24,13 @@ namespace mindspore { namespace lite { class TupleGetItem : public PrimitiveC { public: + TupleGetItem() = default; + ~TupleGetItem() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(TupleGetItem, PrimitiveC); - TupleGetItem() = default; explicit TupleGetItem(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; #else - TupleGetItem() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif }; diff --git a/mindspore/lite/src/ops/unique.h b/mindspore/lite/src/ops/unique.h index 7f6e83f6e6..449b4591bd 100644 --- a/mindspore/lite/src/ops/unique.h +++ b/mindspore/lite/src/ops/unique.h @@ -27,14 +27,14 @@ namespace mindspore { namespace lite { class Unique : public PrimitiveC { public: + Unique() = default; + ~Unique() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Unique, PrimitiveC); - Unique() = default; explicit Unique(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetOutType(int out_type); #else - Unique() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif diff --git a/mindspore/lite/src/ops/unsorted_segment_sum.h b/mindspore/lite/src/ops/unsorted_segment_sum.h index 176c33bcad..3524c67649 100644 --- a/mindspore/lite/src/ops/unsorted_segment_sum.h +++ b/mindspore/lite/src/ops/unsorted_segment_sum.h @@ -24,15 +24,14 @@ namespace mindspore { namespace lite { class UnsortedSegmentSum : public PrimitiveC { public: + UnsortedSegmentSum() = default; + ~UnsortedSegmentSum() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(UnsortedSegmentSum, PrimitiveC); - UnsortedSegmentSum() = default; explicit UnsortedSegmentSum(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; int GetNumSegments() const; #else - UnsortedSegmentSum() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; int GetNumSegments() const; diff --git a/mindspore/lite/src/ops/unsqueeze.h b/mindspore/lite/src/ops/unsqueeze.h index 0aaddfb9a0..927417a226 100644 --- a/mindspore/lite/src/ops/unsqueeze.h +++ b/mindspore/lite/src/ops/unsqueeze.h @@ -28,15 +28,13 @@ namespace mindspore { namespace lite { class Unsqueeze : public PrimitiveC { public: + Unsqueeze() = default; + ~Unsqueeze() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Unsqueeze, PrimitiveC); - Unsqueeze() = default; explicit Unsqueeze(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetAxis(const std::vector &axis); - #else - Unsqueeze() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/unstack.h b/mindspore/lite/src/ops/unstack.h index 17f372caa7..b1e25f6a92 100644 --- a/mindspore/lite/src/ops/unstack.h +++ b/mindspore/lite/src/ops/unstack.h @@ -27,15 +27,14 @@ namespace mindspore { namespace lite { class Unstack : public PrimitiveC { public: + Unstack() = default; + ~Unstack() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Unstack, PrimitiveC); - Unstack() = default; explicit Unstack(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetNum(int num); void SetAxis(int axis); #else - Unstack() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/upsample.h b/mindspore/lite/src/ops/upsample.h index 8cde562338..9f57b95601 100644 --- a/mindspore/lite/src/ops/upsample.h +++ b/mindspore/lite/src/ops/upsample.h @@ -29,14 +29,14 @@ namespace mindspore { namespace lite { class Upsample : public PrimitiveC { public: + Upsample() = default; + ~Upsample() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Upsample, PrimitiveC); - Upsample() = default; explicit Upsample(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetMode(std::string mode); void SetScales(const std::vector &scales); #else - Upsample() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif diff --git a/mindspore/lite/src/ops/where.h b/mindspore/lite/src/ops/where.h index 2c85f369a9..5976ce9ccd 100644 --- a/mindspore/lite/src/ops/where.h +++ b/mindspore/lite/src/ops/where.h @@ -28,15 +28,13 @@ namespace mindspore { namespace lite { class Where : public PrimitiveC { public: + Where() = default; + ~Where() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(Where, PrimitiveC); - Where() = default; explicit Where(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} void SetCondition(const std::vector &condition); - #else - Where() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/while.h b/mindspore/lite/src/ops/while.h index 1cfaa3378d..113cb121e6 100644 --- a/mindspore/lite/src/ops/while.h +++ b/mindspore/lite/src/ops/while.h @@ -28,17 +28,16 @@ namespace mindspore { namespace lite { class While : public PrimitiveC { public: + While() = default; + ~While() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(While, PrimitiveC); - While() = default; explicit While(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} int UnPackAttr(const Primitive &prim, const std::vector &inputs) override; void SetCondSubgraphIndex(const int cond_subgraph_index); void SetBodySubgraphIndex(const int body_subgraph_index); #else - While() = default; - int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/ops/zeros_like.h b/mindspore/lite/src/ops/zeros_like.h index 155efdbe7f..199598cfd7 100644 --- a/mindspore/lite/src/ops/zeros_like.h +++ b/mindspore/lite/src/ops/zeros_like.h @@ -27,12 +27,12 @@ namespace mindspore { namespace lite { class ZerosLike : public PrimitiveC { public: + ZerosLike() = default; + ~ZerosLike() = default; #ifdef PRIMITIVE_WRITEABLE MS_DECLARE_PARENT(ZerosLike, PrimitiveC); - ZerosLike() = default; explicit ZerosLike(schema::PrimitiveT *primitive) : PrimitiveC(primitive) {} #else - ZerosLike() = default; int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override; #endif int InferShape(std::vector inputs_, std::vector outputs_) override; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc index 70a586bc06..4ea21bc580 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc @@ -224,6 +224,7 @@ int ConvolutionWinogradFP16CPUKernel::Run() { ret = InitTmpBuffer(); if (ret != RET_OK) { MS_LOG(ERROR) << "Init tmp buffer failed."; + FreeTmpBuffer(); return RET_ERROR; }