From 77ead9377b1007ee6b5c915317e5b240cfd62f8b Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Tue, 13 Jul 2021 14:32:05 +0800 Subject: [PATCH] fix(src/serialization): fix compatibility error of oss model GitOrigin-RevId: 43e0fa4fe14cbfdcbc835a35487368098e9772ed --- sdk/load-and-run/dump_with_testcase_mge.py | 2 +- src/serialization/impl/serializer_oss.cpp | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sdk/load-and-run/dump_with_testcase_mge.py b/sdk/load-and-run/dump_with_testcase_mge.py index 8f173356..524ef1fa 100755 --- a/sdk/load-and-run/dump_with_testcase_mge.py +++ b/sdk/load-and-run/dump_with_testcase_mge.py @@ -309,7 +309,7 @@ def optimize_for_inference(args, outputs): "enable_chwn4", "enable_fuse_conv_bias_nonlinearity", "enable_fuse_conv_bias_with_z", - "eaable_fuse_preprocess", + "enable_fuse_preprocess", ] kwargs = {} for k in args_list: diff --git a/src/serialization/impl/serializer_oss.cpp b/src/serialization/impl/serializer_oss.cpp index dd9bafc8..dfd1af3b 100644 --- a/src/serialization/impl/serializer_oss.cpp +++ b/src/serialization/impl/serializer_oss.cpp @@ -723,15 +723,17 @@ GraphLoaderOSS::OprLoadContextImpl::load_tensor_shared() { Metadata GraphLoaderOSS::OprLoadContextImpl::load_metadata() { const auto* fbmeta = m_loader->m_graph->metadata(); Metadata ret; - ret.is_valid = fbmeta->is_valid(); - ret.graph_modified = fbmeta->graph_modified(); - if (fbmeta->user_info()) { - ret.user_info = fbmeta->user_info()->str(); - ret.has_user_info = true; - } - if (fbmeta->optimize_options()) { - ret.optimize_options = fbmeta->optimize_options(); - ret.optimized_for_inference = true; + if (fbmeta) { + ret.is_valid = fbmeta->is_valid(); + ret.graph_modified = fbmeta->graph_modified(); + if (fbmeta->user_info()) { + ret.user_info = fbmeta->user_info()->str(); + ret.has_user_info = true; + } + if (fbmeta->optimize_options()) { + ret.optimize_options = fbmeta->optimize_options(); + ret.optimized_for_inference = true; + } } return ret; }