From 060c4be964fb096e16a160020634cf0f17276697 Mon Sep 17 00:00:00 2001
From: wangyanling <wangyanling10@huawei.com>
Date: Mon, 2 Aug 2021 19:54:34 +0800
Subject: [PATCH] fix infer bug of encoder_v5.pb at NPU device

---
 mindspore/lite/src/delegate/npu/npu_delegate.cc | 8 ++++++++
 mindspore/lite/test/config/models_npu.cfg       | 1 +
 mindspore/lite/test/config/models_onnx.cfg      | 1 +
 mindspore/lite/test/config/models_onnx_fp16.cfg | 1 +
 mindspore/lite/test/config/models_tf.cfg        | 4 +++-
 mindspore/lite/test/config/models_tf_fp16.cfg   | 3 +++
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/mindspore/lite/src/delegate/npu/npu_delegate.cc b/mindspore/lite/src/delegate/npu/npu_delegate.cc
index 97fc4c936b6..0f5a4dd4632 100644
--- a/mindspore/lite/src/delegate/npu/npu_delegate.cc
+++ b/mindspore/lite/src/delegate/npu/npu_delegate.cc
@@ -206,6 +206,14 @@ int NPUDelegate::Build(DelegateModel *model) {
 }
 
 NPUOp *NPUDelegate::GetOP(kernel::Kernel *kernel, const schema::Primitive *primitive) {
+  if (primitive == nullptr) {
+    MS_LOG(ERROR) << "primitive is NULL!";
+    return nullptr;
+  }
+  if (kernel == nullptr) {
+    MS_LOG(ERROR) << "kernel is NULL!";
+    return nullptr;
+  }
   auto name = kernel->name();
   NPUOp *npu_op = nullptr;
   auto node_type = primitive->value_type();
diff --git a/mindspore/lite/test/config/models_npu.cfg b/mindspore/lite/test/config/models_npu.cfg
index f1d90c4e9b6..42c74acf291 100644
--- a/mindspore/lite/test/config/models_npu.cfg
+++ b/mindspore/lite/test/config/models_npu.cfg
@@ -88,3 +88,4 @@ ml_video_edit_hair_dyeing_segmodel_v2 0.5
 ml_video_edit_makeup_mobilenetv203.onnx 2
 ml_video_edit_hairline_segmentation;3 0.5
 ml_video_edit_hair_dyeing_migrate_v2.onnx;4 0.5
+ml_audio_kit_encoder_v5.pb;6;1,32:1,32:1,32:1,32:1:1
diff --git a/mindspore/lite/test/config/models_onnx.cfg b/mindspore/lite/test/config/models_onnx.cfg
index 19fda52d682..d1a42d25037 100644
--- a/mindspore/lite/test/config/models_onnx.cfg
+++ b/mindspore/lite/test/config/models_onnx.cfg
@@ -103,3 +103,4 @@ tiny-yolov3-11.onnx;2;1,224,224,3:1,2 3
 # cur acc for ml_video_edit_art_transfer is 2+%
 ml_video_edit_art_transfer.onnx;3
 ssd-10.onnx;;;;calib_only
+Q888_CV_face_recognition_self.onnx
diff --git a/mindspore/lite/test/config/models_onnx_fp16.cfg b/mindspore/lite/test/config/models_onnx_fp16.cfg
index 4c23284359c..d9ec6e16a45 100644
--- a/mindspore/lite/test/config/models_onnx_fp16.cfg
+++ b/mindspore/lite/test/config/models_onnx_fp16.cfg
@@ -102,3 +102,4 @@ ml_asr_decoder_202103.onnx;2;1,64,512:1,64 0.5
 ml_video_edit_makeup_mobilenetv203.onnx 4
 # The input of ml_video_edit_hair_dyeing_migrate_v2.onnx should be between [0, 1]
 ml_video_edit_hair_dyeing_migrate_v2.onnx;4 2.5
+Q888_CV_face_recognition_self.onnx 3.5
diff --git a/mindspore/lite/test/config/models_tf.cfg b/mindspore/lite/test/config/models_tf.cfg
index 3aa1a4e24a8..999fb519b56 100644
--- a/mindspore/lite/test/config/models_tf.cfg
+++ b/mindspore/lite/test/config/models_tf.cfg
@@ -104,4 +104,6 @@ hiai_nlu_model_v1.pb;3;1,16:1,16:1,16 2.0
 hiai_nlu_model_v2.pb;7;1,5:1,6:1,174:1,98:1,5:1,5:1,5
 hiai_nlu_model_multi.pb;6;1,32:1,32:1,6:1,11:1,74:1,32
 hiai_nlu_model_single.pb;3;1,32:1,32:1,32
-
+fsr_270_mindspore.pb
+fsr_360_mindspore.pb
+fsr_720_mindspore.pb
diff --git a/mindspore/lite/test/config/models_tf_fp16.cfg b/mindspore/lite/test/config/models_tf_fp16.cfg
index 3ce1b398e3b..3196d0697e3 100644
--- a/mindspore/lite/test/config/models_tf_fp16.cfg
+++ b/mindspore/lite/test/config/models_tf_fp16.cfg
@@ -88,3 +88,6 @@ hiai_transformer_encoder.pb;15 4
 decoder_step_nocumsum_v5.pb;13;1:1,512:1,1429,2:1,127:1,127:1,127:1,127,320:1,80:1,512:1,512:1,512:1,512:1,512 1.2
 hiai_nlu_model_multi.pb;6;1,32:1,32:1,6:1,11:1,74:1,32 25
 hiai_nlu_model_single.pb;3;1,32:1,32:1,32 2470
+fsr_270_mindspore.pb 6.0
+fsr_360_mindspore.pb 6.5
+fsr_720_mindspore.pb 2.0