m53297601
/
graphengine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix unknown shape aicpu

Browse Source
pull/822/head
zhangxiaokun 4 years ago
parent f44238d037
commit daefed5c5c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
ge/graph/load/new_model_manager/davinci_model.cc
Unescape View File

@ -2859,8 +2859,8 @@ void DavinciModel::SetTotalIOAddrs(const vector<void *> &io_addrs) {
} }
} }
Status DavinciModel::UpdateKnownZeroCopyAddr(vector<void *> &total_io_addrs) { Status DavinciModel::UpdateKnownZeroCopyAddr(vector<void *> &total_io_addrs, bool update_args) {
if (fixed_mem_base_ != reinterpret_cast<uintptr_t>(mem_base_)) { if (fixed_mem_base_ != reinterpret_cast<uintptr_t>(mem_base_) && update_args) {
for (size_t i = 0; i < total_io_addrs.size(); ++i) { for (size_t i = 0; i < total_io_addrs.size(); ++i) {
total_io_addrs[i] = GetRunAddress(total_io_addrs[i]); total_io_addrs[i] = GetRunAddress(total_io_addrs[i]);
} }
@ -2904,7 +2904,7 @@ Status DavinciModel::UpdateKnownNodeArgs(const vector<void *> &inputs, const vec
} else { } else {
total_io_addrs_ = orig_total_io_addrs_; total_io_addrs_ = orig_total_io_addrs_;
} }
GE_CHK_STATUS_RET(UpdateKnownZeroCopyAddr(total_io_addrs_), "DavinciModel::UpdateKnownZeroCopyAddr failed."); GE_CHK_STATUS_RET(UpdateKnownZeroCopyAddr(total_io_addrs_, false), "DavinciModel::UpdateKnownZeroCopyAddr failed.");
if (total_args_size_ == 0) { if (total_args_size_ == 0) {
GELOGW("DavinciModel::UpdateKnownNodeArgs device args %p, dst size %u, pass rtMemcpy.", args_, total_args_size_); GELOGW("DavinciModel::UpdateKnownNodeArgs device args %p, dst size %u, pass rtMemcpy.", args_, total_args_size_);

2
ge/graph/load/new_model_manager/davinci_model.h
Unescape View File

@ -531,7 +531,7 @@ class DavinciModel {
Status MallocKnownArgs(); Status MallocKnownArgs();
Status UpdateKnownNodeArgs(const vector<void *> &inputs, const vector<void *> &outputs); Status UpdateKnownNodeArgs(const vector<void *> &inputs, const vector<void *> &outputs);
Status CreateKnownZeroCopyMap(const vector<void *> &inputs, const vector<void *> &outputs); Status CreateKnownZeroCopyMap(const vector<void *> &inputs, const vector<void *> &outputs);
Status UpdateKnownZeroCopyAddr(vector<void *> &total_io_addrs); Status UpdateKnownZeroCopyAddr(vector<void *> &total_io_addrs, bool update_args = true);
void SetKnownNodeAddrNotChanged(bool base_addr_not_changed) { base_addr_not_changed_ = base_addr_not_changed; } void SetKnownNodeAddrNotChanged(bool base_addr_not_changed) { base_addr_not_changed_ = base_addr_not_changed; }
Status GetOrigInputInfo(uint32_t index, OriginInputInfo &orig_input_info); Status GetOrigInputInfo(uint32_t index, OriginInputInfo &orig_input_info);

Write Preview
Loading…
Cancel
Save