Browse Source

Fix No NetOutput Model Logic

tags/v1.2.0
zhangxiaokun 4 years ago
parent
commit
c21ca96511
2 changed files with 8 additions and 6 deletions
  1. +7
    -6
      ge/graph/load/model_manager/davinci_model.cc
  2. +1
    -0
      ge/graph/load/model_manager/davinci_model.h

+ 7
- 6
ge/graph/load/model_manager/davinci_model.cc View File

@@ -1095,6 +1095,7 @@ Status DavinciModel::InitNetOutput(const ComputeGraphPtr &graph, const NodePtr &


GELOGI("Init NetOutput node: %s.", op_desc->GetName().c_str()); GELOGI("Init NetOutput node: %s.", op_desc->GetName().c_str());
output_op_list.push_back(op_desc); output_op_list.push_back(op_desc);
has_output_node_ = true;
if (known_node_) { if (known_node_) {
return SUCCESS; return SUCCESS;
} }
@@ -2422,7 +2423,7 @@ void DavinciModel::SetProfileTime(ModelProcStage stage, int64_t endTime) {
/// @author /// @author
/// ///
Status DavinciModel::CopyOutputData(uint32_t data_id, OutputData &output_data, rtMemcpyKind_t kind) { Status DavinciModel::CopyOutputData(uint32_t data_id, OutputData &output_data, rtMemcpyKind_t kind) {
if (output_addrs_list_.empty()) {
if (!has_output_node_) {
Status ret = SyncVarData(); Status ret = SyncVarData();
return ret; return ret;
} }
@@ -2582,7 +2583,7 @@ Status DavinciModel::ReturnResult(uint32_t data_id, const bool rslt_flg, const b
return INTERNAL_ERROR; return INTERNAL_ERROR;
} }


if (output_addrs_list_.empty()) {
if (!has_output_node_) {
GELOGW("Output tensor list is empty, model id: %u", model_id_); GELOGW("Output tensor list is empty, model id: %u", model_id_);
GE_CHK_STATUS(listener_->OnComputeDone(model_id_, data_id, INTERNAL_ERROR, outputs), "OnComputeDone failed."); GE_CHK_STATUS(listener_->OnComputeDone(model_id_, data_id, INTERNAL_ERROR, outputs), "OnComputeDone failed.");
return INTERNAL_ERROR; return INTERNAL_ERROR;
@@ -2735,10 +2736,10 @@ void *DavinciModel::Run(DavinciModel *model) {
model->SetProfileTime(MODEL_AFTER_PROC_START)); model->SetProfileTime(MODEL_AFTER_PROC_START));
GE_TIMESTAMP_START(ReturnResult3); GE_TIMESTAMP_START(ReturnResult3);
// copy output data from device to host // copy output data from device to host
GE_IF_BOOL_EXEC(!model->output_addrs_list_.empty(),
(void)model->ReturnResult(current_data.index, rslt_flg, false, data_wrapper->GetOutput()))
GE_IF_BOOL_EXEC(model->has_output_node_,
(void)model->ReturnResult(current_data.index, rslt_flg, false, data_wrapper->GetOutput()));
// copy output data from device to host for variable graph // copy output data from device to host for variable graph
GE_IF_BOOL_EXEC(model->output_addrs_list_.empty(), (void)model->ReturnNoOutput(current_data.index));
GE_IF_BOOL_EXEC(!model->has_output_node_, (void)model->ReturnNoOutput(current_data.index));
GE_IF_BOOL_EXEC(model->is_first_execute_, GE_IF_BOOL_EXEC(model->is_first_execute_,
GE_TIMESTAMP_EVENT_END(ReturnResult3, "GraphExcute::CopyDataFromDeviceToHost")); GE_TIMESTAMP_EVENT_END(ReturnResult3, "GraphExcute::CopyDataFromDeviceToHost"));
GE_IF_BOOL_EXEC(ProfilingManager::Instance().ProfilingModelExecuteOn(), GE_IF_BOOL_EXEC(ProfilingManager::Instance().ProfilingModelExecuteOn(),
@@ -2890,7 +2891,7 @@ Status DavinciModel::CreateKnownZeroCopyMap(const vector<void *> &inputs, const
GELOGI("input %zu, v addr %p, r addr %p, p addr %p", i, addr_list[kDataIndex], addr, inputs[i]); GELOGI("input %zu, v addr %p, r addr %p, p addr %p", i, addr_list[kDataIndex], addr, inputs[i]);
} }


if (output_addrs_list_.empty()) {
if (!has_output_node_) {
GELOGW("output op num in graph is %zu", output_addrs_list_.size()); GELOGW("output op num in graph is %zu", output_addrs_list_.size());
return SUCCESS; return SUCCESS;
} }


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

@@ -1042,6 +1042,7 @@ class DavinciModel {
// For super kernel. // For super kernel.
SuperKernelTaskInfo skt_info_; SuperKernelTaskInfo skt_info_;


bool has_output_node_ = false;
bool is_dynamic_aipp_ = false; bool is_dynamic_aipp_ = false;
vector<string> dynamic_output_shape_info_; vector<string> dynamic_output_shape_info_;




Loading…
Cancel
Save