From 44ebfa521c26d868b172f0601f9efaacba484b92 Mon Sep 17 00:00:00 2001
From: maoyong <maoyong5@huawei.com>
Date: Thu, 4 Jan 2024 10:50:16 +0800
Subject: [PATCH] fix construct from cache bug

Signed-off-by: maoyong <maoyong5@huawei.com>
---
 frameworks/native/nncompiler.cpp | 21 +++++++++++++--------
 frameworks/native/nncompiler.h   |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/frameworks/native/nncompiler.cpp b/frameworks/native/nncompiler.cpp
index 2df5226..f9c6d69 100644
--- a/frameworks/native/nncompiler.cpp
+++ b/frameworks/native/nncompiler.cpp
@@ -20,7 +20,6 @@
 #include <climits>
 #include <securec.h>
 
-#include "inner_model.h"
 #include "validation.h"
 #include "nncompiled_cache.h"
 #include "common/utils.h"
@@ -122,13 +121,13 @@ NNCompiler::NNCompiler(const void* model, std::shared_ptr<Device> device, size_t
 {
     m_device = device;
     m_backendID = backendID;
-    const InnerModel* innerModel = reinterpret_cast<const InnerModel*>(model);
-    m_liteGraph = innerModel->GetLiteGraphs();
-    m_inputTensorDescs = innerModel->GetInputTensorDescs();
-    m_outputTensorDescs = innerModel->GetOutputTensorDescs();
-    m_metaGraph = innerModel->GetMetaGraph();
-    m_quantBuffer = innerModel->GetQuantBuffer();
-    m_modelName = innerModel->GetModelName();
+    m_innerModel = const_cast<InnerModel*>(reinterpret_cast<const InnerModel*>(model));
+    m_liteGraph = m_innerModel->GetLiteGraphs();
+    m_inputTensorDescs = m_innerModel->GetInputTensorDescs();
+    m_outputTensorDescs = m_innerModel->GetOutputTensorDescs();
+    m_metaGraph = m_innerModel->GetMetaGraph();
+    m_quantBuffer = m_innerModel->GetQuantBuffer();
+    m_modelName = m_innerModel->GetModelName();
 }
 
 NNCompiler::~NNCompiler()
@@ -279,6 +278,12 @@ OH_NN_ReturnCode NNCompiler::IsSupportedModel(const std::shared_ptr<mindspore::l
 
 OH_NN_ReturnCode NNCompiler::IsOfflineModel(bool& isOfflineModel) const
 {
+    // If m_innerModel is not passed, the compiler must be construct from cache, jump check m_innerModel.
+    if (m_innerModel == nullptr) {
+        LOGE("[Compilation] Restore from cache not need judge offline model.");
+        return OH_NN_SUCCESS;
+    }
+
     isOfflineModel = false; // Initialize the returned value
     if ((m_liteGraph == nullptr) && (m_metaGraph == nullptr)) {
         LOGE("[Compilation] LiteGraph and metaGraph are empty when identifying the offline model.");
diff --git a/frameworks/native/nncompiler.h b/frameworks/native/nncompiler.h
index c87783a..d0ee94b 100644
--- a/frameworks/native/nncompiler.h
+++ b/frameworks/native/nncompiler.h
@@ -82,6 +82,7 @@ private:
     Buffer m_quantBuffer {nullptr, 0};
     std::string m_modelName;
     void* m_metaGraph {nullptr};
+    InnerModel* m_innerModel {nullptr};
     std::shared_ptr<mindspore::lite::LiteGraph> m_liteGraph {nullptr};
     std::vector<std::pair<std::shared_ptr<TensorDesc>, OH_NN_TensorType>> m_inputTensorDescs;
     std::vector<std::pair<std::shared_ptr<TensorDesc>, OH_NN_TensorType>> m_outputTensorDescs;
-- 
Gitee