diff --git a/ge/graph/load/model_manager/data_dumper.cc b/ge/graph/load/model_manager/data_dumper.cc index 947aac1d..235cffa9 100644 --- a/ge/graph/load/model_manager/data_dumper.cc +++ b/ge/graph/load/model_manager/data_dumper.cc @@ -820,6 +820,7 @@ Status DataDumper::UnloadDumpInfo() { for (const auto &op_iter : op_list_) { aicpu::dump::Task task; task.set_task_id(op_iter.task_id); + task.set_stream_id(op_iter.stream_id); op_mapping_info.mutable_task()->Add(std::move(task)); } auto ret = ExecuteUnLoadDumpInfo(op_mapping_info); @@ -834,7 +835,6 @@ void DataDumper::DumpShrink() { compute_graph_.reset(); input_map_.clear(); ref_info_.clear(); - op_list_.clear(); } void DataDumper::PrintCheckLog(string &dump_list_key) { diff --git a/ge/graph/load/model_manager/davinci_model.cc b/ge/graph/load/model_manager/davinci_model.cc index fbd5fe22..be33588a 100755 --- a/ge/graph/load/model_manager/davinci_model.cc +++ b/ge/graph/load/model_manager/davinci_model.cc @@ -3967,8 +3967,11 @@ void DavinciModel::SetDataDumperArgs(const ComputeGraphPtr &graph, const map void *{ + if (known_node_) { + data_dumper_.SetLoopAddr(known_shape_global_step_, nullptr, nullptr); + } else { + // set loop count addr + auto get_var_addr = [&](const string &name) -> void *{ const auto it = variable_by_name.find(name); if (it != variable_by_name.end()) { const auto output_sizes = ModelUtils::GetOutputSize(it->second); @@ -3981,10 +3984,10 @@ void DavinciModel::SetDataDumperArgs(const ComputeGraphPtr &graph, const map input_formats_; vector output_descs_; vector output_formats_; + + // known shape node for dump + void *known_shape_global_step_; }; } // namespace ge #endif // GE_GRAPH_LOAD_NEW_MODEL_MANAGER_DAVINCI_MODEL_H_ diff --git a/ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc b/ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc index c34a4e9a..6da1bf63 100644 --- a/ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc +++ b/ge/graph/load/model_manager/task_info/kernel_ex_task_info.cc @@ -192,7 +192,7 @@ void KernelExTaskInfo::InitDumpTask(void *addr, const OpDescPtr &op_desc) { if (davinci_model_->GetDumpProperties().IsLayerNeedDump(davinci_model_->Name(), davinci_model_->OmName(), op_desc->GetName())) { dump_flag_ = RT_KERNEL_DUMPFLAG; - dump_args_ = input_output_addr_; + dump_args_ = addr; } } diff --git a/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc b/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc index 2bca3e06..0837ffff 100755 --- a/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc +++ b/ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc @@ -126,6 +126,12 @@ Status KnownNodeTask::Init(TaskContext &context) { auto dump_properties = context.GetDumpProperties(); if (dump_properties.IsDumpOpen()) { davinci_model_->SetDumpProperties(dump_properties); + void *global_step = nullptr; + TensorValue *varible_global_step = context.GetVariable(NODE_NAME_GLOBAL_STEP); + if (varible_global_step != nullptr) { + global_step = varible_global_step->MutableData(); + } + davinci_model_->SetKnownShapeGlobalStep(global_step); } int32_t device_id = 0; rtError_t rt_ret = rtGetDevice(&device_id);