Browse Source

!141 add validation of fmk type for plugin load.

Merge pull request !141 from yangyongqiang/master
pull/141/MERGE
储星 Gitee 5 years ago
parent
commit
befc2aac08
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      parser/common/acl_graph_parser_util.cc
  2. +2
    -2
      parser/common/parser_api.cc

+ 1
- 1
parser/common/acl_graph_parser_util.cc View File

@@ -217,7 +217,7 @@ domi::Status AclGrphParseUtil::AclParserInitialize(const std::map<std::string, s
std::vector<OpRegistrationData> registrationDatas = op_registry->registrationDatas;
GELOGI("The size of registrationDatas in parser is: %zu", registrationDatas.size());
for (OpRegistrationData &reg_data : registrationDatas) {
if (ge::TypeUtils::FmkTypeToSerialString(reg_data.GetFrameworkType()) == fmk_type) {
if (std::to_string(reg_data.GetFrameworkType()) == fmk_type) {
(void)OpRegistrationTbe::Instance()->Finalize(reg_data, false);
(void)domi::OpRegistry::Instance()->Register(reg_data);
}


+ 2
- 2
parser/common/parser_api.cc View File

@@ -39,7 +39,7 @@ Status ParserInitialize(const std::map<std::string, std::string> &options) {
// load custom op plugin
TBEPluginManager::Instance().LoadPluginSo(options);

std::string fmk_type = ge::TypeUtils::FmkTypeToSerialString(domi::TENSORFLOW);
std::string fmk_type = std::to_string(domi::TENSORFLOW);
auto it = options.find(ge::FRAMEWORK_TYPE);
if (it != options.end()) {
fmk_type = it->second;
@@ -48,7 +48,7 @@ Status ParserInitialize(const std::map<std::string, std::string> &options) {
std::vector<OpRegistrationData> registrationDatas = domi::OpRegistry::Instance()->registrationDatas;
GELOGI("The size of registrationDatas in parser is: %zu", registrationDatas.size());
for (OpRegistrationData &reg_data : registrationDatas) {
if (ge::TypeUtils::FmkTypeToSerialString(reg_data.GetFrameworkType()) == fmk_type) {
if (std::to_string(reg_data.GetFrameworkType()) == fmk_type) {
(void)OpRegistrationTbe::Instance()->Finalize(reg_data, true);
}
}


Loading…
Cancel
Save