|
|
|
@@ -216,7 +216,7 @@ static Status CheckOutNode(ge::OpDescPtr op_desc, int32_t index) { |
|
|
|
} |
|
|
|
|
|
|
|
domi::Status VerifyOutputTypeAndOutNodes(std::vector<std::string> &out_type_vec) { |
|
|
|
std::vector<std::pair<std::string, int32_t>> user_out_nodes = domi::GetContext().user_out_nodes; |
|
|
|
std::vector<std::pair<std::string, int32_t>> user_out_nodes = ge::GetParserContext().user_out_nodes; |
|
|
|
std::set<std::string> 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<string> &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<string> 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<std::pair<ge::NodePtr, int32_t>> &output_nodes_info, |
|
|
|
std::vector<std::string> &output_nodes_name) { |
|
|
|
std::vector<std::string> &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::vector<std::pair<ge::Node |
|
|
|
for (size_t i = 0; i < output_nodes_info.size(); ++i) { |
|
|
|
std::string node_name = output_nodes_info[i].first->GetName(); |
|
|
|
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)); |
|
|
|
|