m53297601
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!8500 [MSLITE][Develop] fix code check

Browse Source 
From: @sunsuodong
Reviewed-by: @zhanghaibo5,@zhang_xue_tong
Signed-off-by: @zhang_xue_tong
pull/8500/MERGE
mindspore-ci-bot 4 years ago committed by Gitee
parent f16509388c 055bcc180f
commit ce18db3f4c
159 changed files with 319 additions and 477 deletions
Show Stats Download Patch File Download Diff File

5
mindspore/lite/src/ops/abs.h
Unescape View File

@ -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
};

5
mindspore/lite/src/ops/activation.h
Unescape View File

@ -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<AnfNodePtr> &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;

5
mindspore/lite/src/ops/activation_grad.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
#else
ActivationGrad() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int GetType() const;

5
mindspore/lite/src/ops/adam.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
#else
Adam() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/add.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
void SetActivationType(int activation_type);
#else
Add() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int GetActivationType() const;

5
mindspore/lite/src/ops/addn.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
#else
AddN() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/apply_momentum.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
#else
ApplyMomentum() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/argmax.h
Unescape View File

@ -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<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/argmin.h
Unescape View File

@ -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<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

4
mindspore/lite/src/ops/arithmetic.h
Unescape View File

@ -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;
}

4
mindspore/lite/src/ops/arithmetic_grad.h
Unescape View File

@ -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;
}

4
mindspore/lite/src/ops/arithmetic_self.h
Unescape View File

@ -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;
}

4
mindspore/lite/src/ops/assign.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
#else
Assign() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/assign_add.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
#else
AssignAdd() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/audio_spectrogram.h
Unescape View File

@ -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;

5
mindspore/lite/src/ops/batch_norm.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
void SetEpsilon(float epsilon);
#else
BatchNorm() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
float GetEpsilon() const;

5
mindspore/lite/src/ops/batch_to_space.h
Unescape View File

@ -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<int> &block_shape);
void SetCrops(const std::vector<int> &crops);
#else
BatchToSpace() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/bias_add.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
void SetAxis(const std::vector<int> &axis);
#else
BiasAdd() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
std::vector<int> GetAxis() const;

5
mindspore/lite/src/ops/bias_grad.h
Unescape View File

@ -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<int> &axis);
int UnPackAttr(const Primitive &prim, const std::vector<AnfNodePtr> &inputs) override;
#else
BiasGrad() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs, std::vector<lite::Tensor *> outputs) override;

6
mindspore/lite/src/ops/binary_cross_entropy.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
int GetReduction() const;
#else
BinaryCrossEntropy() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
int GetReduction() const;

6
mindspore/lite/src/ops/binary_cross_entropy_grad.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
int GetReduction() const;
#else
BinaryCrossEntropyGrad() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
int GetReduction() const;

4
mindspore/lite/src/ops/bn_grad.h
Unescape View File

@ -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<AnfNodePtr> &inputs) override;
#else
BNGrad() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/broadcast_to.h
Unescape View File

@ -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<int> &dst_shape);
#else
BroadcastTo() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/cast.h
Unescape View File

@ -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<AnfNodePtr> &inputs);
#else
Cast() = default;
int UnPackToFlatBuilder(const schema::Primitive *primitive, flatbuffers::FlatBufferBuilder *fbb) override;
#endif
int InferShape(std::vector<lite::Tensor *> inputs_, std::vector<lite::Tensor *> outputs_) override;

5
mindspore/lite/src/ops/ceil.h
Unescape View File

@ -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);

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

Write Preview
Loading…
Cancel
Save