From 6e9ab1ead07f3c3985156ee188afaebf569cb553 Mon Sep 17 00:00:00 2001
From: y00500818 <yangyongqiang7@hisilicon.com>
Date: Fri, 18 Dec 2020 18:17:41 +0800
Subject: [PATCH] bugfix for load plugin.

---
 parser/common/acl_graph_parser_util.cc | 12 ++++++++++--
 parser/common/parser_api.cc            |  9 ++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/parser/common/acl_graph_parser_util.cc b/parser/common/acl_graph_parser_util.cc
index d6358d8..028f6ce 100644
--- a/parser/common/acl_graph_parser_util.cc
+++ b/parser/common/acl_graph_parser_util.cc
@@ -220,11 +220,19 @@ domi::Status AclGrphParseUtil::AclParserInitialize(const std::map<std::string, s
     return FAILED;
   }
 
+  auto it = options.find(ge::FRAMEWORK_TYPE);
+  if (it == options.end()) {
+    GELOGE(FAILED, "Can not find ge.frameworkType in options");
+    return FAILED;
+  }
+  std::string fmk_type = it->second;
   std::vector<OpRegistrationData> registrationDatas = op_registry->registrationDatas;
   GELOGI("The size of registrationDatas in parser is: %zu", registrationDatas.size());
   for (OpRegistrationData &reg_data : registrationDatas) {
-    (void)OpRegistrationTbe::Instance()->Finalize(reg_data, false);
-    domi::OpRegistry::Instance()->Register(reg_data);
+    if (std::to_string(reg_data.GetFrameworkType()) == fmk_type) {
+      (void)OpRegistrationTbe::Instance()->Finalize(reg_data, false);
+      (void)domi::OpRegistry::Instance()->Register(reg_data);
+    }
   }
 
   // set init status
diff --git a/parser/common/parser_api.cc b/parser/common/parser_api.cc
index d582ed7..baa8c98 100644
--- a/parser/common/parser_api.cc
+++ b/parser/common/parser_api.cc
@@ -38,10 +38,17 @@ Status ParserInitialize(const std::map<std::string, std::string> &options) {
   // load custom op plugin
   TBEPluginLoader::Instance().LoadPluginSo(options);
 
+  std::string fmk_type = std::to_string(domi::TENSORFLOW);
+  auto it = options.find(ge::FRAMEWORK_TYPE);
+  if (it != options.end()) {
+   fmk_type = it->second;
+  }
   std::vector<OpRegistrationData> registrationDatas = domi::OpRegistry::Instance()->registrationDatas;
   GELOGI("The size of registrationDatas in parser is: %zu", registrationDatas.size());
   for (OpRegistrationData &reg_data : registrationDatas) {
-    (void)OpRegistrationTbe::Instance()->Finalize(reg_data, true);
+    if (std::to_string(reg_data.GetFrameworkType()) == fmk_type) {
+      (void)OpRegistrationTbe::Instance()->Finalize(reg_data, true);
+    }
   }
 
   auto iter = options.find(ge::OPTION_EXEC_ENABLE_SCOPE_FUSION_PASSES);