Browse Source

Eliminate data_op_list_

pull/838/head
zhangxiaokun 5 years ago
parent
commit
03af1c30a8
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      ge/graph/load/new_model_manager/davinci_model.cc
  2. +1
    -1
      ge/graph/load/new_model_manager/davinci_model.h

+ 3
- 3
ge/graph/load/new_model_manager/davinci_model.cc View File

@@ -866,7 +866,7 @@ Status DavinciModel::InitNodes(const ComputeGraphPtr &compute_graph) {
auto it = op_desc_handle.find(op_desc->GetType());
if (it != op_desc_handle.end()) {
if ((this->*it->second)(op_desc) != SUCCESS) {
GELOGE(PARAM_INVALID, "NetOutput init failed, Name: %s", op_desc->GetName().c_str());
GELOGE(PARAM_INVALID, "Node init failed, Name: %s", op_desc->GetName().c_str());
return PARAM_INVALID;
}
continue;
@@ -919,7 +919,7 @@ Status DavinciModel::InitNodes(const ComputeGraphPtr &compute_graph) {

GE_TIMESTAMP_CALLNUM_END(LoadTBEKernelBinToOpDesc, "GraphLoader::LoadTBEKernelBinToOpDesc.");
GE_TIMESTAMP_CALLNUM_END(InitTbeHandle, "GraphLoader::InitTbeHandle.");
return OptInputOutputInfo(data_by_index, output_op_list);
return GenInputOutputInfo(data_by_index, output_op_list);
}

void DavinciModel::SetLabelForDynamic(const NodePtr &node) {
@@ -1007,7 +1007,7 @@ Status DavinciModel::InitDataOp(const ComputeGraphPtr &graph, const NodePtr &nod
/// @param [in] output_op_list: list of NetOutput op.
/// @return Status
///
Status DavinciModel::OptInputOutputInfo(const map<uint32_t, OpDescPtr> &data_by_index,
Status DavinciModel::GenInputOutputInfo(const map<uint32_t, OpDescPtr> &data_by_index,
const vector<OpDescPtr> &output_op_list) {
GELOGD("Data node size: %zu, NetOutput node size: %zu", data_by_index.size(), output_op_list.size());
for (auto &item : data_by_index) {


+ 1
- 1
ge/graph/load/new_model_manager/davinci_model.h View File

@@ -664,7 +664,7 @@ class DavinciModel {
/// @param [in] output_op_list: list of NetOutput op.
/// @return Status
///
Status OptInputOutputInfo(const map<uint32_t, OpDescPtr> &data_by_index, const vector<OpDescPtr> &output_op_list);
Status GenInputOutputInfo(const map<uint32_t, OpDescPtr> &data_by_index, const vector<OpDescPtr> &output_op_list);

///
/// @ingroup ge


Loading…
Cancel
Save