Merge branch 'alibaba:master' into mnn_kai_sme

alibaba · Dec 11, 2024 · b5a3900 · b5a3900
2 parents 20d9b5f + 0046e50
commit b5a3900
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/express/Executor.cpp b/express/Executor.cpp
@@ -376,9 +376,9 @@ void Executor::RuntimeManager::updateCache() {
         MNN_PRINT("Update cache to %s, size = %zu\n", mInside->mCache->cacheFile.c_str(), buffer.second);
         writeCacheFile(mInside->mCache, buffer);
         mInside->mCache->lastCacheSize = buffer.second;
+        // Reset cache
+        loadCache(mInside->mInfo, buffer.first, buffer.second);
     }
-    // Reset cache
-    loadCache(mInside->mInfo, nullptr, 0);
 }
 
 std::vector<bool> Executor::RuntimeManager::isBackendSupport(const std::vector<MNNForwardType> types) {

diff --git a/source/utils/InitNet.cpp b/source/utils/InitNet.cpp
@@ -204,6 +204,9 @@ bool initTensors(std::vector<std::shared_ptr<Tensor>>& tensors, const Net* net,
         }
         auto blob = des->blob();
         auto& tb = tensors[index]->buffer();
+        if (nullptr == blob) {
+            continue;
+        }
         if (auto idims = blob->dims()) {
             for (int d = 0; d < idims->size(); d++) {
                 tb.dim[d].extent = idims->Get(d);