Browse Source

fix unknown shape aicpu

tags/v1.2.0
zhangxiaokun 4 years ago
parent
commit
daefed5c5c
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      ge/graph/load/new_model_manager/davinci_model.cc
  2. +1
    -1
      ge/graph/load/new_model_manager/davinci_model.h

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

@@ -2859,8 +2859,8 @@ void DavinciModel::SetTotalIOAddrs(const vector<void *> &io_addrs) {
}
}

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


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

@@ -531,7 +531,7 @@ class DavinciModel {
Status MallocKnownArgs();
Status UpdateKnownNodeArgs(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; }

Status GetOrigInputInfo(uint32_t index, OriginInputInfo &orig_input_info);


Loading…
Cancel
Save