From 9a6ea7b7df68d61dfd3c9ad3ab0e864967f9b857 Mon Sep 17 00:00:00 2001
From: yeyunpeng <yeyunpeng2020@huawei.com>
Date: Wed, 23 Dec 2020 14:24:21 +0800
Subject: [PATCH] fix 9000e error

---
 build.sh                                             | 2 +-
 mindspore/lite/src/runtime/agent/npu/npu_manager.cc  | 4 ++++
 mindspore/lite/src/runtime/agent/npu/npu_manager.h   | 4 +---
 mindspore/lite/tools/cropper/build_cropper_config.sh | 1 +
 mindspore/lite/tools/cropper/cropper.cc              | 2 +-
 mindspore/lite/tools/cropper/cropper.h               | 1 -
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index d36ddf9337..ac5b93aa43 100755
--- a/build.sh
+++ b/build.sh
@@ -514,7 +514,7 @@ build_lite()
     if [ "${ENABLE_GPU}" == "on" ] && [ "${LITE_PLATFORM}" == "arm64" ] || [ $1 == "arm64" ]; then
       echo "start get opencl"
     fi
-    if [ "${ENABLE_NPU}" == "on" ]; then
+    if [ "${LITE_ENABLE_NPU}" == "on" ]; then
       checkddk
     fi
 
diff --git a/mindspore/lite/src/runtime/agent/npu/npu_manager.cc b/mindspore/lite/src/runtime/agent/npu/npu_manager.cc
index 56e7f08a34..fb20549a98 100644
--- a/mindspore/lite/src/runtime/agent/npu/npu_manager.cc
+++ b/mindspore/lite/src/runtime/agent/npu/npu_manager.cc
@@ -113,6 +113,10 @@ bool NPUManager::IsKirinChip() {
       continue;
     }
     auto kirin_number_str = line.substr(index + 5);
+    if (kirin_number_str == "9000E") {
+      cpu_info.close();
+      return true;
+    }
     auto kirin_number = atoi(kirin_number_str.c_str());
     if (kirin_number >= 985 || kirin_number == 810 || kirin_number == 820) {
       cpu_info.close();
diff --git a/mindspore/lite/src/runtime/agent/npu/npu_manager.h b/mindspore/lite/src/runtime/agent/npu/npu_manager.h
index bb5548b012..dc132df814 100644
--- a/mindspore/lite/src/runtime/agent/npu/npu_manager.h
+++ b/mindspore/lite/src/runtime/agent/npu/npu_manager.h
@@ -34,9 +34,7 @@ static std::set<mindspore::schema::PrimitiveType> npu_trans_nodes = {
 struct SubGraphModel {
  public:
   SubGraphModel(int index, std::string model_name, domi::ModelBufferData *model_buffer_data)
-      : index_(index), model_name_(std::move(model_name)), model_buffer_data_(model_buffer_data) {
-    std::cout << model_name;
-  }
+      : index_(index), model_name_(std::move(model_name)), model_buffer_data_(model_buffer_data) {}
 
   bool is_freed = false;
   bool is_loaded = false;
diff --git a/mindspore/lite/tools/cropper/build_cropper_config.sh b/mindspore/lite/tools/cropper/build_cropper_config.sh
index e00123a85b..5081d0ec1b 100644
--- a/mindspore/lite/tools/cropper/build_cropper_config.sh
+++ b/mindspore/lite/tools/cropper/build_cropper_config.sh
@@ -179,6 +179,7 @@ getOpsFile "Registry\(schema::PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/
 getOpsFile "REG_KERNEL\(.*?, kNumberTypeFloat32, PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/runtime/kernel/arm" "kNumberTypeFloat32" &
 getOpsFile "REG_KERNEL\(.*?, kNumberTypeFloat16, PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/runtime/kernel/arm" "kNumberTypeFloat16" &
 getOpsFile "REG_KERNEL\(.*?, kNumberTypeInt8, PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/runtime/kernel/arm" "kNumberTypeInt8" &
+getOpsFile "REG_KERNEL\(.*?, kNumberTypeInt32, PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/runtime/kernel/arm" "kNumberTypeInt32" &
 wait
 echo "remove duplicate files"
 # remove duplicate files
diff --git a/mindspore/lite/tools/cropper/cropper.cc b/mindspore/lite/tools/cropper/cropper.cc
index 93e83b609c..c9c3ecc502 100644
--- a/mindspore/lite/tools/cropper/cropper.cc
+++ b/mindspore/lite/tools/cropper/cropper.cc
@@ -180,7 +180,7 @@ int Cropper::GetOpMatchFiles() {
         String primitive = mapping[0];
         String type = mapping[1];
         String file = mapping[2];
-        if (type == "kNumberTypeFloat32" || type == "kNumberTypeFloat16") {
+        if (type == "kNumberTypeFloat32" || type == "kNumberTypeFloat16" || type == "kNumberTypeInt32") {
           for (auto op : this->fp32_operators_) {
             if (schema::EnumNamePrimitiveType(op) == primitive) {
               MS_LOG(DEBUG) << "kNumberTypeFloat32:" << mapping[2];
diff --git a/mindspore/lite/tools/cropper/cropper.h b/mindspore/lite/tools/cropper/cropper.h
index af1f78ed76..320a160dce 100644
--- a/mindspore/lite/tools/cropper/cropper.h
+++ b/mindspore/lite/tools/cropper/cropper.h
@@ -57,7 +57,6 @@ class MS_API Cropper {
 
   std::set<schema::PrimitiveType> all_operators_;
   std::set<schema::PrimitiveType> int8_operators_;
-  std::set<schema::PrimitiveType> fp16_operators_;
   std::set<schema::PrimitiveType> fp32_operators_;
 
  private: