restore some models in entrance guard and fix bugs

mindspore/lite/src/ops/ops_utils.cc

@@ -740,6 +740,10 @@ schema::PrimitiveT *ZerosLikePrimitiveCreator(const AnfNodePtr &node) {
   auto ms_primc = GetValueNode<std::shared_ptr<mindspore::ops::ZerosLike>>(node);
   return ms_primc != nullptr ? ops::MSOp2SchemaOp(ms_primc.get()) : nullptr;
 }
+schema::PrimitiveT *ErfPrimitiveCreator(const AnfNodePtr &node) {
+  auto ms_primc = GetValueNode<std::shared_ptr<mindspore::ops::Erf>>(node);
+  return ms_primc != nullptr ? ops::MSOp2SchemaOp(ms_primc.get()) : nullptr;
+}
 
 RegistryMSOps g_absPrimitiveCreatorRegistry("Abs", AbsPrimitiveCreator);
 RegistryMSOps g_absGradPrimitiveCreatorRegistry("AbsGrad", AbsGradPrimitiveCreator);
@@ -949,6 +953,7 @@ RegistryMSOps g_unsortedSegmentSumPrimitiveCreatorRegistry("UnsortedSegmentSum",
 RegistryMSOps g_unsqueezePrimitiveCreatorRegistry("Unsqueeze", UnsqueezePrimitiveCreator);
 RegistryMSOps g_wherePrimitiveCreatorRegistry("Where", WherePrimitiveCreator);
 RegistryMSOps g_zerosLikePrimitiveCreatorRegistry("ZerosLike", ZerosLikePrimitiveCreator);
+RegistryMSOps g_erfPrimitiveCreatorRegistry("Erf", ErfPrimitiveCreator);
 }  // namespace lite
 }  // namespace mindspore
 

mindspore/lite/src/runtime/kernel/arm/base/reshape_base.cc

@@ -33,13 +33,6 @@ namespace mindspore::kernel {
 int ReshapeBaseCPUKernel::Init() { return ReSize(); }
 
 int ReshapeBaseCPUKernel::ReSize() {
-  auto out_tensor = out_tensors_.at(kOutputIndex);
-  bool is_next_conv = std::any_of(out_kernels_.begin(), out_kernels_.end(), [](LiteKernel *next_kernel) {
-    return next_kernel->Type() == schema::PrimitiveType_Conv2DFusion;
-  });
-  if (is_next_conv && out_tensor->shape().size() == 4 && out_tensor->format() == schema::Format::Format_NCHW) {
-    out_tensor->set_format(schema::Format::Format_NHWC);
-  }
   int in_data_size = in_tensors_.front()->Size();
   int thread_num = context_->thread_num_;
   cal_max_num_per_thread_ = UP_DIV(in_data_size, thread_num);

mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self_fp32.cc

@@ -134,4 +134,5 @@ REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_Ceil, LiteKernelCreator<Arith
 REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_Round, LiteKernelCreator<ArithmeticSelfCPUKernel>)
 REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_Neg, LiteKernelCreator<ArithmeticSelfCPUKernel>)
 REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_Reciprocal, LiteKernelCreator<ArithmeticSelfCPUKernel>)
+REG_KERNEL(kCPU, kNumberTypeFloat32, PrimitiveType_Erf, LiteKernelCreator<ArithmeticSelfCPUKernel>)
 }  // namespace mindspore::kernel

mindspore/lite/test/models_caffe.cfg

@@ -85,6 +85,6 @@ ml_video_edit_detect
 ml_video_edit_hairSeg_have_imageProcessLayer_interpTo145_20210121
 ml_video_edit_have_imageProcessLayer_interpTo145_20201015
 ml_video_edit_MnetN367_extract_1010_pay
-#ml_video_edit_person_divison_pic
+ml_video_edit_person_divison_pic
 ml_video_edit_reid
 ml_video_edit_v10_best_model_nomean_20200723

mindspore/lite/test/models_caffe_fp16.cfg

@@ -80,6 +80,6 @@ ml_video_edit_detect 2.5
 ml_video_edit_hairSeg_have_imageProcessLayer_interpTo145_20210121 0.5
 ml_video_edit_have_imageProcessLayer_interpTo145_20201015 0.5
 ml_video_edit_MnetN367_extract_1010_pay 1
-#ml_video_edit_person_divison_pic 0.2
+ml_video_edit_person_divison_pic 0.5
 ml_video_edit_reid 1
 ml_video_edit_v10_best_model_nomean_20200723 5

mindspore/lite/test/models_npu.cfg

@@ -39,8 +39,8 @@ ml_video_edit_video_segment_gauss_adaptis_part1 2
 ml_video_edit_generate_filter.pb 1
 ml_video_edit_img_segment_adaptise.pb 0.5 2
 ml_video_edit_video_segment_gauss_adaptis_part2.pb 3 2
-#ml_video_edit_person_divison_pic 0.5
-#ml_video_edit_person_divison_video 13 2
+ml_video_edit_person_divison_pic 0.5
+ml_video_edit_person_divison_video 13 2
 ml_video_edit_imitate_filter.onnx 230
 ml_video_edit_judge.onnx 5
 ml_video_edit_vignet.onnx 0.5
@@ -68,4 +68,4 @@ ml_video_edit_v10_best_model_nomean_20200723 8
 #hdc_ocr_detect.onnx 30 #too many subgraphs
 #ml_edu_kit_hand_detection.onnx 1
 ml_edu_kit_hand_key_position.onnx 2
-#ml_video_edit_oneclick_adaptis.pb
+#ml_video_edit_oneclick_adaptis.pb #too many subgraphs

mindspore/lite/test/models_tf.cfg

@@ -58,6 +58,6 @@ mtk_model_face_dress.pb 1;1,128,128,3
 mtk_model_normalize_object_scene_ps_20200519.pb 1;1,224,224,3
 ml_ocr_latin.pb 1
 ml_noya_tts_melgan.pb 1;16,16,80
-#ml_video_edit_oneclick_adaptis.pb 3
+ml_video_edit_oneclick_adaptis.pb 3
 # Q_hand_0812.pb is not suitable for float16. Out of float16 range.
 Q_hand_0812.pb

mindspore/lite/test/models_with_multiple_inputs.cfg

@@ -9,5 +9,5 @@ ml_video_edit_video_segment_gauss_adaptis_part2.pb;2
 ml_video_edit_video_segment_gauss_adaptis_part2_pb2tflite.tflite;2
 decoder.onnx;2;1,7,512:1,7
 fasterrcnn_crop.pb;1;420,630,3
-#ml_video_edit_person_divison_video;2
+ml_video_edit_person_divison_video;2
 hdc_tb_cn_neg.tflite;3