From 2fa49976744209001e11e7f73d0ce8f74fa2d833 Mon Sep 17 00:00:00 2001 From: LianLiguang Date: Thu, 25 Feb 2021 18:58:20 +0800 Subject: [PATCH] remove all of cpp infer reg --- mindspore/core/ops/abs.cc | 1 - mindspore/core/ops/adam.cc | 2 -- mindspore/core/ops/add.cc | 1 - mindspore/core/ops/addn.cc | 2 -- mindspore/core/ops/apply_momentum.cc | 1 - mindspore/core/ops/arg_max.cc | 1 - mindspore/core/ops/arg_min.cc | 1 - mindspore/core/ops/asin.cc | 1 - mindspore/core/ops/assert.cc | 2 -- mindspore/core/ops/assign_add.cc | 1 - mindspore/core/ops/atan.cc | 1 - mindspore/core/ops/audio_spectrogram.cc | 2 -- mindspore/core/ops/avg_pool.cc | 1 - mindspore/core/ops/batch_norm.cc | 1 - mindspore/core/ops/batch_norm_fold.cc | 2 -- mindspore/core/ops/batch_to_space.cc | 1 - mindspore/core/ops/batch_to_space_nd.cc | 1 - mindspore/core/ops/bias_add.cc | 1 - mindspore/core/ops/binary_cross_entropy.cc | 2 -- mindspore/core/ops/broadcast.cc | 1 - mindspore/core/ops/broadcast_to.cc | 2 -- mindspore/core/ops/ceil.cc | 1 - mindspore/core/ops/concat.cc | 2 -- mindspore/core/ops/constant.cc | 1 - mindspore/core/ops/constant_of_shape.cc | 1 - mindspore/core/ops/conv2d.cc | 2 -- mindspore/core/ops/conv2d_transpose.cc | 2 -- mindspore/core/ops/cos.cc | 1 - mindspore/core/ops/crop.cc | 1 - mindspore/core/ops/custom_extract_features.cc | 1 - mindspore/core/ops/custom_normalize.cc | 2 -- mindspore/core/ops/custom_predict.cc | 2 -- mindspore/core/ops/depth_to_space.cc | 1 - mindspore/core/ops/detection_post_process.cc | 1 - mindspore/core/ops/div.cc | 1 - mindspore/core/ops/dropout.cc | 1 - mindspore/core/ops/elu.cc | 2 -- mindspore/core/ops/embedding_lookup.cc | 2 -- mindspore/core/ops/equal.cc | 1 - mindspore/core/ops/exp.cc | 1 - mindspore/core/ops/expand_dims.cc | 1 - mindspore/core/ops/fake_quant_with_min_max_vars.cc | 1 - .../ops/fake_quant_with_min_max_vars_per_channel.cc | 3 --- mindspore/core/ops/fft_imag.cc | 1 - mindspore/core/ops/fft_real.cc | 1 - mindspore/core/ops/fill.cc | 1 - mindspore/core/ops/flatten.cc | 1 - mindspore/core/ops/floor.cc | 1 - mindspore/core/ops/fusion/add_fusion.cc | 1 - mindspore/core/ops/fusion/adder_fusion.cc | 1 - mindspore/core/ops/fusion/avg_pool_fusion.cc | 1 - .../core/ops/fusion/conv2d_backprop_filter_fusion.cc | 1 - mindspore/core/ops/fusion/full_connection.cc | 1 - mindspore/core/ops/fusion/pow_fusion.cc | 1 - mindspore/core/ops/fusion/prelu_fusion.cc | 1 - mindspore/core/ops/fusion/reduce_fusion.cc | 2 -- mindspore/core/ops/fusion/slice_fusion.cc | 2 -- mindspore/core/ops/fusion/tile_fusion.cc | 1 - mindspore/core/ops/fusion/topk_fusion.cc | 1 - mindspore/core/ops/gather.cc | 1 - mindspore/core/ops/gather_nd.cc | 1 - mindspore/core/ops/gelu.cc | 2 -- mindspore/core/ops/grad/avg_pool_grad.cc | 1 - mindspore/core/ops/grad/batch_norm_grad.cc | 2 -- mindspore/core/ops/grad/bias_grad.cc | 1 - mindspore/core/ops/grad/binary_cross_entropy_grad.cc | 2 -- mindspore/core/ops/grad/bn_grad.cc | 1 - mindspore/core/ops/grad/conv2d_backprop_filter.cc | 2 -- mindspore/core/ops/grad/conv2d_backprop_input.cc | 1 - mindspore/core/ops/grad/de_conv2d_grad_filter.cc | 1 - mindspore/core/ops/grad/dropout_grad.cc | 2 -- mindspore/core/ops/grad/flatten_grad.cc | 1 - mindspore/core/ops/grad/group_conv2d_grad_input.cc | 1 - mindspore/core/ops/grad/max_pool_grad.cc | 2 -- mindspore/core/ops/grad/maximum_grad.cc | 1 - mindspore/core/ops/grad/minimum_grad.cc | 1 - mindspore/core/ops/grad/pool_grad.cc | 2 -- .../grad/sigmoid_cross_entropy_with_logits_grad.cc | 3 --- mindspore/core/ops/grad/smooth_l1_loss_grad.cc | 1 - mindspore/core/ops/grad/strided_slice_grad.cc | 1 - mindspore/core/ops/gru.cc | 1 - mindspore/core/ops/hashtable_lookup.cc | 2 -- mindspore/core/ops/l2_normalize.cc | 1 - mindspore/core/ops/leaky_relu.cc | 1 - mindspore/core/ops/less.cc | 1 - mindspore/core/ops/less_equal.cc | 1 - mindspore/core/ops/local_response_normalization.cc | 2 -- mindspore/core/ops/log.cc | 1 - mindspore/core/ops/logical_and.cc | 1 - mindspore/core/ops/logical_not.cc | 2 -- mindspore/core/ops/logical_or.cc | 1 - mindspore/core/ops/lrn.cc | 1 - mindspore/core/ops/lsh_projection.cc | 2 -- mindspore/core/ops/lstm.cc | 2 -- mindspore/core/ops/mat_mul.cc | 1 - mindspore/core/ops/matrix_diag.cc | 1 - mindspore/core/ops/max_pool.cc | 1 - mindspore/core/ops/maximum.cc | 1 - mindspore/core/ops/merge.cc | 2 -- mindspore/core/ops/mfcc.cc | 1 - mindspore/core/ops/minimum.cc | 1 - mindspore/core/ops/neg.cc | 1 - mindspore/core/ops/non_max_suppression.cc | 2 -- mindspore/core/ops/one_hot.cc | 2 -- mindspore/core/ops/ones_like.cc | 1 - mindspore/core/ops/pack.cc | 2 -- mindspore/core/ops/pad.cc | 1 - mindspore/core/ops/pow.cc | 1 - mindspore/core/ops/prelu.cc | 1 - mindspore/core/ops/prior_box.cc | 2 -- mindspore/core/ops/quant_dtype_cast.cc | 2 -- mindspore/core/ops/random_standard_normal.cc | 1 - mindspore/core/ops/range.cc | 1 - mindspore/core/ops/rank.cc | 2 -- mindspore/core/ops/real_div.cc | 1 - mindspore/core/ops/reciprocal.cc | 1 - mindspore/core/ops/reduce.cc | 1 - mindspore/core/ops/relu6.cc | 1 - mindspore/core/ops/reshape.cc | 2 -- mindspore/core/ops/resize_bilinear.cc | 1 - mindspore/core/ops/reverse_sequence.cc | 1 - mindspore/core/ops/reverse_v2.cc | 1 - mindspore/core/ops/rfft.cc | 1 - mindspore/core/ops/roi_pooling.cc | 1 - mindspore/core/ops/round.cc | 1 - mindspore/core/ops/rsqrt.cc | 1 - mindspore/core/ops/scatter_nd.cc | 1 - mindspore/core/ops/shape.cc | 1 - .../core/ops/sigmoid_cross_entropy_with_logits.cc | 2 -- mindspore/core/ops/sin.cc | 1 - mindspore/core/ops/skip_gram.cc | 1 - mindspore/core/ops/smooth_l1_loss.cc | 1 - mindspore/core/ops/softmax.cc | 2 -- .../core/ops/softmax_cross_entropy_with_logits.cc | 3 --- mindspore/core/ops/space_to_batch.cc | 1 - mindspore/core/ops/space_to_batch_nd.cc | 1 - mindspore/core/ops/sparse_softmax_cross_entropy.cc | 2 -- mindspore/core/ops/sparse_to_dense.cc | 1 - mindspore/core/ops/squared_difference.cc | 1 - mindspore/core/ops/squeeze.cc | 2 -- mindspore/core/ops/stack.cc | 2 -- mindspore/core/ops/strided_slice.cc | 11 ++++------- mindspore/core/ops/sub.cc | 1 - mindspore/core/ops/tan.cc | 1 - mindspore/core/ops/tensor_list_from_tensor.cc | 2 -- mindspore/core/ops/tensor_list_get_item.cc | 1 - mindspore/core/ops/tensor_list_reserve.cc | 1 - mindspore/core/ops/tensor_list_set_item.cc | 1 - mindspore/core/ops/tensor_list_stack.cc | 2 -- mindspore/core/ops/tile.cc | 2 -- mindspore/core/ops/topk.cc | 1 - mindspore/core/ops/unpack.cc | 2 -- mindspore/core/ops/unsorted_segment_sum.cc | 1 - mindspore/core/ops/unsqueeze.cc | 1 - mindspore/core/ops/unstack.cc | 2 -- mindspore/core/ops/where.cc | 6 ------ mindspore/core/ops/while.cc | 2 -- tests/ut/cpp/CMakeLists.txt | 1 - 158 files changed, 4 insertions(+), 222 deletions(-) diff --git a/mindspore/core/ops/abs.cc b/mindspore/core/ops/abs.cc index 1e5b04a242..14f55720e0 100644 --- a/mindspore/core/ops/abs.cc +++ b/mindspore/core/ops/abs.cc @@ -56,7 +56,6 @@ AbstractBasePtr AbsInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Abs, prim::kPrimAbs, AbsInfer); REGISTER_PRIMITIVE_C(kNameAbs, Abs); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/adam.cc b/mindspore/core/ops/adam.cc index 909c10a75b..c8071d2e08 100644 --- a/mindspore/core/ops/adam.cc +++ b/mindspore/core/ops/adam.cc @@ -81,8 +81,6 @@ AbstractBasePtr AdamInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt const std::vector &input_args) { return std::make_shared(AdamInfer(primitive, input_args)); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Adam, prim::kPrimAdam, AdamInfer); REGISTER_PRIMITIVE_C(kNameAdam, Adam); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/add.cc b/mindspore/core/ops/add.cc index e091d90d23..58beb2a22a 100644 --- a/mindspore/core/ops/add.cc +++ b/mindspore/core/ops/add.cc @@ -50,7 +50,6 @@ AbstractBasePtr AddInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Add, prim::kPrimAdd, AddInfer); REGISTER_PRIMITIVE_C(kNameAdd, Add); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/addn.cc b/mindspore/core/ops/addn.cc index 1933e3b0fe..fce06ce4c1 100644 --- a/mindspore/core/ops/addn.cc +++ b/mindspore/core/ops/addn.cc @@ -63,8 +63,6 @@ AbstractBasePtr AddNInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(TypeIdToType(infer_type), std::make_shared(element0_shape)); } - -REGISTER_PRIMITIVE_EVAL_IMPL(AddN, prim::kPrimAddN, AddNInfer); REGISTER_PRIMITIVE_C(kNameAddN, AddN); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/apply_momentum.cc b/mindspore/core/ops/apply_momentum.cc index 6be813667d..992bf31baa 100644 --- a/mindspore/core/ops/apply_momentum.cc +++ b/mindspore/core/ops/apply_momentum.cc @@ -80,7 +80,6 @@ AbstractBasePtr ApplyMomentumInfer(const abstract::AnalysisEnginePtr &, const Pr auto element = g_type_tensor->element(); return std::make_shared(element, v_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(ApplyMomentum, prim::kPrimApplyMomentum, ApplyMomentumInfer); REGISTER_PRIMITIVE_C(kNameApplyMomentum, ApplyMomentum); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/arg_max.cc b/mindspore/core/ops/arg_max.cc index 79ef82681c..c2f9537303 100644 --- a/mindspore/core/ops/arg_max.cc +++ b/mindspore/core/ops/arg_max.cc @@ -67,7 +67,6 @@ AbstractBasePtr ArgMaxInfer(const abstract::AnalysisEnginePtr &, const Primitive return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(ArgMax, prim::kPrimArgMax, ArgMaxInfer); REGISTER_PRIMITIVE_C(kNameArgMax, ArgMax); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/arg_min.cc b/mindspore/core/ops/arg_min.cc index 706f4802b0..be88497aef 100644 --- a/mindspore/core/ops/arg_min.cc +++ b/mindspore/core/ops/arg_min.cc @@ -67,7 +67,6 @@ AbstractBasePtr ArgMinInfer(const abstract::AnalysisEnginePtr &, const Primitive return std::make_shared(x_dtype, std::make_shared(out_shape)); } -REGISTER_PRIMITIVE_EVAL_IMPL(ArgMin, prim::kPrimArgMin, ArgMinInfer); REGISTER_PRIMITIVE_C(kNameArgMin, ArgMin); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/asin.cc b/mindspore/core/ops/asin.cc index 5938c58b9e..2fc6275e40 100644 --- a/mindspore/core/ops/asin.cc +++ b/mindspore/core/ops/asin.cc @@ -46,7 +46,6 @@ AbstractBasePtr AsinInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(infer_type, infer_shape->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Asin, prim::kPrimAsin, AsinInfer); REGISTER_PRIMITIVE_C(kNameAsin, Asin); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/assert.cc b/mindspore/core/ops/assert.cc index 9393a9fe0b..c1bd60e255 100644 --- a/mindspore/core/ops/assert.cc +++ b/mindspore/core/ops/assert.cc @@ -71,8 +71,6 @@ AbstractBasePtr AssertInfer(const abstract::AnalysisEnginePtr &, const Primitive } return std::make_shared(TypeIdToType(kNumberTypeInt32), output_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Assert, prim::kPrimAssert, AssertInfer); REGISTER_PRIMITIVE_C(kNameAssert, Assert); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/assign_add.cc b/mindspore/core/ops/assign_add.cc index 59a15d677a..762ef6e15b 100644 --- a/mindspore/core/ops/assign_add.cc +++ b/mindspore/core/ops/assign_add.cc @@ -47,7 +47,6 @@ AbstractBasePtr AssignAddInfer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(AssignAdd, prim::kPrimAssignAdd, AssignAddInfer); REGISTER_PRIMITIVE_C(kNameAssignAdd, AssignAdd); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/atan.cc b/mindspore/core/ops/atan.cc index 499e55dcc5..0d3309efb7 100644 --- a/mindspore/core/ops/atan.cc +++ b/mindspore/core/ops/atan.cc @@ -44,7 +44,6 @@ AbstractBasePtr AtanInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(infer_type, infer_shape->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Atan, prim::kPrimAtan, AtanInfer); REGISTER_PRIMITIVE_C(kNameAtan, Atan); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/audio_spectrogram.cc b/mindspore/core/ops/audio_spectrogram.cc index c2ae4cf98d..46ded529d2 100644 --- a/mindspore/core/ops/audio_spectrogram.cc +++ b/mindspore/core/ops/audio_spectrogram.cc @@ -118,8 +118,6 @@ AbstractBasePtr AudioSpectrogramInfer(const abstract::AnalysisEnginePtr &, const return std::make_shared(AudioSpectrogramInferType(primitive, input_args), AudioSpectrogramInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(AudioSpectrogram, prim::kPrimAudioSpectrogram, AudioSpectrogramInfer); REGISTER_PRIMITIVE_C(kNameAudioSpectrogram, AudioSpectrogram); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/avg_pool.cc b/mindspore/core/ops/avg_pool.cc index 487c6858ee..01d581d6ac 100644 --- a/mindspore/core/ops/avg_pool.cc +++ b/mindspore/core/ops/avg_pool.cc @@ -146,7 +146,6 @@ AbstractBasePtr AvgPoolInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(AvgPool, prim::kPrimAvgPool, AvgPoolInfer); REGISTER_PRIMITIVE_C(kNameAvgPool, AvgPool); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/batch_norm.cc b/mindspore/core/ops/batch_norm.cc index 626ae921b0..507ceea701 100644 --- a/mindspore/core/ops/batch_norm.cc +++ b/mindspore/core/ops/batch_norm.cc @@ -134,7 +134,6 @@ AbstractBasePtr BatchNormInfer(const abstract::AnalysisEnginePtr &, const Primit AbstractBasePtrList output = {output0, output1, output2, output3, output3}; return std::make_shared(output); } -REGISTER_PRIMITIVE_EVAL_IMPL(BatchNorm, prim::kPrimBatchNorm, BatchNormInfer); REGISTER_PRIMITIVE_C(kNameBatchNorm, BatchNorm); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/batch_norm_fold.cc b/mindspore/core/ops/batch_norm_fold.cc index 8801b85924..b98d549f22 100644 --- a/mindspore/core/ops/batch_norm_fold.cc +++ b/mindspore/core/ops/batch_norm_fold.cc @@ -109,8 +109,6 @@ AbstractBasePtr BatchNormFoldInfer(const abstract::AnalysisEnginePtr &, const Pr AbstractBasePtrList output1 = {output, output, output, output}; return std::make_shared(output1); } - -REGISTER_PRIMITIVE_EVAL_IMPL(BatchNormFold, prim::kPrimBatchNormFold, BatchNormFoldInfer); REGISTER_PRIMITIVE_C(kNameBatchNormFold, BatchNormFold); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/batch_to_space.cc b/mindspore/core/ops/batch_to_space.cc index c39a213dbf..7969714e0b 100644 --- a/mindspore/core/ops/batch_to_space.cc +++ b/mindspore/core/ops/batch_to_space.cc @@ -75,7 +75,6 @@ AbstractBasePtr BatchToSpaceInfer(const abstract::AnalysisEnginePtr &, const Pri ret->set_shape(std::make_shared(out_shape)); return ret; } -REGISTER_PRIMITIVE_EVAL_IMPL(BatchToSpace, prim::kPrimBatchToSpace, BatchToSpaceInfer); REGISTER_PRIMITIVE_C(kNameBatchToSpace, BatchToSpace); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/batch_to_space_nd.cc b/mindspore/core/ops/batch_to_space_nd.cc index 4153dc3a16..28bffa73fb 100644 --- a/mindspore/core/ops/batch_to_space_nd.cc +++ b/mindspore/core/ops/batch_to_space_nd.cc @@ -103,7 +103,6 @@ AbstractBasePtr BatchToSpaceNDInfer(const abstract::AnalysisEnginePtr &, const P return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(BatchToSpaceND, prim::kPrimBatchToSpaceND, BatchToSpaceNDInfer); REGISTER_PRIMITIVE_C(kNameBatchToSpaceND, BatchToSpaceND); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/bias_add.cc b/mindspore/core/ops/bias_add.cc index b1009bcc40..359d18093a 100644 --- a/mindspore/core/ops/bias_add.cc +++ b/mindspore/core/ops/bias_add.cc @@ -74,7 +74,6 @@ AbstractBasePtr BiasAddInfer(const abstract::AnalysisEnginePtr &, const Primitiv BiasAddInferShape(primitive, input_args)); } // Add -REGISTER_PRIMITIVE_EVAL_IMPL(BiasAdd, prim::kPrimBiasAdd, BiasAddInfer); REGISTER_PRIMITIVE_C(kNameBiasAdd, BiasAdd); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/binary_cross_entropy.cc b/mindspore/core/ops/binary_cross_entropy.cc index 67d7540eb5..e1795596ee 100644 --- a/mindspore/core/ops/binary_cross_entropy.cc +++ b/mindspore/core/ops/binary_cross_entropy.cc @@ -87,8 +87,6 @@ AbstractBasePtr BinaryCrossEntropyInfer(const abstract::AnalysisEnginePtr &, con return std::make_shared(BinaryCrossEntroyInferType(primitive, input_args), BinaryCrossEntroyInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(BinaryCrossEntropy, prim::kPrimBinaryCrossEntropy, BinaryCrossEntropyInfer); REGISTER_PRIMITIVE_C(kNameBinaryCrossEntropy, BinaryCrossEntropy); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/broadcast.cc b/mindspore/core/ops/broadcast.cc index d426bf1b97..9f82743c46 100644 --- a/mindspore/core/ops/broadcast.cc +++ b/mindspore/core/ops/broadcast.cc @@ -64,7 +64,6 @@ AbstractBasePtr BroadcastInfer(const abstract::AnalysisEnginePtr &, const Primit } return std::make_shared(x_type, in_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(Broadcast, prim::kPrimBroadcast, BroadcastInfer); REGISTER_PRIMITIVE_C(kNameBroadcast, Broadcast); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/broadcast_to.cc b/mindspore/core/ops/broadcast_to.cc index 95e44e9603..ba47a49534 100644 --- a/mindspore/core/ops/broadcast_to.cc +++ b/mindspore/core/ops/broadcast_to.cc @@ -81,8 +81,6 @@ AbstractBasePtr BroadcastToInfer(const abstract::AnalysisEnginePtr &, const Prim return std::make_shared(BroadcastToInferType(primitive, input_args), BroadcastToInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(BroadcastTo, prim::kPrimBroadcastTo, BroadcastToInfer); REGISTER_PRIMITIVE_C(kNameBroadcastTo, BroadcastTo); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/ceil.cc b/mindspore/core/ops/ceil.cc index e3d54d6404..2cb317a005 100644 --- a/mindspore/core/ops/ceil.cc +++ b/mindspore/core/ops/ceil.cc @@ -43,7 +43,6 @@ AbstractBasePtr CeilInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt MS_EXCEPTION_IF_NULL(data_type); return std::make_shared(data_type, x_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(Ceil, prim::kPrimCeil, CeilInfer); REGISTER_PRIMITIVE_C(kNameCeil, Ceil); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/concat.cc b/mindspore/core/ops/concat.cc index 09d69b075c..7c4e9b225c 100644 --- a/mindspore/core/ops/concat.cc +++ b/mindspore/core/ops/concat.cc @@ -78,8 +78,6 @@ AbstractBasePtr ConcatInfer(const abstract::AnalysisEnginePtr &, const Primitive return std::make_shared(TypeIdToType(infer_type), std::make_shared(ret_shape)); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Concat, prim::kPrimConcat, ConcatInfer); REGISTER_PRIMITIVE_C(kNameConcat, Concat); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/constant.cc b/mindspore/core/ops/constant.cc index 7c87d4e7d5..03bc5f0ada 100644 --- a/mindspore/core/ops/constant.cc +++ b/mindspore/core/ops/constant.cc @@ -52,7 +52,6 @@ AbstractBasePtr ConstantInfer(const abstract::AnalysisEnginePtr &, const Primiti return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Constant, prim::kPrimConstant, ConstantInfer); REGISTER_PRIMITIVE_C(kNameConstant, Constant); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/constant_of_shape.cc b/mindspore/core/ops/constant_of_shape.cc index a4ffc2130a..dfea5b8c1f 100644 --- a/mindspore/core/ops/constant_of_shape.cc +++ b/mindspore/core/ops/constant_of_shape.cc @@ -61,7 +61,6 @@ AbstractBasePtr ConstantOfShapeInfer(const abstract::AnalysisEnginePtr &, const return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(ConstantOfShape, prim::kPrimConstantOfShape, ConstantOfShapeInfer); REGISTER_PRIMITIVE_C(kNameConstantOfShape, ConstantOfShape); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/conv2d.cc b/mindspore/core/ops/conv2d.cc index 4851068502..24127da3ed 100644 --- a/mindspore/core/ops/conv2d.cc +++ b/mindspore/core/ops/conv2d.cc @@ -232,8 +232,6 @@ AbstractBasePtr Conv2dInfer(const abstract::AnalysisEnginePtr &, const Primitive return std::make_shared(Conv2dInferType(primitive, input_args), Conv2dInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Conv2D, prim::kPrimConv2D, Conv2dInfer); REGISTER_PRIMITIVE_C(kNameConv2D, Conv2D); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/conv2d_transpose.cc b/mindspore/core/ops/conv2d_transpose.cc index ff9716bb1a..281e5e38a0 100644 --- a/mindspore/core/ops/conv2d_transpose.cc +++ b/mindspore/core/ops/conv2d_transpose.cc @@ -192,8 +192,6 @@ AbstractBasePtr Conv2dTransposeInfer(const abstract::AnalysisEnginePtr &, const return std::make_shared(Conv2dTransposeInferType(primitive, input_args), Conv2dTransposeInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Conv2dTranspose, prim::kPrimConv2DTranspose, Conv2dTransposeInfer); REGISTER_PRIMITIVE_C(kNameConv2dTranspose, Conv2dTranspose); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/cos.cc b/mindspore/core/ops/cos.cc index 3094af960a..dc8b7880b4 100644 --- a/mindspore/core/ops/cos.cc +++ b/mindspore/core/ops/cos.cc @@ -50,7 +50,6 @@ AbstractBasePtr CosInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Cos, prim::kPrimCos, CosInfer); REGISTER_PRIMITIVE_C(kNameCos, Cos); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/crop.cc b/mindspore/core/ops/crop.cc index 9c1a076903..92ea29bc77 100644 --- a/mindspore/core/ops/crop.cc +++ b/mindspore/core/ops/crop.cc @@ -56,7 +56,6 @@ AbstractBasePtr CropInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt auto x_type = input_args[0]->BuildType()->cast()->element(); return std::make_shared(x_type, out_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(Crop, prim::kPrimCrop, CropInfer); REGISTER_PRIMITIVE_C(kNameCrop, Crop); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/custom_extract_features.cc b/mindspore/core/ops/custom_extract_features.cc index 0ef9d64f64..1ea5b15650 100644 --- a/mindspore/core/ops/custom_extract_features.cc +++ b/mindspore/core/ops/custom_extract_features.cc @@ -50,7 +50,6 @@ AbstractBasePtr CustomExtractFeaturesInfer(const abstract::AnalysisEnginePtr &, AbstractBasePtrList output = {output0, output1}; return std::make_shared(output); } -REGISTER_PRIMITIVE_EVAL_IMPL(CustomExtractFeatures, prim::kPrimCustomExtractFeatures, CustomExtractFeaturesInfer); REGISTER_PRIMITIVE_C(kNameCustomExtractFeatures, CustomExtractFeatures); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/custom_normalize.cc b/mindspore/core/ops/custom_normalize.cc index b1f05f777b..0fa67598b9 100644 --- a/mindspore/core/ops/custom_normalize.cc +++ b/mindspore/core/ops/custom_normalize.cc @@ -62,8 +62,6 @@ AbstractBasePtr CustomNormalizeInfer(const abstract::AnalysisEnginePtr &, const return std::make_shared(CustomNormalizeInferType(primitive, input_args), CustomNormalizeInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(CustomNormalize, prim::kPrimCustomNormalize, CustomNormalizeInfer); REGISTER_PRIMITIVE_C(kNameCustomNormalize, CustomNormalize); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/custom_predict.cc b/mindspore/core/ops/custom_predict.cc index a7ddc0c820..1ed40fb978 100644 --- a/mindspore/core/ops/custom_predict.cc +++ b/mindspore/core/ops/custom_predict.cc @@ -58,8 +58,6 @@ AbstractBasePtr CustomPredictInfer(const abstract::AnalysisEnginePtr &, const Pr AbstractBasePtrList output = {output0, output1}; return std::make_shared(output); } - -REGISTER_PRIMITIVE_EVAL_IMPL(CustomPredict, prim::kPrimCustomPredict, CustomPredictInfer); REGISTER_PRIMITIVE_C(kNameCustomPredict, CustomPredict); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/depth_to_space.cc b/mindspore/core/ops/depth_to_space.cc index cb81399d5c..93a0233cd2 100644 --- a/mindspore/core/ops/depth_to_space.cc +++ b/mindspore/core/ops/depth_to_space.cc @@ -81,7 +81,6 @@ AbstractBasePtr DepthToSpaceInfer(const abstract::AnalysisEnginePtr &, const Pri ret->set_shape(std::make_shared(out_shape)); return ret; } -REGISTER_PRIMITIVE_EVAL_IMPL(DepthToSpace, prim::kPrimDepthToSpace, DepthToSpaceInfer); REGISTER_PRIMITIVE_C(kNameDepthToSpace, DepthToSpace); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/detection_post_process.cc b/mindspore/core/ops/detection_post_process.cc index ebba540e7d..708f37df59 100644 --- a/mindspore/core/ops/detection_post_process.cc +++ b/mindspore/core/ops/detection_post_process.cc @@ -168,7 +168,6 @@ AbstractBasePtr DetectionPostProcessInfer(const abstract::AnalysisEnginePtr &, c } return std::make_shared(output); } -REGISTER_PRIMITIVE_EVAL_IMPL(DetectionPostProcess, prim::kPrimDetectionPostProcess, DetectionPostProcessInfer); REGISTER_PRIMITIVE_C(kNameDetectionPostProcess, DetectionPostProcess); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/div.cc b/mindspore/core/ops/div.cc index 9f1b54b3bf..6e39bb9fad 100644 --- a/mindspore/core/ops/div.cc +++ b/mindspore/core/ops/div.cc @@ -51,7 +51,6 @@ AbstractBasePtr DivInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Div, prim::kPrimDiv, DivInfer); REGISTER_PRIMITIVE_C(kNameDiv, Div); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/dropout.cc b/mindspore/core/ops/dropout.cc index 04ba0a585c..fe8cff4661 100644 --- a/mindspore/core/ops/dropout.cc +++ b/mindspore/core/ops/dropout.cc @@ -64,7 +64,6 @@ AbstractBasePtr DropoutInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(infer_type, infer_shape->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Dropout, prim::kPrimDropout, DropoutInfer); REGISTER_PRIMITIVE_C(kNameDropout, Dropout); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/elu.cc b/mindspore/core/ops/elu.cc index 98e6bd6bcb..a477d3dafd 100644 --- a/mindspore/core/ops/elu.cc +++ b/mindspore/core/ops/elu.cc @@ -68,8 +68,6 @@ AbstractBasePtr EluInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Elu, prim::kPrimElu, EluInfer); REGISTER_PRIMITIVE_C(kNameElu, Elu); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/embedding_lookup.cc b/mindspore/core/ops/embedding_lookup.cc index e35da3296c..501b220674 100644 --- a/mindspore/core/ops/embedding_lookup.cc +++ b/mindspore/core/ops/embedding_lookup.cc @@ -80,8 +80,6 @@ AbstractBasePtr EmbeddingLookupInfer(const abstract::AnalysisEnginePtr &, const return std::make_shared(params->element(), std::make_shared(shape, min_shape, max_shape)); } - -REGISTER_PRIMITIVE_EVAL_IMPL(EmbeddingLookup, prim::kPrimEmbeddingLookup, EmbeddingLookupInfer); REGISTER_PRIMITIVE_C(kNameEmbeddingLookup, EmbeddingLookup); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/equal.cc b/mindspore/core/ops/equal.cc index 8e2f44c031..58ce9f3be6 100644 --- a/mindspore/core/ops/equal.cc +++ b/mindspore/core/ops/equal.cc @@ -52,7 +52,6 @@ AbstractBasePtr EqualInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Equal, prim::kPrimEqual, EqualInfer); REGISTER_PRIMITIVE_C(kNameEqual, Equal); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/exp.cc b/mindspore/core/ops/exp.cc index b8e714df63..6868b90441 100644 --- a/mindspore/core/ops/exp.cc +++ b/mindspore/core/ops/exp.cc @@ -48,7 +48,6 @@ AbstractBasePtr ExpInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Exp, prim::kPrimExp, ExpInfer); REGISTER_PRIMITIVE_C(kNameExp, Exp); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/expand_dims.cc b/mindspore/core/ops/expand_dims.cc index ac5555c77a..fc965e3cb4 100644 --- a/mindspore/core/ops/expand_dims.cc +++ b/mindspore/core/ops/expand_dims.cc @@ -55,7 +55,6 @@ AbstractBasePtr ExpandDimsInfer(const abstract::AnalysisEnginePtr &, const Primi CheckAndConvertUtils::CheckSubClass("x_type", x_type, valid_x_type, prim_name); return std::make_shared(x_type, out_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(ExpandDims, prim::kPrimExpandDims, ExpandDimsInfer); REGISTER_PRIMITIVE_C(kNameExpandDims, ExpandDims); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fake_quant_with_min_max_vars.cc b/mindspore/core/ops/fake_quant_with_min_max_vars.cc index 8f54b7b49b..19594d71f9 100644 --- a/mindspore/core/ops/fake_quant_with_min_max_vars.cc +++ b/mindspore/core/ops/fake_quant_with_min_max_vars.cc @@ -85,7 +85,6 @@ AbstractBasePtr FakeQuantWithMinMaxVarsInfer(const abstract::AnalysisEnginePtr & return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(FakeQuantWithMinMaxVars, prim::kPrimFakeQuantWithMinMaxVars, FakeQuantWithMinMaxVarsInfer); REGISTER_PRIMITIVE_C(kNameFakeQuantWithMinMaxVars, FakeQuantWithMinMaxVars); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fake_quant_with_min_max_vars_per_channel.cc b/mindspore/core/ops/fake_quant_with_min_max_vars_per_channel.cc index 2f361f21b5..681c587f00 100644 --- a/mindspore/core/ops/fake_quant_with_min_max_vars_per_channel.cc +++ b/mindspore/core/ops/fake_quant_with_min_max_vars_per_channel.cc @@ -69,9 +69,6 @@ AbstractBasePtr FakeQuantWithMinMaxVarsPerChannelInfer(const abstract::AnalysisE MS_EXCEPTION_IF_NULL(data_type); return std::make_shared(data_type, x_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(FakeQuantWithMinMaxVarsPerChannel, prim::kPrimFakeQuantWithMinMaxVarsPerChannel, - FakeQuantWithMinMaxVarsPerChannelInfer); REGISTER_PRIMITIVE_C(kNameFakeQuantWithMinMaxVarsPerChannel, FakeQuantWithMinMaxVarsPerChannel); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fft_imag.cc b/mindspore/core/ops/fft_imag.cc index dfad6034a1..bea9075290 100644 --- a/mindspore/core/ops/fft_imag.cc +++ b/mindspore/core/ops/fft_imag.cc @@ -45,7 +45,6 @@ AbstractBasePtr FftImagInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(FftImag, prim::kPrimFftImag, FftImagInfer); REGISTER_PRIMITIVE_C(kNameFftImag, FftImag); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fft_real.cc b/mindspore/core/ops/fft_real.cc index c9cfc6d5f8..bd6998b2f4 100644 --- a/mindspore/core/ops/fft_real.cc +++ b/mindspore/core/ops/fft_real.cc @@ -37,7 +37,6 @@ AbstractBasePtr FftRealInfer(const abstract::AnalysisEnginePtr &, const Primitiv out_shape.pop_back(); return std::make_shared(out_dtype, std::make_shared(out_shape)); } -REGISTER_PRIMITIVE_EVAL_IMPL(FftReal, prim::kPrimFftReal, FftRealInfer); REGISTER_PRIMITIVE_C(kNameFftReal, FftReal); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fill.cc b/mindspore/core/ops/fill.cc index 0efddf5335..d332034b49 100644 --- a/mindspore/core/ops/fill.cc +++ b/mindspore/core/ops/fill.cc @@ -58,7 +58,6 @@ AbstractBasePtr FillInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt abs->set_value(tensor); return abs; } -REGISTER_PRIMITIVE_EVAL_IMPL(Fill, prim::kPrimFill, FillInfer); REGISTER_PRIMITIVE_C(kNameFill, Fill); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/flatten.cc b/mindspore/core/ops/flatten.cc index 6ed4feb888..7d880e5844 100644 --- a/mindspore/core/ops/flatten.cc +++ b/mindspore/core/ops/flatten.cc @@ -53,7 +53,6 @@ AbstractBasePtr FlattenInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Flatten, prim::kPrimFlatten, FlattenInfer); REGISTER_PRIMITIVE_C(kNameFlatten, Flatten); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/floor.cc b/mindspore/core/ops/floor.cc index d3129e4196..eb0d5e41d3 100644 --- a/mindspore/core/ops/floor.cc +++ b/mindspore/core/ops/floor.cc @@ -54,7 +54,6 @@ AbstractBasePtr FloorInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Floor, prim::kPrimFloor, FloorInfer); REGISTER_PRIMITIVE_C(kNameFloor, Floor); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/add_fusion.cc b/mindspore/core/ops/fusion/add_fusion.cc index cdd05e84be..9be0433111 100644 --- a/mindspore/core/ops/fusion/add_fusion.cc +++ b/mindspore/core/ops/fusion/add_fusion.cc @@ -62,7 +62,6 @@ AbstractBasePtr AddFusionInfer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(AddFusion, prim::kPrimAddFusion, AddFusionInfer); REGISTER_PRIMITIVE_C(kNameAddFusion, AddFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/adder_fusion.cc b/mindspore/core/ops/fusion/adder_fusion.cc index 98d759f826..d788d18460 100644 --- a/mindspore/core/ops/fusion/adder_fusion.cc +++ b/mindspore/core/ops/fusion/adder_fusion.cc @@ -44,7 +44,6 @@ ActivationType AdderFusion::get_activation_type() const { auto value_ptr = GetAttr(kActivationType); return ActivationType(GetValue(value_ptr)); } - REGISTER_PRIMITIVE_C(kNameAdderFusion, AdderFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/avg_pool_fusion.cc b/mindspore/core/ops/fusion/avg_pool_fusion.cc index 887d3e9d7b..b0c053e96d 100644 --- a/mindspore/core/ops/fusion/avg_pool_fusion.cc +++ b/mindspore/core/ops/fusion/avg_pool_fusion.cc @@ -105,7 +105,6 @@ AbstractBasePtr AvgPoolFusionInfer(const abstract::AnalysisEnginePtr &, const Pr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(AvgPoolFusion, prim::kPrimAvgPool, AvgPoolFusionInfer); REGISTER_PRIMITIVE_C(kNameAvgPoolFusion, AvgPoolFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/conv2d_backprop_filter_fusion.cc b/mindspore/core/ops/fusion/conv2d_backprop_filter_fusion.cc index f6f6e08ae5..a4ebc9353a 100644 --- a/mindspore/core/ops/fusion/conv2d_backprop_filter_fusion.cc +++ b/mindspore/core/ops/fusion/conv2d_backprop_filter_fusion.cc @@ -60,7 +60,6 @@ int64_t Conv2DBackpropFilterFusion::get_in_channel() const { auto value_ptr = GetAttr(kInChannel); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameConv2DBackpropFilterFusion, Conv2DBackpropFilterFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/full_connection.cc b/mindspore/core/ops/fusion/full_connection.cc index b51213a0cd..8cbe0420c7 100644 --- a/mindspore/core/ops/fusion/full_connection.cc +++ b/mindspore/core/ops/fusion/full_connection.cc @@ -110,7 +110,6 @@ AbstractBasePtr FullConnectionInfer(const abstract::AnalysisEnginePtr &, const P auto input0_type = input_args[0]->BuildType()->cast()->element(); return std::make_shared(input0_type, out_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(FullConnection, prim::kPrimFullConnection, FullConnectionInfer); REGISTER_PRIMITIVE_C(kNameFullConnection, FullConnection); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/pow_fusion.cc b/mindspore/core/ops/fusion/pow_fusion.cc index e350c40518..5566d84d07 100644 --- a/mindspore/core/ops/fusion/pow_fusion.cc +++ b/mindspore/core/ops/fusion/pow_fusion.cc @@ -60,7 +60,6 @@ AbstractBasePtr PowFusionInfer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(PowFusion, prim::kPrimPowFusion, PowFusionInfer); REGISTER_PRIMITIVE_C(kNamePowFusion, PowFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/prelu_fusion.cc b/mindspore/core/ops/fusion/prelu_fusion.cc index e8fd3b2b1d..cae628c882 100644 --- a/mindspore/core/ops/fusion/prelu_fusion.cc +++ b/mindspore/core/ops/fusion/prelu_fusion.cc @@ -42,7 +42,6 @@ std::vector PReLUFusion::get_slope() const { auto value_ptr = GetAttr(kSlope); return GetValue>(value_ptr); } - REGISTER_PRIMITIVE_C(kNamePReLUFusion, PReLUFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/reduce_fusion.cc b/mindspore/core/ops/fusion/reduce_fusion.cc index 4ea0b83d7a..e88f2d568c 100644 --- a/mindspore/core/ops/fusion/reduce_fusion.cc +++ b/mindspore/core/ops/fusion/reduce_fusion.cc @@ -67,8 +67,6 @@ void ReduceFusion::Init(const bool keep_dims, const ReduceMode mode, const bool this->set_reduce_to_end(reduce_to_end); this->set_coeff(coeff); } - -REGISTER_PRIMITIVE_EVAL_IMPL(ReduceFusion, prim::kPrimReduceMean, ReduceInfer); REGISTER_PRIMITIVE_C(kNameReduceFusion, ReduceFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/slice_fusion.cc b/mindspore/core/ops/fusion/slice_fusion.cc index b26b2a59af..af4db80ae1 100644 --- a/mindspore/core/ops/fusion/slice_fusion.cc +++ b/mindspore/core/ops/fusion/slice_fusion.cc @@ -63,8 +63,6 @@ AbstractBasePtr SliceFusionInfer(const abstract::AnalysisEnginePtr &, const Prim } return std::make_shared(data_type, size); } - -REGISTER_PRIMITIVE_EVAL_IMPL(SliceFusion, prim::kPrimSliceFusion, SliceFusionInfer); REGISTER_PRIMITIVE_C(kNameSliceFusion, SliceFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/tile_fusion.cc b/mindspore/core/ops/fusion/tile_fusion.cc index bfab87ed5d..5789dc07e6 100644 --- a/mindspore/core/ops/fusion/tile_fusion.cc +++ b/mindspore/core/ops/fusion/tile_fusion.cc @@ -28,7 +28,6 @@ std::vector TileFusion::get_dims() const { auto value_ptr = GetAttr(kDims); return GetValue>(value_ptr); } - REGISTER_PRIMITIVE_C(kNameTileFusion, TileFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/fusion/topk_fusion.cc b/mindspore/core/ops/fusion/topk_fusion.cc index 97693fbc9e..933c00a489 100644 --- a/mindspore/core/ops/fusion/topk_fusion.cc +++ b/mindspore/core/ops/fusion/topk_fusion.cc @@ -39,7 +39,6 @@ int64_t TopKFusion::get_largest() const { auto value_ptr = GetAttr(kLargest); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameTopKFusion, TopKFusion); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/gather.cc b/mindspore/core/ops/gather.cc index 6c18c5da34..ed61f84ad4 100644 --- a/mindspore/core/ops/gather.cc +++ b/mindspore/core/ops/gather.cc @@ -42,7 +42,6 @@ AbstractBasePtr GatherInfer(const abstract::AnalysisEnginePtr &, const Primitive return std::make_shared(x_type, index_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(Gather, prim::kPrimGather, GatherInfer); REGISTER_PRIMITIVE_C(kNameGather, Gather); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/gather_nd.cc b/mindspore/core/ops/gather_nd.cc index 8227fdfbda..3772b6e1fc 100644 --- a/mindspore/core/ops/gather_nd.cc +++ b/mindspore/core/ops/gather_nd.cc @@ -67,7 +67,6 @@ AbstractBasePtr GatherNdInfer(const abstract::AnalysisEnginePtr &, const Primiti return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(GatherNd, prim::kPrimGatherND, GatherNdInfer); REGISTER_PRIMITIVE_C(kNameGatherNd, GatherNd); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/gelu.cc b/mindspore/core/ops/gelu.cc index a8ab8f6aa9..d4fe5dea1a 100644 --- a/mindspore/core/ops/gelu.cc +++ b/mindspore/core/ops/gelu.cc @@ -51,8 +51,6 @@ AbstractBasePtr GeLUInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(GeLUInferType(primitive, input_args), GeLUInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(GeLU, prim::kPrimGeLU, GeLUInfer); REGISTER_PRIMITIVE_C(kNameGeLU, GeLU); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/avg_pool_grad.cc b/mindspore/core/ops/grad/avg_pool_grad.cc index 5752bd5378..8b64867b44 100644 --- a/mindspore/core/ops/grad/avg_pool_grad.cc +++ b/mindspore/core/ops/grad/avg_pool_grad.cc @@ -32,7 +32,6 @@ AbstractBasePtr AvgPoolGradInfer(const abstract::AnalysisEnginePtr &, const Prim return std::make_shared(element, origin_input_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(AvgPoolGrad, prim::kPrimAvgPoolGrad, AvgPoolGradInfer); REGISTER_PRIMITIVE_C(kNameAvgPoolGrad, AvgPoolGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/batch_norm_grad.cc b/mindspore/core/ops/grad/batch_norm_grad.cc index 31cecb8f62..738d2fb20f 100644 --- a/mindspore/core/ops/grad/batch_norm_grad.cc +++ b/mindspore/core/ops/grad/batch_norm_grad.cc @@ -66,8 +66,6 @@ AbstractBasePtr BatchNormGradInfer(const abstract::AnalysisEnginePtr &, const Pr AbstractBasePtrList rets = {dx, dscale, dscale, reserve_1, reserve_2}; return std::make_shared(rets); } - -REGISTER_PRIMITIVE_EVAL_IMPL(BatchNormGrad, prim::kPrimBatchNormGrad, BatchNormGradInfer); REGISTER_PRIMITIVE_C(kNameBatchNormGrad, BatchNormGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/bias_grad.cc b/mindspore/core/ops/grad/bias_grad.cc index 4b0253f1b5..dd2e4fd35e 100644 --- a/mindspore/core/ops/grad/bias_grad.cc +++ b/mindspore/core/ops/grad/bias_grad.cc @@ -46,7 +46,6 @@ AbstractBasePtr BiasGradInfer(const abstract::AnalysisEnginePtr &, const Primiti return std::make_shared(intype, inshape); } -REGISTER_PRIMITIVE_EVAL_IMPL(BiasGrad, prim::kPrimBiasGrad, BiasGradInfer); REGISTER_PRIMITIVE_C(kNameBiasGrad, BiasGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/binary_cross_entropy_grad.cc b/mindspore/core/ops/grad/binary_cross_entropy_grad.cc index 32c34370c6..db167d4f2f 100644 --- a/mindspore/core/ops/grad/binary_cross_entropy_grad.cc +++ b/mindspore/core/ops/grad/binary_cross_entropy_grad.cc @@ -73,8 +73,6 @@ AbstractBasePtr BinaryCrossEntropyGradInfer(const abstract::AnalysisEnginePtr &, return std::make_shared(BinaryCrossEntroyGradInferType(primitive, input_args), BinaryCrossEntroyGradInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(BinaryCrossEntropyGrad, prim::kPrimBinaryCrossEntropyGrad, BinaryCrossEntropyGradInfer); REGISTER_PRIMITIVE_C(kNameBinaryCrossEntropyGrad, BinaryCrossEntropyGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/bn_grad.cc b/mindspore/core/ops/grad/bn_grad.cc index b31562bdd4..6078551111 100644 --- a/mindspore/core/ops/grad/bn_grad.cc +++ b/mindspore/core/ops/grad/bn_grad.cc @@ -39,7 +39,6 @@ float BNGrad::get_momentum() const { auto value_ptr = this->GetAttr(kMomentum); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameBNGrad, BNGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/conv2d_backprop_filter.cc b/mindspore/core/ops/grad/conv2d_backprop_filter.cc index 3d06efe7e9..c290c0c359 100644 --- a/mindspore/core/ops/grad/conv2d_backprop_filter.cc +++ b/mindspore/core/ops/grad/conv2d_backprop_filter.cc @@ -146,8 +146,6 @@ AbstractBasePtr Conv2DBackpropFilterInfer(const abstract::AnalysisEnginePtr &, c return std::make_shared(Conv2DBackpropFilterInferType(primitive, input_args), Conv2DBackpropFilterInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Conv2DBackpropFilter, prim::kPrimConv2DBackpropFilter, Conv2DBackpropFilterInfer); REGISTER_PRIMITIVE_C(kNameConv2DBackpropFilter, Conv2DBackpropFilter); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/conv2d_backprop_input.cc b/mindspore/core/ops/grad/conv2d_backprop_input.cc index 344ffe949c..0fa3cb0269 100644 --- a/mindspore/core/ops/grad/conv2d_backprop_input.cc +++ b/mindspore/core/ops/grad/conv2d_backprop_input.cc @@ -196,7 +196,6 @@ std::vector Conv2DBackpropInput::get_pad_list() const { auto value_ptr = GetAttr(kPadList); return GetValue>(value_ptr); } -REGISTER_PRIMITIVE_EVAL_IMPL(Conv2DBackpropInput, prim::kPrimConv2DBackpropInput, Conv2DBackpropInputInfer); REGISTER_PRIMITIVE_C(kNameConv2DBackpropInput, Conv2DBackpropInput); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/de_conv2d_grad_filter.cc b/mindspore/core/ops/grad/de_conv2d_grad_filter.cc index 0e336c98ab..15a77fe12b 100644 --- a/mindspore/core/ops/grad/de_conv2d_grad_filter.cc +++ b/mindspore/core/ops/grad/de_conv2d_grad_filter.cc @@ -132,7 +132,6 @@ bool DeConv2DGradFilter::get_has_bias() const { auto value_ptr = GetAttr(kHasBias); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameDeConv2DGradFilter, DeConv2DGradFilter); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/dropout_grad.cc b/mindspore/core/ops/grad/dropout_grad.cc index 41e626769d..dd03cf9368 100644 --- a/mindspore/core/ops/grad/dropout_grad.cc +++ b/mindspore/core/ops/grad/dropout_grad.cc @@ -63,8 +63,6 @@ AbstractBasePtr DropoutGradInfer(const abstract::AnalysisEnginePtr &, const Prim return std::make_shared(DropoutGradInferType(primitive, input_args), DropoutGradInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(DropoutGrad, prim::kPrimDropoutGrad, DropoutGradInfer); REGISTER_PRIMITIVE_C(kNameDropoutGrad, DropoutGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/flatten_grad.cc b/mindspore/core/ops/grad/flatten_grad.cc index 05e3d42761..e4c6d07c8e 100644 --- a/mindspore/core/ops/grad/flatten_grad.cc +++ b/mindspore/core/ops/grad/flatten_grad.cc @@ -35,7 +35,6 @@ AbstractBasePtr FlattenGradInfer(const abstract::AnalysisEnginePtr &, const Prim ret->set_shape(std::make_shared(out_shape)); return ret; } -REGISTER_PRIMITIVE_EVAL_IMPL(FlattenGrad, prim::kPrimFlattenGrad, FlattenGradInfer); REGISTER_PRIMITIVE_C(kNameFlattenGrad, FlattenGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/group_conv2d_grad_input.cc b/mindspore/core/ops/grad/group_conv2d_grad_input.cc index ad5d2848d9..f4f553c380 100644 --- a/mindspore/core/ops/grad/group_conv2d_grad_input.cc +++ b/mindspore/core/ops/grad/group_conv2d_grad_input.cc @@ -161,7 +161,6 @@ AbstractBasePtr GroupConv2DGradInputInfer(const abstract::AnalysisEnginePtr &, c return std::make_shared(type, shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(GroupConv2DGradInput, prim::kPrimGroupConv2DGradInput, GroupConv2DGradInputInfer); REGISTER_PRIMITIVE_C(kNameGroupConv2DGradInput, GroupConv2DGradInput); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/max_pool_grad.cc b/mindspore/core/ops/grad/max_pool_grad.cc index 8080687318..0c71271b2d 100644 --- a/mindspore/core/ops/grad/max_pool_grad.cc +++ b/mindspore/core/ops/grad/max_pool_grad.cc @@ -60,8 +60,6 @@ AbstractBasePtr MaxPoolGradInfer(const abstract::AnalysisEnginePtr &, const Prim auto element = tensor_type->element(); return std::make_shared(element, x1_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(MaxPoolGrad, prim::kPrimMaxPoolGrad, MaxPoolGradInfer); REGISTER_PRIMITIVE_C(kNameMaxPoolGrad, MaxPoolGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/maximum_grad.cc b/mindspore/core/ops/grad/maximum_grad.cc index eafbfb79bf..eb060a9873 100644 --- a/mindspore/core/ops/grad/maximum_grad.cc +++ b/mindspore/core/ops/grad/maximum_grad.cc @@ -37,7 +37,6 @@ bool MaximumGrad::get_grad_y() const { auto value_ptr = GetAttr(kGradY); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameMaximumGrad, MaximumGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/minimum_grad.cc b/mindspore/core/ops/grad/minimum_grad.cc index 1348840931..5a1cd154ec 100644 --- a/mindspore/core/ops/grad/minimum_grad.cc +++ b/mindspore/core/ops/grad/minimum_grad.cc @@ -37,7 +37,6 @@ bool MinimumGrad::get_grad_y() const { auto value_ptr = GetAttr(kGradY); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameMinimumGrad, MinimumGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/pool_grad.cc b/mindspore/core/ops/grad/pool_grad.cc index 3b5c5c073b..8bb965aa50 100644 --- a/mindspore/core/ops/grad/pool_grad.cc +++ b/mindspore/core/ops/grad/pool_grad.cc @@ -19,7 +19,6 @@ namespace mindspore { namespace ops { - std::vector PoolGrad::_grad_check_vector(std::string arg_name, std::vector arg_val, std::string op_name) { std::vector ret; @@ -83,7 +82,6 @@ PadMode PoolGrad::get_pad_mode() const { auto value_ptr = GetAttr(kPadMode); return PadMode(GetValue(value_ptr)); } - REGISTER_PRIMITIVE_C(kNamePoolGrad, PoolGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/sigmoid_cross_entropy_with_logits_grad.cc b/mindspore/core/ops/grad/sigmoid_cross_entropy_with_logits_grad.cc index b313af0f19..47b2748e02 100644 --- a/mindspore/core/ops/grad/sigmoid_cross_entropy_with_logits_grad.cc +++ b/mindspore/core/ops/grad/sigmoid_cross_entropy_with_logits_grad.cc @@ -58,9 +58,6 @@ AbstractBasePtr SigmoidCrossEntropyWithLogitsGradInfer(const abstract::AnalysisE return std::make_shared(dout_type, x_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(SigmoidCrossEntropyWithLogitsGrad, prim::kPrimSigmoidCrossEntropyWithLogitsGrad, - SigmoidCrossEntropyWithLogitsGradInfer); REGISTER_PRIMITIVE_C(kNameSigmoidCrossEntropyWithLogitsGrad, SigmoidCrossEntropyWithLogitsGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/smooth_l1_loss_grad.cc b/mindspore/core/ops/grad/smooth_l1_loss_grad.cc index f5db7576b7..f0e19b48c5 100644 --- a/mindspore/core/ops/grad/smooth_l1_loss_grad.cc +++ b/mindspore/core/ops/grad/smooth_l1_loss_grad.cc @@ -63,7 +63,6 @@ AbstractBasePtr SmoothL1LossGradInfer(const abstract::AnalysisEnginePtr &, const return std::make_shared(dloss_type, prediction); } -REGISTER_PRIMITIVE_EVAL_IMPL(SmoothL1LossGrad, prim::kPrimSmoothL1LossGrad, SmoothL1LossGradInfer); REGISTER_PRIMITIVE_C(kNameSmoothL1LossGrad, SmoothL1LossGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/grad/strided_slice_grad.cc b/mindspore/core/ops/grad/strided_slice_grad.cc index 85c0fb5036..2d779b2461 100644 --- a/mindspore/core/ops/grad/strided_slice_grad.cc +++ b/mindspore/core/ops/grad/strided_slice_grad.cc @@ -78,7 +78,6 @@ int64_t StridedSliceGrad::get_shrink_axis_mask() const { auto value_ptr = GetAttr(kShrinkAxisMask); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameStridedSliceGrad, StridedSliceGrad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/gru.cc b/mindspore/core/ops/gru.cc index 42258d88de..7293361506 100644 --- a/mindspore/core/ops/gru.cc +++ b/mindspore/core/ops/gru.cc @@ -111,7 +111,6 @@ GateOrderMode GRU::get_gate_order() const { auto value_ptr = this->GetAttr(kGateOrder); return GateOrderMode(GetValue(value_ptr)); } - REGISTER_PRIMITIVE_C(kNameGRU, GRU); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/hashtable_lookup.cc b/mindspore/core/ops/hashtable_lookup.cc index cc592a671d..0e8171f828 100644 --- a/mindspore/core/ops/hashtable_lookup.cc +++ b/mindspore/core/ops/hashtable_lookup.cc @@ -49,8 +49,6 @@ AbstractBasePtr HashtableLookupInfer(const abstract::AnalysisEnginePtr &, const } return std::make_shared(output1); } - -REGISTER_PRIMITIVE_EVAL_IMPL(HashtableLookup, prim::kPrimHashtableLookup, HashtableLookupInfer); REGISTER_PRIMITIVE_C(kNameHashtableLookup, HashtableLookup); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/l2_normalize.cc b/mindspore/core/ops/l2_normalize.cc index 86c8b5dec5..1c58c1f8ee 100644 --- a/mindspore/core/ops/l2_normalize.cc +++ b/mindspore/core/ops/l2_normalize.cc @@ -59,7 +59,6 @@ AbstractBasePtr L2NormalizeInfer(const abstract::AnalysisEnginePtr &, const Prim } return input_args[0]->Broaden(); } -REGISTER_PRIMITIVE_EVAL_IMPL(L2Normalize, prim::kPrimL2Normalize, L2NormalizeInfer); REGISTER_PRIMITIVE_C(kNameL2Normalize, L2Normalize); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/leaky_relu.cc b/mindspore/core/ops/leaky_relu.cc index a0a37e10d0..ee5e28f009 100644 --- a/mindspore/core/ops/leaky_relu.cc +++ b/mindspore/core/ops/leaky_relu.cc @@ -51,7 +51,6 @@ AbstractBasePtr LeakyReluInfer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(LeakyRelu, prim::kPrimLeakyRelu, LeakyReluInfer); REGISTER_PRIMITIVE_C(kNameLeakyRelu, LeakyRelu); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/less.cc b/mindspore/core/ops/less.cc index 4a502d7b48..56cfeb67d8 100644 --- a/mindspore/core/ops/less.cc +++ b/mindspore/core/ops/less.cc @@ -50,7 +50,6 @@ AbstractBasePtr LessInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Less, prim::kPrimLess, LessInfer); REGISTER_PRIMITIVE_C(kNameLess, Less); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/less_equal.cc b/mindspore/core/ops/less_equal.cc index 75da535536..228b75caf9 100644 --- a/mindspore/core/ops/less_equal.cc +++ b/mindspore/core/ops/less_equal.cc @@ -51,7 +51,6 @@ AbstractBasePtr LessEqualInfer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(LessEqual, prim::kPrimLessEqual, LessEqualInfer); REGISTER_PRIMITIVE_C(kNameLessEqual, LessEqual); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/local_response_normalization.cc b/mindspore/core/ops/local_response_normalization.cc index 27ea7d216b..5165de2e75 100644 --- a/mindspore/core/ops/local_response_normalization.cc +++ b/mindspore/core/ops/local_response_normalization.cc @@ -91,8 +91,6 @@ AbstractBasePtr LocalResponseNormalizationInfer(const abstract::AnalysisEnginePt return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(LocalResponseNormalization, prim::kPrimLocalResponseNormalization, - LocalResponseNormalizationInfer); REGISTER_PRIMITIVE_C(kNameLocalResponseNormalization, LocalResponseNormalization); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/log.cc b/mindspore/core/ops/log.cc index 088a8c441b..c9617cf125 100644 --- a/mindspore/core/ops/log.cc +++ b/mindspore/core/ops/log.cc @@ -41,7 +41,6 @@ AbstractBasePtr LogInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Log, prim::kPrimLog, LogInfer); REGISTER_PRIMITIVE_C(kNameLog, Log); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/logical_and.cc b/mindspore/core/ops/logical_and.cc index 9cabd5af99..fb33d56023 100644 --- a/mindspore/core/ops/logical_and.cc +++ b/mindspore/core/ops/logical_and.cc @@ -55,7 +55,6 @@ AbstractBasePtr LogicalAndInfer(const abstract::AnalysisEnginePtr &, const Primi return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(LogicalAnd, prim::kPrimLogicalAnd, LogicalAndInfer); REGISTER_PRIMITIVE_C(kNameLogicalAnd, LogicalAnd); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/logical_not.cc b/mindspore/core/ops/logical_not.cc index c15956d73f..5581a835b1 100644 --- a/mindspore/core/ops/logical_not.cc +++ b/mindspore/core/ops/logical_not.cc @@ -50,8 +50,6 @@ AbstractBasePtr LogicalNotInfer(const abstract::AnalysisEnginePtr &, const Primi return std::make_shared(LogicalNotInferType(primitive, input_args), LogicalNotInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(LogicalNot, prim::kPrimLogicalNot, LogicalNotInfer); REGISTER_PRIMITIVE_C(kNameLogicalNot, LogicalNot); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/logical_or.cc b/mindspore/core/ops/logical_or.cc index 46eebf4b00..3614c994ca 100644 --- a/mindspore/core/ops/logical_or.cc +++ b/mindspore/core/ops/logical_or.cc @@ -56,7 +56,6 @@ AbstractBasePtr LogicalOrInfer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(LogicalOr, prim::kPrimLogicalOr, LogicalOrInfer); REGISTER_PRIMITIVE_C(kNameLogicalOr, LogicalOr); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/lrn.cc b/mindspore/core/ops/lrn.cc index 9e5417f11a..f6897445ac 100644 --- a/mindspore/core/ops/lrn.cc +++ b/mindspore/core/ops/lrn.cc @@ -102,7 +102,6 @@ AbstractBasePtr LrnInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Lrn, prim::kPrimLrn, LrnInfer); REGISTER_PRIMITIVE_C(kNameLrn, Lrn); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/lsh_projection.cc b/mindspore/core/ops/lsh_projection.cc index 768f1fdd9b..c7049817ff 100644 --- a/mindspore/core/ops/lsh_projection.cc +++ b/mindspore/core/ops/lsh_projection.cc @@ -64,8 +64,6 @@ AbstractBasePtr LshProjectionInfer(const abstract::AnalysisEnginePtr &, const Pr TypePtr infer_type = TypeIdToType(kNumberTypeInt32); return std::make_shared(infer_type, out_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(LshProjection, prim::kPrimLshProjection, LshProjectionInfer); REGISTER_PRIMITIVE_C(kNameLshProjection, LshProjection); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/lstm.cc b/mindspore/core/ops/lstm.cc index e2e8395250..79a5e60286 100644 --- a/mindspore/core/ops/lstm.cc +++ b/mindspore/core/ops/lstm.cc @@ -169,8 +169,6 @@ AbstractBasePtr LstmInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt const std::vector &input_args) { return std::make_shared(LstmInfer(primitive, input_args)); } - -REGISTER_PRIMITIVE_EVAL_IMPL(LSTM, prim::kPrimLstm, LstmInfer); REGISTER_PRIMITIVE_C(kNameLSTM, LSTM); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/mat_mul.cc b/mindspore/core/ops/mat_mul.cc index 678d8e3e2e..0117868bdf 100644 --- a/mindspore/core/ops/mat_mul.cc +++ b/mindspore/core/ops/mat_mul.cc @@ -95,7 +95,6 @@ AbstractBasePtr MatMulInfer(const abstract::AnalysisEnginePtr &, const Primitive } // Add -REGISTER_PRIMITIVE_EVAL_IMPL(MatMul, prim::kPrimMatMul, MatMulInfer); REGISTER_PRIMITIVE_C(kNameMatMul, MatMul); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/matrix_diag.cc b/mindspore/core/ops/matrix_diag.cc index 98e56fa3d5..c074c46e0d 100644 --- a/mindspore/core/ops/matrix_diag.cc +++ b/mindspore/core/ops/matrix_diag.cc @@ -80,7 +80,6 @@ AbstractBasePtr MatrixDiagInfer(const abstract::AnalysisEnginePtr &, const Primi return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(MatrixDiag, prim::kPrimMatrixDiag, MatrixDiagInfer); REGISTER_PRIMITIVE_C(kNameMatrixDiag, MatrixDiag); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/max_pool.cc b/mindspore/core/ops/max_pool.cc index 516b287556..b4b324014e 100644 --- a/mindspore/core/ops/max_pool.cc +++ b/mindspore/core/ops/max_pool.cc @@ -152,7 +152,6 @@ AbstractBasePtr MaxPoolInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(MaxPool, prim::kPrimMaxPool, MaxPoolInfer); REGISTER_PRIMITIVE_C(kNameMaxPool, MaxPool); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/maximum.cc b/mindspore/core/ops/maximum.cc index 2039069b4d..1647569277 100644 --- a/mindspore/core/ops/maximum.cc +++ b/mindspore/core/ops/maximum.cc @@ -48,7 +48,6 @@ AbstractBasePtr MaximumInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Maximum, prim::kPrimMaximum, MaximumInfer); REGISTER_PRIMITIVE_C(kNameMaximum, Maximum); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/merge.cc b/mindspore/core/ops/merge.cc index 76176464ca..7ef024794a 100644 --- a/mindspore/core/ops/merge.cc +++ b/mindspore/core/ops/merge.cc @@ -52,8 +52,6 @@ AbstractBasePtr MergeInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP AbstractBasePtrList output = {output1, output2}; return std::make_shared(output); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Merge, prim::kPrimMerge, MergeInfer); REGISTER_PRIMITIVE_C(kNameMerge, Merge); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/mfcc.cc b/mindspore/core/ops/mfcc.cc index 2d7e66f8ff..73309e63ac 100644 --- a/mindspore/core/ops/mfcc.cc +++ b/mindspore/core/ops/mfcc.cc @@ -93,7 +93,6 @@ AbstractBasePtr MfccInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Mfcc, prim::kPrimMfcc, MfccInfer); REGISTER_PRIMITIVE_C(kNameMfcc, Mfcc); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/minimum.cc b/mindspore/core/ops/minimum.cc index 027be2040f..6c38d1e04b 100644 --- a/mindspore/core/ops/minimum.cc +++ b/mindspore/core/ops/minimum.cc @@ -52,7 +52,6 @@ AbstractBasePtr MinimumInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Minimum, prim::kPrimMinimum, MinimumInfer); REGISTER_PRIMITIVE_C(kNameMinimum, Minimum); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/neg.cc b/mindspore/core/ops/neg.cc index 8525e0dc02..e90b4ed8d3 100644 --- a/mindspore/core/ops/neg.cc +++ b/mindspore/core/ops/neg.cc @@ -34,7 +34,6 @@ AbstractBasePtr NegInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr CheckAndConvertUtils::CheckTensorTypeValid("input_x", input_args[0]->BuildType(), common_valid_types, prim_name); return input_args[0]->Broaden(); } -REGISTER_PRIMITIVE_EVAL_IMPL(Neg, prim::kPrimNeg, NegInfer); REGISTER_PRIMITIVE_C(kNameNeg, Neg); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/non_max_suppression.cc b/mindspore/core/ops/non_max_suppression.cc index e744d07211..bd36a562e1 100644 --- a/mindspore/core/ops/non_max_suppression.cc +++ b/mindspore/core/ops/non_max_suppression.cc @@ -38,8 +38,6 @@ AbstractBasePtr NonMaxSuppressionInfer(const abstract::AnalysisEnginePtr &, cons MS_LOG(INFO) << "NonMaxSuppression infer shape in runtime."; return std::make_shared(TypeIdToType(kNumberTypeInt32), std::vector{}); } - -REGISTER_PRIMITIVE_EVAL_IMPL(NonMaxSuppression, prim::kPrimNonMaxSuppression, NonMaxSuppressionInfer); REGISTER_PRIMITIVE_C(kNameNonMaxSuppression, NonMaxSuppression); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/one_hot.cc b/mindspore/core/ops/one_hot.cc index 935473203b..375603c420 100644 --- a/mindspore/core/ops/one_hot.cc +++ b/mindspore/core/ops/one_hot.cc @@ -71,8 +71,6 @@ AbstractBasePtr OneHotInfer(const abstract::AnalysisEnginePtr &, const Primitive return std::make_shared(OneHotInferType(primitive, input_args), OneHotInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(OneHot, prim::kPrimOneHot, OneHotInfer); REGISTER_PRIMITIVE_C(kNameOneHot, OneHot); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/ones_like.cc b/mindspore/core/ops/ones_like.cc index 6c3b46a354..4872ed2ac9 100644 --- a/mindspore/core/ops/ones_like.cc +++ b/mindspore/core/ops/ones_like.cc @@ -51,7 +51,6 @@ AbstractBasePtr OnesLikeInfer(const abstract::AnalysisEnginePtr &, const Primiti return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(OnesLike, prim::kPrimOnesLike, OnesLikeInfer); REGISTER_PRIMITIVE_C(kNameOnesLike, OnesLike); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/pack.cc b/mindspore/core/ops/pack.cc index e448b91285..e83a83dd44 100644 --- a/mindspore/core/ops/pack.cc +++ b/mindspore/core/ops/pack.cc @@ -73,8 +73,6 @@ AbstractBasePtr PackInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt MS_EXCEPTION_IF_NULL(data_type); return std::make_shared(data_type, all_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Pack, prim::kPrimPack, PackInfer); REGISTER_PRIMITIVE_C(kNamePack, Pack); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/pad.cc b/mindspore/core/ops/pad.cc index 766761ef00..05ffdcdb37 100644 --- a/mindspore/core/ops/pad.cc +++ b/mindspore/core/ops/pad.cc @@ -69,7 +69,6 @@ AbstractBasePtr PadInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Pad, prim::kPrimPad, PadInfer); REGISTER_PRIMITIVE_C(kNamePad, Pad); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/pow.cc b/mindspore/core/ops/pow.cc index 1cf0a14359..faca7068a7 100644 --- a/mindspore/core/ops/pow.cc +++ b/mindspore/core/ops/pow.cc @@ -47,7 +47,6 @@ AbstractBasePtr PowInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Pow, prim::kPrimPow, PowInfer); REGISTER_PRIMITIVE_C(kNamePow, Pow); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/prelu.cc b/mindspore/core/ops/prelu.cc index d05ddfb13d..6aa95f3440 100644 --- a/mindspore/core/ops/prelu.cc +++ b/mindspore/core/ops/prelu.cc @@ -60,7 +60,6 @@ AbstractBasePtr PReLUInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(PReLU, prim::kPrimPRelu, PReLUInfer); REGISTER_PRIMITIVE_C(kNamePReLU, PReLU); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/prior_box.cc b/mindspore/core/ops/prior_box.cc index b1db9dea50..c5cdb1d637 100644 --- a/mindspore/core/ops/prior_box.cc +++ b/mindspore/core/ops/prior_box.cc @@ -145,8 +145,6 @@ AbstractBasePtr PriorBoxInfer(const abstract::AnalysisEnginePtr &, const Primiti std::vector output_shape{1, h, 1, 2}; return std::make_shared(TypeIdToType(kNumberTypeFloat32), output_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(PriorBox, prim::kPrimPriorBox, PriorBoxInfer); REGISTER_PRIMITIVE_C(kNamePriorBox, PriorBox); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/quant_dtype_cast.cc b/mindspore/core/ops/quant_dtype_cast.cc index ddda8add7e..59d002e999 100644 --- a/mindspore/core/ops/quant_dtype_cast.cc +++ b/mindspore/core/ops/quant_dtype_cast.cc @@ -46,8 +46,6 @@ AbstractBasePtr QuantDTypeCastInfer(const abstract::AnalysisEnginePtr &, const P return std::make_shared(TypeIdToType(TypeId(QuantDTypeCast_prim->get_dst_t())), input_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(QuantDTypeCast, prim::kPrimQuantDTypeCast, QuantDTypeCastInfer); REGISTER_PRIMITIVE_C(kNameQuantDTypeCast, QuantDTypeCast); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/random_standard_normal.cc b/mindspore/core/ops/random_standard_normal.cc index 8772100b70..39fd3a7061 100644 --- a/mindspore/core/ops/random_standard_normal.cc +++ b/mindspore/core/ops/random_standard_normal.cc @@ -40,7 +40,6 @@ bool RandomStandardNormal::get_seed2() const { auto value_ptr = GetAttr(kSeed2); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameRandomStandardNormal, RandomStandardNormal); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/range.cc b/mindspore/core/ops/range.cc index a5f1fa8663..61ee0f9da2 100644 --- a/mindspore/core/ops/range.cc +++ b/mindspore/core/ops/range.cc @@ -107,7 +107,6 @@ AbstractBasePtr RangeInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP return std::make_shared( TypeIdToType(dtype), std::make_shared(std::vector{shape_size})); } -REGISTER_PRIMITIVE_EVAL_IMPL(Range, prim::kPrimRange, RangeInfer); REGISTER_PRIMITIVE_C(kNameRange, Range); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/rank.cc b/mindspore/core/ops/rank.cc index f080b0b3f0..6f066f151e 100644 --- a/mindspore/core/ops/rank.cc +++ b/mindspore/core/ops/rank.cc @@ -34,8 +34,6 @@ AbstractBasePtr RankInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt std::vector infer_shape; return std::make_shared(RankInferType(primitive, input_args), infer_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Rank, prim::kPrimRank, RankInfer); REGISTER_PRIMITIVE_C(kNameRank, Rank); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/real_div.cc b/mindspore/core/ops/real_div.cc index 9722440f0f..f81da9bde7 100644 --- a/mindspore/core/ops/real_div.cc +++ b/mindspore/core/ops/real_div.cc @@ -51,7 +51,6 @@ AbstractBasePtr RealDivInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(RealDiv, prim::kPrimRealDiv, RealDivInfer); REGISTER_PRIMITIVE_C(kNameRealDiv, RealDiv); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/reciprocal.cc b/mindspore/core/ops/reciprocal.cc index 684c66bae5..635e94a422 100644 --- a/mindspore/core/ops/reciprocal.cc +++ b/mindspore/core/ops/reciprocal.cc @@ -44,7 +44,6 @@ AbstractBasePtr ReciprocalInfer(const abstract::AnalysisEnginePtr &, const Primi CheckAndConvertUtils::CheckSubClass("x_type", x_type, valid_x_type, prim_name); return std::make_shared(x_type, in_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(Reciprocal, prim::kPrimReciprocal, ReciprocalInfer); REGISTER_PRIMITIVE_C(kNameReciprocal, Reciprocal); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/reduce.cc b/mindspore/core/ops/reduce.cc index 4926f2015c..fa46e7622e 100644 --- a/mindspore/core/ops/reduce.cc +++ b/mindspore/core/ops/reduce.cc @@ -108,7 +108,6 @@ AbstractBasePtr ReduceInfer(const abstract::AnalysisEnginePtr &, const Primitive return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Reduce, prim::kPrimReduce, ReduceInfer); REGISTER_PRIMITIVE_C(kNameReduce, Reduce); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/relu6.cc b/mindspore/core/ops/relu6.cc index 2ea9e494af..64fc0ff2d5 100644 --- a/mindspore/core/ops/relu6.cc +++ b/mindspore/core/ops/relu6.cc @@ -50,7 +50,6 @@ AbstractBasePtr ReLU6Infer(const abstract::AnalysisEnginePtr &, const PrimitiveP return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(ReLU6, prim::kPrimRelu6, ReLU6Infer); REGISTER_PRIMITIVE_C(kNameReLU6, ReLU6); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/reshape.cc b/mindspore/core/ops/reshape.cc index b3649fe5fe..a7eef3b0b1 100644 --- a/mindspore/core/ops/reshape.cc +++ b/mindspore/core/ops/reshape.cc @@ -97,8 +97,6 @@ AbstractBasePtr ReshapeInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(x->element(), std::make_shared(shape_v)); } } - -REGISTER_PRIMITIVE_EVAL_IMPL(Reshape, prim::kPrimReshape, ReshapeInfer); REGISTER_PRIMITIVE_C(kNameReshape, Reshape); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/resize_bilinear.cc b/mindspore/core/ops/resize_bilinear.cc index 2a8889dda0..433a9252db 100644 --- a/mindspore/core/ops/resize_bilinear.cc +++ b/mindspore/core/ops/resize_bilinear.cc @@ -70,7 +70,6 @@ AbstractBasePtr ResizeBilinearInfer(const abstract::AnalysisEnginePtr &, const P return std::make_shared(out_type, out_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(ResizeBilinear, prim::kPrimResizeBilinear, ResizeBilinearInfer); REGISTER_PRIMITIVE_C(kNameResizeBilinear, ResizeBilinear); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/reverse_sequence.cc b/mindspore/core/ops/reverse_sequence.cc index 0fa4bc1bc6..4e556d8bfd 100644 --- a/mindspore/core/ops/reverse_sequence.cc +++ b/mindspore/core/ops/reverse_sequence.cc @@ -72,7 +72,6 @@ AbstractBasePtr ReverseSequenceInfer(const abstract::AnalysisEnginePtr &, const CheckAndConvertUtils::CheckTensorTypeValid("seq_type", seq_type, valid_seq_types, prim_name); return std::make_shared(x_type, input_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(ReverseSequence, prim::kPrimReverseSequence, ReverseSequenceInfer); REGISTER_PRIMITIVE_C(kNameReverseSequence, ReverseSequence); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/reverse_v2.cc b/mindspore/core/ops/reverse_v2.cc index 7294065e96..30a534ff89 100644 --- a/mindspore/core/ops/reverse_v2.cc +++ b/mindspore/core/ops/reverse_v2.cc @@ -66,7 +66,6 @@ AbstractBasePtr ReverseV2Infer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(ReverseV2, prim::kPrimReverseV2, ReverseV2Infer); REGISTER_PRIMITIVE_C(kNameReverseV2, ReverseV2); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/rfft.cc b/mindspore/core/ops/rfft.cc index ced92a7a09..e65d388986 100644 --- a/mindspore/core/ops/rfft.cc +++ b/mindspore/core/ops/rfft.cc @@ -57,7 +57,6 @@ AbstractBasePtr RfftInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Rfft, prim::kPrimRfft, RfftInfer); REGISTER_PRIMITIVE_C(kNameRfft, Rfft); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/roi_pooling.cc b/mindspore/core/ops/roi_pooling.cc index d0977d09e0..7b421c6ed4 100644 --- a/mindspore/core/ops/roi_pooling.cc +++ b/mindspore/core/ops/roi_pooling.cc @@ -78,7 +78,6 @@ AbstractBasePtr ROIPoolingInfer(const abstract::AnalysisEnginePtr &, const Primi return std::make_shared(output_data_type, std::make_shared(output_shape)); } -REGISTER_PRIMITIVE_EVAL_IMPL(ROIPooling, prim::kPrimROIPooling, ROIPoolingInfer); REGISTER_PRIMITIVE_C(kNameROIPooling, ROIPooling); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/round.cc b/mindspore/core/ops/round.cc index 43c0bdb276..5d91dba5e4 100644 --- a/mindspore/core/ops/round.cc +++ b/mindspore/core/ops/round.cc @@ -44,7 +44,6 @@ AbstractBasePtr RoundInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Round, prim::kPrimRound, RoundInfer); REGISTER_PRIMITIVE_C(kNameRound, Round); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/rsqrt.cc b/mindspore/core/ops/rsqrt.cc index 0dfb271ef0..fe54fbe276 100644 --- a/mindspore/core/ops/rsqrt.cc +++ b/mindspore/core/ops/rsqrt.cc @@ -53,7 +53,6 @@ AbstractBasePtr RsqrtInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Rsqrt, prim::kPrimRsqrt, RsqrtInfer); REGISTER_PRIMITIVE_C(kNameRsqrt, Rsqrt); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/scatter_nd.cc b/mindspore/core/ops/scatter_nd.cc index d505614389..784befd7ea 100644 --- a/mindspore/core/ops/scatter_nd.cc +++ b/mindspore/core/ops/scatter_nd.cc @@ -57,7 +57,6 @@ AbstractBasePtr ScatterNdInfer(const abstract::AnalysisEnginePtr &, const Primit return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(ScatterNd, prim::kPrimScatterNd, ScatterNdInfer); REGISTER_PRIMITIVE_C(kNameScatterNd, ScatterNd); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/shape.cc b/mindspore/core/ops/shape.cc index 32f02b7af7..5fbbe02fd7 100644 --- a/mindspore/core/ops/shape.cc +++ b/mindspore/core/ops/shape.cc @@ -42,7 +42,6 @@ AbstractBasePtr ShapeInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP abs->set_value(MakeValue(in_shape)); return abs; } -REGISTER_PRIMITIVE_EVAL_IMPL(Shape, prim::kPrimShape, ShapeInfer); REGISTER_PRIMITIVE_C(kNameShape, Shape); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/sigmoid_cross_entropy_with_logits.cc b/mindspore/core/ops/sigmoid_cross_entropy_with_logits.cc index 112b22b046..053a14b984 100644 --- a/mindspore/core/ops/sigmoid_cross_entropy_with_logits.cc +++ b/mindspore/core/ops/sigmoid_cross_entropy_with_logits.cc @@ -54,8 +54,6 @@ AbstractBasePtr SigmoidCrossEntropyWithLogitsInfer(const abstract::AnalysisEngin return std::make_shared(x_type, x_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(SigmoidCrossEntropyWithLogits, prim::kPrimSigmoidCrossEntropyWithLogits, - SigmoidCrossEntropyWithLogitsInfer); REGISTER_PRIMITIVE_C(kNameSigmoidCrossEntropyWithLogits, SigmoidCrossEntropyWithLogits); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/sin.cc b/mindspore/core/ops/sin.cc index ef4e48447b..975224e0bc 100644 --- a/mindspore/core/ops/sin.cc +++ b/mindspore/core/ops/sin.cc @@ -50,7 +50,6 @@ AbstractBasePtr SinInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Sin, prim::kPrimSin, SinInfer); REGISTER_PRIMITIVE_C(kNameSin, Sin); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/skip_gram.cc b/mindspore/core/ops/skip_gram.cc index af2b17585a..e4375fd202 100644 --- a/mindspore/core/ops/skip_gram.cc +++ b/mindspore/core/ops/skip_gram.cc @@ -71,7 +71,6 @@ AbstractBasePtr SkipGramInfer(const abstract::AnalysisEnginePtr &, const Primiti return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(SkipGram, prim::kPrimSkipGram, SkipGramInfer); REGISTER_PRIMITIVE_C(kNameSkipGram, SkipGram); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/smooth_l1_loss.cc b/mindspore/core/ops/smooth_l1_loss.cc index be4b0db82f..a0b4057d07 100644 --- a/mindspore/core/ops/smooth_l1_loss.cc +++ b/mindspore/core/ops/smooth_l1_loss.cc @@ -56,7 +56,6 @@ AbstractBasePtr SmoothL1LossInfer(const abstract::AnalysisEnginePtr &, const Pri return std::make_shared(prediction_type, prediction); } -REGISTER_PRIMITIVE_EVAL_IMPL(SmoothL1Loss, prim::kPrimSmoothL1Loss, SmoothL1LossInfer); REGISTER_PRIMITIVE_C(kNameSmoothL1Loss, SmoothL1Loss); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/softmax.cc b/mindspore/core/ops/softmax.cc index f48fa11337..f241f68035 100644 --- a/mindspore/core/ops/softmax.cc +++ b/mindspore/core/ops/softmax.cc @@ -74,8 +74,6 @@ AbstractBasePtr SoftmaxInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(SoftMaxInferType(primitive, input_args), SoftMaxInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Softmax, prim::kPrimSoftmax, SoftmaxInfer); REGISTER_PRIMITIVE_C(kNameSoftmax, Softmax); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/softmax_cross_entropy_with_logits.cc b/mindspore/core/ops/softmax_cross_entropy_with_logits.cc index 8597b1f137..5cc01db647 100644 --- a/mindspore/core/ops/softmax_cross_entropy_with_logits.cc +++ b/mindspore/core/ops/softmax_cross_entropy_with_logits.cc @@ -58,9 +58,6 @@ AbstractBasePtr SoftmaxCrossEntropyWithLogitsInfer(const abstract::AnalysisEngin AbstractBasePtrList output = {output0, output1}; return std::make_shared(output); } - -REGISTER_PRIMITIVE_EVAL_IMPL(SoftmaxCrossEntropyWithLogits, prim::kPrimSoftmaxCrossEntropyWithLogits, - SoftmaxCrossEntropyWithLogitsInfer); REGISTER_PRIMITIVE_C(kNameSoftmaxCrossEntropyWithLogits, SoftmaxCrossEntropyWithLogits); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/space_to_batch.cc b/mindspore/core/ops/space_to_batch.cc index 6d648cdc7a..83f55451c7 100644 --- a/mindspore/core/ops/space_to_batch.cc +++ b/mindspore/core/ops/space_to_batch.cc @@ -91,7 +91,6 @@ AbstractBasePtr SpaceToBatchInfer(const abstract::AnalysisEnginePtr &, const Pri return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(SpaceToBatch, prim::kPrimSpaceToBatch, SpaceToBatchInfer); REGISTER_PRIMITIVE_C(kNameSpaceToBatch, SpaceToBatch); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/space_to_batch_nd.cc b/mindspore/core/ops/space_to_batch_nd.cc index 44f8d5a192..f1cdd4fa2e 100644 --- a/mindspore/core/ops/space_to_batch_nd.cc +++ b/mindspore/core/ops/space_to_batch_nd.cc @@ -102,7 +102,6 @@ AbstractBasePtr SpaceToBatchNDInfer(const abstract::AnalysisEnginePtr &, const P return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(SpaceToBatchND, prim::kPrimSpaceToBatchND, SpaceToBatchNDInfer); REGISTER_PRIMITIVE_C(kNameSpaceToBatchND, SpaceToBatchND); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/sparse_softmax_cross_entropy.cc b/mindspore/core/ops/sparse_softmax_cross_entropy.cc index 6595808d9b..5d0a24b2c8 100644 --- a/mindspore/core/ops/sparse_softmax_cross_entropy.cc +++ b/mindspore/core/ops/sparse_softmax_cross_entropy.cc @@ -57,8 +57,6 @@ AbstractBasePtr SparseSoftmaxCrossEntropyInfer(const abstract::AnalysisEnginePtr auto output_type = input_args[0]->BuildType()->cast()->element(); return std::make_shared(output_type, output_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(SparseSoftmaxCrossEntropy, prim::kPrimSparseSoftmaxCrossEntropy, - SparseSoftmaxCrossEntropyInfer); REGISTER_PRIMITIVE_C(kNameSparseSoftmaxCrossEntropy, SparseSoftmaxCrossEntropy); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/sparse_to_dense.cc b/mindspore/core/ops/sparse_to_dense.cc index cd8086fc90..c459ab098d 100644 --- a/mindspore/core/ops/sparse_to_dense.cc +++ b/mindspore/core/ops/sparse_to_dense.cc @@ -45,7 +45,6 @@ AbstractBasePtr SparseToDenseInfer(const abstract::AnalysisEnginePtr &, const Pr CheckAndConvertUtils::CheckSubClass("values_type", values_type, valid_type, prim_name); return std::make_shared(values_type, dense_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(SparseToDense, prim::kPrimSparseToDense, SparseToDenseInfer); REGISTER_PRIMITIVE_C(kNameSparseToDense, SparseToDense); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/squared_difference.cc b/mindspore/core/ops/squared_difference.cc index 9a638d472e..eb0328d617 100644 --- a/mindspore/core/ops/squared_difference.cc +++ b/mindspore/core/ops/squared_difference.cc @@ -51,7 +51,6 @@ AbstractBasePtr SquaredDifferenceInfer(const abstract::AnalysisEnginePtr &, cons return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(SquaredDifference, prim::kPrimSquaredDifference, SquaredDifferenceInfer); REGISTER_PRIMITIVE_C(kNameSquaredDifference, SquaredDifference); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/squeeze.cc b/mindspore/core/ops/squeeze.cc index b8a816a5bf..6bc3971e56 100644 --- a/mindspore/core/ops/squeeze.cc +++ b/mindspore/core/ops/squeeze.cc @@ -70,8 +70,6 @@ AbstractBasePtr SqueezeInfer(const abstract::AnalysisEnginePtr &, const Primitiv return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Squeeze, prim::kPrimSqueeze, SqueezeInfer); REGISTER_PRIMITIVE_C(kNameSqueeze, Squeeze); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/stack.cc b/mindspore/core/ops/stack.cc index dec640d714..9396b31736 100644 --- a/mindspore/core/ops/stack.cc +++ b/mindspore/core/ops/stack.cc @@ -75,8 +75,6 @@ AbstractBasePtr StackInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP const std::vector &input_args) { return std::make_shared(StackInfer(primitive, input_args)); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Stack, prim::kPrimStack, StackInfer); REGISTER_PRIMITIVE_C(kNameStack, Stack); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/strided_slice.cc b/mindspore/core/ops/strided_slice.cc index 0abd0252a7..680ee4ab90 100644 --- a/mindspore/core/ops/strided_slice.cc +++ b/mindspore/core/ops/strided_slice.cc @@ -52,10 +52,10 @@ abstract::ShapePtr StridedSliceInferShape(const PrimitivePtr &primitive, int64_t i = 0; int64_t j = 0; - int64_t start = 0; - int64_t finish = 0; - int64_t strides = 0; - int64_t slicing_length = 0; + int64_t start; + int64_t finish; + int64_t strides; + int64_t slicing_length; bool has_ellipsis = false; std::vector infer_shape; while (i < x_rank || j < slice_len) { @@ -280,9 +280,6 @@ AbstractBasePtr StridedSliceInfer(const abstract::AnalysisEnginePtr &, const Pri return std::make_shared(StridedSliceInferType(primitive, input_args), StridedSliceInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(StridedSlice, prim::kPrimStridedSlice, StridedSliceInfer); REGISTER_PRIMITIVE_C(kNameStridedSlice, StridedSlice); - } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/sub.cc b/mindspore/core/ops/sub.cc index ba395c9c0c..a99c0ad2e4 100644 --- a/mindspore/core/ops/sub.cc +++ b/mindspore/core/ops/sub.cc @@ -52,7 +52,6 @@ AbstractBasePtr SubInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(InferType(primitive, input_args), InferShape(primitive, input_args)->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Sub, prim::kPrimSub, SubInfer); REGISTER_PRIMITIVE_C(kNameSub, Sub); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/tan.cc b/mindspore/core/ops/tan.cc index ce3a67273d..1739332022 100644 --- a/mindspore/core/ops/tan.cc +++ b/mindspore/core/ops/tan.cc @@ -50,7 +50,6 @@ AbstractBasePtr TanInfer(const abstract::AnalysisEnginePtr &, const PrimitivePtr return std::make_shared(infer_type, infer_shape->shape()); } -REGISTER_PRIMITIVE_EVAL_IMPL(Tan, prim::kPrimTan, TanInfer); REGISTER_PRIMITIVE_C(kNameTan, Tan); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/tensor_list_from_tensor.cc b/mindspore/core/ops/tensor_list_from_tensor.cc index 65e3e7d8cb..46e228c5d5 100644 --- a/mindspore/core/ops/tensor_list_from_tensor.cc +++ b/mindspore/core/ops/tensor_list_from_tensor.cc @@ -84,8 +84,6 @@ AbstractBasePtr TensorListFromTensorInfer(const abstract::AnalysisEnginePtr &, c return std::make_shared(TensorListFromTensorInferType(primitive, input_args), TensorListFromTensorInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(TensorListFromTensor, prim::kPrimTensorListFromTensor, TensorListFromTensorInfer); REGISTER_PRIMITIVE_C(kNameTensorListFromTensor, TensorListFromTensor); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/tensor_list_get_item.cc b/mindspore/core/ops/tensor_list_get_item.cc index 2398aef88d..78c4743f7c 100644 --- a/mindspore/core/ops/tensor_list_get_item.cc +++ b/mindspore/core/ops/tensor_list_get_item.cc @@ -30,7 +30,6 @@ int64_t TensorListGetItem::get_element_dtype() const { auto value_ptr = GetAttr(kElement_dtype); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameTensorListGetItem, TensorListGetItem); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/tensor_list_reserve.cc b/mindspore/core/ops/tensor_list_reserve.cc index f2c87d010f..c1efa6f796 100644 --- a/mindspore/core/ops/tensor_list_reserve.cc +++ b/mindspore/core/ops/tensor_list_reserve.cc @@ -40,7 +40,6 @@ int64_t TensorListReserve::get_shape_type() const { auto value_ptr = GetAttr(kShapeType); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameTensorListReserve, TensorListReserve); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/tensor_list_set_item.cc b/mindspore/core/ops/tensor_list_set_item.cc index abd28c9238..a54b51c6fd 100644 --- a/mindspore/core/ops/tensor_list_set_item.cc +++ b/mindspore/core/ops/tensor_list_set_item.cc @@ -30,7 +30,6 @@ int64_t TensorListSetItem::get_element_dtype() const { auto value_ptr = GetAttr(kElement_dtype); return GetValue(value_ptr); } - REGISTER_PRIMITIVE_C(kNameTensorListSetItem, TensorListSetItem); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/tensor_list_stack.cc b/mindspore/core/ops/tensor_list_stack.cc index 9985420e80..054caa79f7 100644 --- a/mindspore/core/ops/tensor_list_stack.cc +++ b/mindspore/core/ops/tensor_list_stack.cc @@ -69,8 +69,6 @@ AbstractBasePtr TensorListStackInfer(const abstract::AnalysisEnginePtr &, const input1_shape.insert(input1_shape.begin(), 1); return std::make_shared(input_args[0]->BuildType(), input1_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(TensorListStack, prim::kPrimTensorListStack, TensorListStackInfer); REGISTER_PRIMITIVE_C(kNameTensorListStack, TensorListStack); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/tile.cc b/mindspore/core/ops/tile.cc index c6c7a7f385..43f605ba1e 100644 --- a/mindspore/core/ops/tile.cc +++ b/mindspore/core/ops/tile.cc @@ -70,8 +70,6 @@ AbstractBasePtr TileInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt return std::make_shared(TileInferType(primitive, input_args), TileInferShape(primitive, input_args)->shape()); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Tile, prim::kPrimTile, TileInfer); REGISTER_PRIMITIVE_C(kNameTile, Tile); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/topk.cc b/mindspore/core/ops/topk.cc index d7ec6df277..32cfc75d8d 100644 --- a/mindspore/core/ops/topk.cc +++ b/mindspore/core/ops/topk.cc @@ -53,7 +53,6 @@ AbstractBasePtr TopKInfer(const abstract::AnalysisEnginePtr &, const PrimitivePt AbstractBasePtrList output = {output0, output1}; return std::make_shared(output); } -REGISTER_PRIMITIVE_EVAL_IMPL(TopK, prim::kPrimTopK, TopKInfer); REGISTER_PRIMITIVE_C(kNameTopK, TopK); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/unpack.cc b/mindspore/core/ops/unpack.cc index d1bf4f1e79..c105f7f7d0 100644 --- a/mindspore/core/ops/unpack.cc +++ b/mindspore/core/ops/unpack.cc @@ -57,8 +57,6 @@ AbstractBasePtr UnpackInfer(const abstract::AnalysisEnginePtr &, const Primitive } return std::make_shared(output); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Unpack, prim::kPrimUnpack, UnpackInfer); REGISTER_PRIMITIVE_C(kNameUnpack, Unpack); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/unsorted_segment_sum.cc b/mindspore/core/ops/unsorted_segment_sum.cc index d0c5d63be2..2fdea7bd14 100644 --- a/mindspore/core/ops/unsorted_segment_sum.cc +++ b/mindspore/core/ops/unsorted_segment_sum.cc @@ -80,7 +80,6 @@ AbstractBasePtr UnsortedSegmentSumInfer(const abstract::AnalysisEnginePtr &, con return std::make_shared(x_type, shp); } -REGISTER_PRIMITIVE_EVAL_IMPL(UnsortedSegmentSum, prim::kPrimUnsortedSegmentSum, UnsortedSegmentSumInfer); REGISTER_PRIMITIVE_C(kNameUnsortedSegmentSum, UnsortedSegmentSum); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/unsqueeze.cc b/mindspore/core/ops/unsqueeze.cc index 3168651ac0..d4337ce152 100644 --- a/mindspore/core/ops/unsqueeze.cc +++ b/mindspore/core/ops/unsqueeze.cc @@ -69,7 +69,6 @@ AbstractBasePtr UnsqueezeInfer(const abstract::AnalysisEnginePtr &, const Primit } return std::make_shared(input_type, out_shape); } -REGISTER_PRIMITIVE_EVAL_IMPL(Unsqueeze, prim::kPrimUnsqueeze, UnsqueezeInfer); REGISTER_PRIMITIVE_C(kNameUnsqueeze, Unsqueeze); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/unstack.cc b/mindspore/core/ops/unstack.cc index 050174f0be..94a1924471 100644 --- a/mindspore/core/ops/unstack.cc +++ b/mindspore/core/ops/unstack.cc @@ -56,8 +56,6 @@ AbstractBasePtr UnstackInfer(const abstract::AnalysisEnginePtr &, const Primitiv } return std::make_shared(output); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Unstack, prim::kPrimUnstack, UnstackInfer); REGISTER_PRIMITIVE_C(kNameUnstack, Unstack); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/where.cc b/mindspore/core/ops/where.cc index 57b19d430e..2c79b5cc43 100644 --- a/mindspore/core/ops/where.cc +++ b/mindspore/core/ops/where.cc @@ -31,10 +31,6 @@ AbstractBasePtr WhereInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP for (auto input : input_args) { MS_EXCEPTION_IF_NULL(input); } - - if (input_args.size() < 3) { - MS_LOG(ERROR) << "Input shape tensors should b"; - } auto op_name = Where_prim->name(); CheckAndConvertUtils::CheckInteger("input numbers", input_args.size(), kGreaterEqual, 3, op_name); auto input0_type_ = input_args[0]->BuildType()->cast(); @@ -73,8 +69,6 @@ AbstractBasePtr WhereInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP input0_shape[axisout] = nummax; return std::make_shared(input0_type, input0_shape); } - -REGISTER_PRIMITIVE_EVAL_IMPL(Where, prim::kPrimWhere, WhereInfer); REGISTER_PRIMITIVE_C(kNameWhere, Where); } // namespace ops } // namespace mindspore diff --git a/mindspore/core/ops/while.cc b/mindspore/core/ops/while.cc index 91f308d3b1..0b68edb65f 100644 --- a/mindspore/core/ops/while.cc +++ b/mindspore/core/ops/while.cc @@ -58,8 +58,6 @@ AbstractBasePtr WhileInfer(const abstract::AnalysisEnginePtr &, const PrimitiveP } return std::make_shared(output); } - -REGISTER_PRIMITIVE_EVAL_IMPL(While, prim::kPrimWhile, WhileInfer); REGISTER_PRIMITIVE_C(kNameWhile, While); } // namespace ops } // namespace mindspore diff --git a/tests/ut/cpp/CMakeLists.txt b/tests/ut/cpp/CMakeLists.txt index 66a1d2abee..ce1b6b7b04 100644 --- a/tests/ut/cpp/CMakeLists.txt +++ b/tests/ut/cpp/CMakeLists.txt @@ -39,7 +39,6 @@ if(ENABLE_MINDDATA) ./abstract/*.cc ./base/*.cc ./dataset/*.cc - ./ops/*.cc ./ir/dtype/*.cc ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/*.cc ./debug/*.cc