Browse Source

TaskInfo release OpDesc after distribute.

tags/v1.2.0
zhangxiaokun 3 years ago
parent
commit
bd743a288b
6 changed files with 6 additions and 8 deletions
  1. +0
    -1
      ge/graph/load/new_model_manager/davinci_model.h
  2. +1
    -1
      ge/graph/load/new_model_manager/task_info/hccl_task_info.cc
  3. +0
    -2
      ge/graph/load/new_model_manager/task_info/hccl_task_info.h
  4. +3
    -3
      ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc
  5. +1
    -1
      ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.h
  6. +1
    -0
      ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc

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

@@ -616,7 +616,6 @@ class DavinciModel {
Status SyncVarData(); Status SyncVarData();


Status InitWeightMem(void *dev_ptr, void *weight_ptr, size_t weight_size); Status InitWeightMem(void *dev_ptr, void *weight_ptr, size_t weight_size);

Status InitFeatureMapAndP2PMem(void *dev_ptr, size_t mem_size); Status InitFeatureMapAndP2PMem(void *dev_ptr, size_t mem_size);


void CreateInputDimsInfo(const OpDescPtr &op_desc, Format format, InputOutputDescInfo &input); void CreateInputDimsInfo(const OpDescPtr &op_desc, Format format, InputOutputDescInfo &input);


+ 1
- 1
ge/graph/load/new_model_manager/task_info/hccl_task_info.cc View File

@@ -59,7 +59,7 @@ Status HcclTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davinci_m
GELOGI("HcclTaskInfo Init, op_index is: %u", op_index); GELOGI("HcclTaskInfo Init, op_index is: %u", op_index);


// Get HCCL op // Get HCCL op
const auto op_desc = davinci_model->GetOpByIndex(op_index);
const auto op_desc = davinci_model_->GetOpByIndex(op_index);
GE_CHECK_NOTNULL(op_desc); GE_CHECK_NOTNULL(op_desc);


// Create the kernel hccl infos // Create the kernel hccl infos


+ 0
- 2
ge/graph/load/new_model_manager/task_info/hccl_task_info.h View File

@@ -35,7 +35,6 @@ class HcclTaskInfo : public TaskInfo {
ops_kernel_store_(nullptr), ops_kernel_store_(nullptr),
private_def_(nullptr), private_def_(nullptr),
private_def_len_(0), private_def_len_(0),
op_desc_(nullptr),
args_(nullptr), args_(nullptr),
args_offset_(0) {} args_offset_(0) {}


@@ -77,7 +76,6 @@ class HcclTaskInfo : public TaskInfo {
static std::mutex hccl_follow_stream_mutex_; static std::mutex hccl_follow_stream_mutex_;
vector<GETaskKernelHcclInfo> kernel_hccl_infos_; vector<GETaskKernelHcclInfo> kernel_hccl_infos_;
vector<void *> io_addrs_; vector<void *> io_addrs_;
OpDescPtr op_desc_;
void *args_; void *args_;
uint32_t args_offset_; uint32_t args_offset_;
}; };


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

@@ -128,7 +128,7 @@ Status KernelExTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davin
return RT_ERROR_TO_GE_STATUS(rt_ret);) return RT_ERROR_TO_GE_STATUS(rt_ret);)


GELOGI("KernelExTaskInfo knonw node Init Success."); GELOGI("KernelExTaskInfo knonw node Init Success.");
return SetIoAddr(op_desc);
return SetIoAddrs(op_desc);
} }


// 3. Set workspaceaddr, inputOutputDataAddr // 3. Set workspaceaddr, inputOutputDataAddr
@@ -192,7 +192,7 @@ Status KernelExTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davin
davinci_model_->SetZeroCopyAddr(op_desc, io_addrs, io_addrs.data(), input_output_addr_, addrs_size, 0); davinci_model_->SetZeroCopyAddr(op_desc, io_addrs, io_addrs.data(), input_output_addr_, addrs_size, 0);


GELOGI("KernelExTaskInfo Init Success. session id: %lu", session_id); GELOGI("KernelExTaskInfo Init Success. session id: %lu", session_id);
return SetIoAddr(op_desc);
return SetIoAddrs(op_desc);
} }


Status KernelExTaskInfo::CalculateArgs(const domi::TaskDef &task_def, DavinciModel *davinci_model) { Status KernelExTaskInfo::CalculateArgs(const domi::TaskDef &task_def, DavinciModel *davinci_model) {
@@ -231,7 +231,7 @@ Status KernelExTaskInfo::CalculateArgs(const domi::TaskDef &task_def, DavinciMod
return SUCCESS; return SUCCESS;
} }


Status KernelExTaskInfo::SetIoAddr(const OpDescPtr &op_desc) {
Status KernelExTaskInfo::SetIoAddrs(const OpDescPtr &op_desc) {
const RuntimeParam &rts_param = davinci_model_->GetRuntimeParam(); const RuntimeParam &rts_param = davinci_model_->GetRuntimeParam();
vector<void *> input_data_addrs = ModelUtils::GetInputDataAddrs(rts_param, op_desc); vector<void *> input_data_addrs = ModelUtils::GetInputDataAddrs(rts_param, op_desc);
vector<void *> output_data_addrs = ModelUtils::GetOutputDataAddrs(rts_param, op_desc); vector<void *> output_data_addrs = ModelUtils::GetOutputDataAddrs(rts_param, op_desc);


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

@@ -59,7 +59,7 @@ class KernelExTaskInfo : public TaskInfo {
}; };
private: private:
Status CopyTaskInfo(const domi::KernelExDef &kernel_def, const RuntimeParam &rts_param, const OpDescPtr &op_desc); Status CopyTaskInfo(const domi::KernelExDef &kernel_def, const RuntimeParam &rts_param, const OpDescPtr &op_desc);
Status SetIoAddr(const OpDescPtr &op_desc);
Status SetIoAddrs(const OpDescPtr &op_desc);


uint32_t task_id_; uint32_t task_id_;
uint32_t stream_id_; uint32_t stream_id_;


+ 1
- 0
ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc View File

@@ -85,6 +85,7 @@ Status MemcpyAsyncTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *da
} else { } else {
io_addrs_.emplace_back(reinterpret_cast<void *>(dst_)); io_addrs_.emplace_back(reinterpret_cast<void *>(dst_));
} }

return SUCCESS; return SUCCESS;
} }




Loading…
Cancel
Save