diff --git a/mindspore/core/base/core_ops.h b/mindspore/core/base/core_ops.h index 37951ef5dd7a79c844f4b21885aa5b08ddb8c942..4bcc0a63fc8b10896d5ebfe600387d7d21e9c595 100644 --- a/mindspore/core/base/core_ops.h +++ b/mindspore/core/base/core_ops.h @@ -288,6 +288,8 @@ inline const PrimitivePtr kPrimSparseTensorGetDenseShape = std::make_shared("TensorListFromTensor"); +inline const PrimitivePtr kPrimTensorListReserve = std::make_shared("TensorListReserve"); +inline const PrimitivePtr kPrimTensorListStack = std::make_shared("TensorListStack"); // Maths inline const PrimitivePtr kPrimCeil = std::make_shared("Ceil"); @@ -397,7 +399,6 @@ inline const PrimitivePtr kPrimEquivFormat = std::make_shared("EquivF inline const PrimitivePtr kPrimLshProjection = std::make_shared("LshProjection"); inline const PrimitivePtr kPrimHashtableLookup = std::make_shared("HashtableLookup"); inline const PrimitivePtr kPrimCustomPredict = std::make_shared("CustomPredict"); -inline const PrimitivePtr kPrimTensorListStack = std::make_shared("TensorListStack"); inline const PrimitivePtr kPrimStack = std::make_shared("Stack"); inline const PrimitivePtr kPrimPriorBox = std::make_shared("PriorBox"); inline const PrimitivePtr kPrimQuantDTypeCast = std::make_shared("QuantDTypeCast"); @@ -442,6 +443,30 @@ inline const PrimitivePtr kPrimMfcc = std::make_shared("Mfcc"); inline const PrimitivePtr kPrimRfft = std::make_shared("Rfft"); inline const PrimitivePtr kPrimFftImag = std::make_shared("FftImag"); inline const PrimitivePtr kPrimSkipGram = std::make_shared("SkipGram"); +inline const PrimitivePtr kPrimConv2DFusion = std::make_shared("Conv2DFusion"); +inline const PrimitivePtr kPrimConv2dTransposeFusion = std::make_shared("Conv2dTransposeFusion"); +inline const PrimitivePtr kPrimDepthWiseConv2DFusion = std::make_shared("DepthWiseConv2DFusion"); +inline const PrimitivePtr kPrimAddFusion = std::make_shared("AddFusion"); +inline const PrimitivePtr kPrimScaleFusion = std::make_shared("ScaleFusion"); +inline const PrimitivePtr kPrimSubFusion = std::make_shared("SubFusion"); +inline const PrimitivePtr kPrimMulFusion = std::make_shared("MulFusion"); +inline const PrimitivePtr kPrimSigmoid = std::make_shared("Sigmoid"); +inline const PrimitivePtr kPrimClip = std::make_shared("Clip"); +inline const PrimitivePtr kPrimHardTanh = std::make_shared("HardTanh"); +inline const PrimitivePtr kPrimDepthWiseConv2DTransposeFusion = + std::make_shared("DepthWiseConv2DTransposeFusion"); +inline const PrimitivePtr kPrimArgMinFusion = std::make_shared("ArgMinFusion"); +inline const PrimitivePtr kPrimArgMaxFusion = std::make_shared("ArgMaxFusion"); +inline const PrimitivePtr kPrimSpaceToDepth = std::make_shared("SpaceToDepth"); +inline const PrimitivePtr kPrimPadFusion = std::make_shared("PadFusion"); +inline const PrimitivePtr kPrimResize = std::make_shared("Resize"); +inline const PrimitivePtr kPrimConv2dTranspose = std::make_shared("Conv2dTranspose"); +inline const PrimitivePtr kPrimArgMinWithValue = std::make_shared("ArgMinWithValue"); +inline const PrimitivePtr kPrimIf = std::make_shared("If"); +inline const PrimitivePtr kPrimAvgPoolFusion = std::make_shared("AvgPoolFusion"); +inline const PrimitivePtr kPrimMaxPoolFusion = std::make_shared("MaxPoolFusion"); +inline const PrimitivePtr kPrimActivation = std::make_shared("Activation"); +inline const PrimitivePtr kPrimReduceFusion = std::make_shared("ReduceFusion"); class DoSignaturePrimitive : public Primitive { public: diff --git a/mindspore/core/c_ops/adder.h b/mindspore/core/c_ops/adder.h index e9e1777e933bae306aa52f022499d7a6ba670ecf..f0f085b6b88afb4f46e7fa5423f6274dbd558c6f 100644 --- a/mindspore/core/c_ops/adder.h +++ b/mindspore/core/c_ops/adder.h @@ -29,7 +29,7 @@ namespace mindspore { constexpr auto kNameAdder = "Adder"; class Adder : public PrimitiveC { public: - Adder() : PrimitiveC(kNameAdder) {} + explicit Adder(const std::string &k_name = kNameAdder) : PrimitiveC(k_name) {} ~Adder() = default; MS_DECLARE_PARENT(Adder, PrimitiveC); void Init(const int64_t in_channel, const int64_t out_channel, const std::vector &kernel_size, diff --git a/mindspore/core/c_ops/fusion/adder_fusion.h b/mindspore/core/c_ops/fusion/adder_fusion.h index cf670ce46a4b4cd29c55453c3422e9e031cf6f1d..8b096260711a4eb670a1770ad53137a1c944b245 100644 --- a/mindspore/core/c_ops/fusion/adder_fusion.h +++ b/mindspore/core/c_ops/fusion/adder_fusion.h @@ -29,6 +29,7 @@ namespace mindspore { constexpr auto kNameAdderFusion = "AdderFusion"; class AdderFusion : public Adder { public: + AdderFusion() : Adder(kNameAdderFusion) {} MS_DECLARE_PARENT(AdderFusion, Adder); void Init(const int64_t in_channel, const int64_t out_channel, const std::vector &kernel_size, const PadMode &pad_mode, const std::vector &stride, const std::vector &pad_list, diff --git a/mindspore/core/c_ops/fusion/div_fusion.h b/mindspore/core/c_ops/fusion/div_fusion.h index 877e05565a36f0b17f1eb2730e8720b8aef6909c..258807d873326c0dbda41ba6cccfa1f81b41b9bb 100644 --- a/mindspore/core/c_ops/fusion/div_fusion.h +++ b/mindspore/core/c_ops/fusion/div_fusion.h @@ -24,6 +24,7 @@ namespace mindspore { constexpr auto kNameDivFusion = "DivFusion"; class DivFusion : public Div { public: + DivFusion() : Div(kNameDivFusion) {} MS_DECLARE_PARENT(DivFusion, Div); void Init(const ActivationType &activation_type = NO_ACTIVATION); void set_activation_type(const ActivationType &activation_type); diff --git a/mindspore/core/c_ops/fusion/l2_normalize_fusion.h b/mindspore/core/c_ops/fusion/l2_normalize_fusion.h index 6aedf403b5217f6641be3724b2f5bad76e7ccec1..617c02db454e2278fadfcc93dc37fc058ab5bb14 100644 --- a/mindspore/core/c_ops/fusion/l2_normalize_fusion.h +++ b/mindspore/core/c_ops/fusion/l2_normalize_fusion.h @@ -26,6 +26,7 @@ namespace mindspore { constexpr auto kNameL2NormalizeFusion = "L2NormalizeFusion"; class L2NormalizeFusion : public L2Normalize { public: + L2NormalizeFusion() : L2Normalize(kNameL2NormalizeFusion) {} MS_DECLARE_PARENT(L2NormalizeFusion, L2Normalize); void Init(const std::vector &axis, const float epsilon = 1e-4, const ActivationType &activation_type = NO_ACTIVATION); diff --git a/mindspore/core/c_ops/fusion/sub_fusion.h b/mindspore/core/c_ops/fusion/sub_fusion.h index 2268b40e51aa08d4e9f273198d29c2cf2473618e..9e352c87b5315a3d2859febb44c29e63f93671da 100644 --- a/mindspore/core/c_ops/fusion/sub_fusion.h +++ b/mindspore/core/c_ops/fusion/sub_fusion.h @@ -24,6 +24,7 @@ namespace mindspore { constexpr auto kNameSubFusion = "SubFusion"; class SubFusion : public Sub { public: + SubFusion() : Sub(kNameSubFusion) {} MS_DECLARE_PARENT(SubFusion, Sub); void Init(const ActivationType &activation_type = NO_ACTIVATION); void set_activation_type(const ActivationType &activation_type); diff --git a/mindspore/core/c_ops/fusion/tile_fusion.h b/mindspore/core/c_ops/fusion/tile_fusion.h index 86a978ec5e42b6a28db05f4382820add6574e23d..c76cc756e0994114328e35674db839dae6203883 100644 --- a/mindspore/core/c_ops/fusion/tile_fusion.h +++ b/mindspore/core/c_ops/fusion/tile_fusion.h @@ -26,6 +26,7 @@ namespace mindspore { constexpr auto kNameTileFusion = "TileFusion"; class TileFusion : public Tile { public: + TileFusion() : Tile(kNameTileFusion) {} MS_DECLARE_PARENT(TileFusion, Tile); void Init(const std::vector &dims); void set_dims(const std::vector &dims); diff --git a/mindspore/core/c_ops/fusion/topk_fusion.h b/mindspore/core/c_ops/fusion/topk_fusion.h index d6478a1daef994fbbd3372ed0b0dcdafb58e4b92..418dde43b22ed820773b0f4de70e20c50a22ff6f 100644 --- a/mindspore/core/c_ops/fusion/topk_fusion.h +++ b/mindspore/core/c_ops/fusion/topk_fusion.h @@ -26,6 +26,7 @@ namespace mindspore { constexpr auto kNameTopKFusion = "TopKFusion"; class TopKFusion : public TopK { public: + TopKFusion() : TopK(kNameTopKFusion) {} MS_DECLARE_PARENT(TopKFusion, TopK); void Init(const bool sorted, const int64_t axis, const int64_t largest); void set_axis(const int64_t axis); diff --git a/mindspore/core/c_ops/l2_normalize.h b/mindspore/core/c_ops/l2_normalize.h index 592fd322c4986aa00f5e1ec3d1fe2ff87a7d8e68..2048064fdd53d705e2703f71184f0390dfaa272b 100644 --- a/mindspore/core/c_ops/l2_normalize.h +++ b/mindspore/core/c_ops/l2_normalize.h @@ -18,7 +18,7 @@ #define MINDSPORE_CORE_C_OPS_L2_NORMALIZE_H_ #include #include - +#include #include "c_ops/primitive_c.h" #include "c_ops/op_utils.h" #include "abstract/abstract_value.h" @@ -28,7 +28,7 @@ namespace mindspore { constexpr auto kNameL2Normalize = "L2Normalize"; class L2Normalize : public PrimitiveC { public: - L2Normalize() : PrimitiveC(kNameL2Normalize) {} + explicit L2Normalize(const std::string &name = kNameL2Normalize) : PrimitiveC(name) {} ~L2Normalize() = default; MS_DECLARE_PARENT(L2Normalize, PrimitiveC); void Init(const std::vector &axis, const float epsilon = 1e-4); diff --git a/mindspore/core/c_ops/topk.h b/mindspore/core/c_ops/topk.h index 0630919b36e522798768f3a7f1c8f0466bd8221a..21bc52e470ef92a6902e0ee0d6522e58a83cf247 100644 --- a/mindspore/core/c_ops/topk.h +++ b/mindspore/core/c_ops/topk.h @@ -18,7 +18,7 @@ #define MINDSPORE_CORE_C_OPS_TOPK_H_ #include #include - +#include #include "c_ops/primitive_c.h" #include "abstract/abstract_value.h" #include "utils/check_convert_utils.h" @@ -27,7 +27,9 @@ namespace mindspore { constexpr auto kNameTopK = "TopK"; class TopK : public PrimitiveC { public: - TopK() : PrimitiveC(kNameTopK) { InitIOName({"input", "k"}, {"values", "indices"}); } + explicit TopK(const std::string &k_name = kNameTopK) : PrimitiveC(k_name) { + InitIOName({"input", "k"}, {"values", "indices"}); + } ~TopK() = default; MS_DECLARE_PARENT(TopK, PrimitiveC); void Init(const bool sorted = false);