diff --git a/parser/common/acl_graph_parser_util.cc b/parser/common/acl_graph_parser_util.cc index 384d0c5..9cd99c6 100644 --- a/parser/common/acl_graph_parser_util.cc +++ b/parser/common/acl_graph_parser_util.cc @@ -216,7 +216,7 @@ static Status CheckOutNode(ge::OpDescPtr op_desc, int32_t index) { } domi::Status VerifyOutputTypeAndOutNodes(std::vector &out_type_vec) { - std::vector> user_out_nodes = domi::GetContext().user_out_nodes; + std::vector> user_out_nodes = ge::GetParserContext().user_out_nodes; std::set out_nodes_info; for (uint32_t i = 0; i < user_out_nodes.size(); ++i) { // out_nodes set should include output_type and output_format @@ -594,8 +594,8 @@ void AclGrphParseUtil::AddAttrsForInputNodes(const vector &adjust_fp16_f } domi::Status AclGrphParseUtil::ParseAclInputFp16Nodes(const ComputeGraphPtr &graph, - const string &input_fp16_nodes, - const string &is_input_adjust_hw_layout) { + const string &input_fp16_nodes, + const string &is_input_adjust_hw_layout) { GE_CHECK_NOTNULL(graph); vector adjust_fp16_format_vec; if (!is_input_adjust_hw_layout.empty()) { @@ -725,9 +725,9 @@ domi::Status AclGrphParseUtil::ParseAclOutputType(const std::string &output_type } void AclGrphParseUtil::GetOutputNodesNameAndIndex(std::vector> &output_nodes_info, - std::vector &output_nodes_name) { + std::vector &output_nodes_name) { output_nodes_name.clear(); - if (domi::GetContext().out_top_names.empty()) { + if (ge::GetParserContext().out_top_names.empty()) { // tf process, no top name. for (const auto output_node_info : output_nodes_info) { std::string node_name = output_node_info.first->GetName(); @@ -740,8 +740,8 @@ void AclGrphParseUtil::GetOutputNodesNameAndIndex(std::vectorGetName(); int32_t index = output_nodes_info[i].second; - if (i < domi::GetContext().out_top_names.size()) { - output_nodes_name.push_back(node_name + ":" + std::to_string(index) + ":" + domi::GetContext().out_top_names[i]); + if (i < ge::GetParserContext().out_top_names.size()) { + output_nodes_name.push_back(node_name + ":" + std::to_string(index) + ":" + ge::GetParserContext().out_top_names[i]); } else { GELOGW("Get top name of node [%s] fail.", node_name.c_str()); output_nodes_name.push_back(node_name + ":" + std::to_string(index)); diff --git a/parser/common/acl_graph_parser_util.h b/parser/common/acl_graph_parser_util.h index 2eb4589..6e869a8 100644 --- a/parser/common/acl_graph_parser_util.h +++ b/parser/common/acl_graph_parser_util.h @@ -44,7 +44,7 @@ class AclGrphParseUtil { domi::Status ParseParamsBeforeGraph(const std::map &parser_params, std::string &graph_name); domi::Status ParseParamsAfterGraph(ge::Graph &graph, - const std::map &parser_params); + const std::map &parser_params); domi::Status ParseOutputInfo(ge::Graph &graph, const std::map &parser_params); private: @@ -68,8 +68,8 @@ class AclGrphParseUtil { const string &fp16_nodes_name, uint32_t index, OpDescPtr &op_desc); domi::Status ParseAclInputFp16Nodes(const ComputeGraphPtr &graph, - const string &input_fp16_nodes, - const string &is_input_adjust_hw_layout); + const string &input_fp16_nodes, + const string &is_input_adjust_hw_layout); domi::Status ParseAclWeightCompressConf(const ComputeGraphPtr &graph, const string &compress_weight_conf); domi::Status ParseAclOutputType(const std::string &output_type,