Browse Source

fix

pull/1776/head
wjm 4 years ago
parent
commit
114ea845ad
3 changed files with 5 additions and 10 deletions
  1. +2
    -1
      ge/graph/load/model_manager/cpu_queue_schedule.cc
  2. +2
    -2
      ge/graph/load/model_manager/davinci_model.cc
  3. +1
    -7
      ge/graph/load/model_manager/davinci_model.h

+ 2
- 1
ge/graph/load/model_manager/cpu_queue_schedule.cc View File

@@ -238,6 +238,7 @@ Status CpuTaskModelPostpare::Init(uint32_t model_id, const vector<uint32_t> &out
} }


AicpuPareInfo aicpu_info; AicpuPareInfo aicpu_info;
aicpu_info.aicpu_info_size = sizeof(AicpuPareInfo);
aicpu_info.model_id = model_id; aicpu_info.model_id = model_id;
aicpu_info.out_queue_num = output_queue_ids.size(); aicpu_info.out_queue_num = output_queue_ids.size();
aicpu_info.out_queueid_list = static_cast<uint64_t>(reinterpret_cast<uintptr_t>(queue_id_list_addr_)); aicpu_info.out_queueid_list = static_cast<uint64_t>(reinterpret_cast<uintptr_t>(queue_id_list_addr_));
@@ -288,7 +289,7 @@ CpuTaskModelPostpare::~CpuTaskModelPostpare() {
/// @ingroup ge /// @ingroup ge
/// @brief definiteness queue schedule, active entry stream. /// @brief definiteness queue schedule, active entry stream.
/// @param [in] stream: stream to be active. /// @param [in] stream: stream to be active.
/// @return: 0 for success / others for failCpuTaskModelPostpareed
/// @return: 0 for success / others for failed
/// ///
Status CpuTaskActiveEntry::Init(rtStream_t stream) { Status CpuTaskActiveEntry::Init(rtStream_t stream) {
if (stream == nullptr) { if (stream == nullptr) {


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

@@ -1687,7 +1687,7 @@ Status DavinciModel::CpuPostpare() {
std::shared_ptr<CpuTaskModelPostpare> postpare_task = MakeShared<CpuTaskModelPostpare>(rt_entry_stream_); std::shared_ptr<CpuTaskModelPostpare> postpare_task = MakeShared<CpuTaskModelPostpare>(rt_entry_stream_);
if (postpare_task == nullptr) { if (postpare_task == nullptr) {
REPORT_CALL_ERROR("E19999", "New CpuTaskModelPostpare failed, model_id:%u", model_id_); REPORT_CALL_ERROR("E19999", "New CpuTaskModelPostpare failed, model_id:%u", model_id_);
GELOGE(MEMALLOC_FAILED, "[New][CpuTaskModelPostpare] failed, model_id:%u", model_id_);
GELOGE(MEMALLOC_FAILED, "[New][CpuTaskModelPostpare] task failed, model_id:%u", model_id_);
return MEMALLOC_FAILED; return MEMALLOC_FAILED;
} }


@@ -1697,7 +1697,7 @@ Status DavinciModel::CpuPostpare() {
} }


cpu_task_list_.push_back(postpare_task); cpu_task_list_.push_back(postpare_task);
GELOGI("Set CpuKernel model postpare task enter.");
GELOGI("Set CpuKernel model postpare task success.");
return SUCCESS; return SUCCESS;
} }




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

@@ -803,11 +803,6 @@ class DavinciModel {
/// ///
Status LoadWithQueue(); Status LoadWithQueue();


///
/// @ingroup ge
/// @brief ACL, Bind Data Op addr to input queue.
/// @return: 0 for success / others for fail
///
Status CpuPrepare(); Status CpuPrepare();


Status CpuPostpare(); Status CpuPostpare();
@@ -966,8 +961,7 @@ class DavinciModel {
vector<TaskInfoPtr> cpu_task_list_; vector<TaskInfoPtr> cpu_task_list_;
vector<uint32_t> input_queue_ids_; // input queue ids created by caller. vector<uint32_t> input_queue_ids_; // input queue ids created by caller.
vector<uint32_t> output_queue_ids_; // output queue ids created by caller. vector<uint32_t> output_queue_ids_; // output queue ids created by caller.
vector<uintptr_t> input_mbuf_list_; // input mbuf created by dequeue task.
vector<uintptr_t> output_mbuf_list_; // output mbuf created by dequeue task.
vector<uintptr_t> output_mbuf_list_;


uint64_t session_id_; uint64_t session_id_;
struct error_message::Context error_context_; struct error_message::Context error_context_;


Loading…
Cancel
Save