Browse Source

fix SC

pull/588/head
chuxing 4 years ago
parent
commit
0af21277e5
3 changed files with 5 additions and 5 deletions
  1. +2
    -2
      ge/single_op/single_op.cc
  2. +2
    -2
      ge/single_op/stream_resource.cc
  3. +1
    -1
      ge/single_op/stream_resource.h

+ 2
- 2
ge/single_op/single_op.cc View File

@@ -174,8 +174,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status SingleOp::ExecuteAsync(c
std::lock_guard<std::mutex> lk(*stream_mutex_);
auto current_mem_base = stream_resource_->GetMemoryBase();
if (running_param_->mem_base != current_mem_base) {
running_param_->mem_base = current_mem_base;
GELOGD("Memory base changed, new memory base =%lu", current_mem_base);
running_param_->mem_base = const_cast<uint8_t *>(current_mem_base);
GELOGD("Memory base changed, new memory base = %p", current_mem_base);
for (auto &task : tasks_) {
auto new_address = BuildTaskUtils::GetAddresses(task->GetOpdesc(), *running_param_);
GE_CHK_STATUS_RET(task->UpdateArgTable(*running_param_),


+ 2
- 2
ge/single_op/stream_resource.cc View File

@@ -74,7 +74,7 @@ uint8_t *StreamResource::DoMallocMemory(const std::string &purpose,
return nullptr;
}

if (size <= max_allocated) {
if (size <= max_allocated && !allocated.empty()) {
GELOGD("reuse last memory");
return allocated.back();
}
@@ -190,7 +190,7 @@ Status StreamResource::BuildOperator(const string &model_name, const ModelData &
return SUCCESS;
}

uint8_t *StreamResource::GetMemoryBase() const {
const uint8_t *StreamResource::GetMemoryBase() const {
if (memory_list_.empty()) {
return nullptr;
}


+ 1
- 1
ge/single_op/stream_resource.h View File

@@ -47,7 +47,7 @@ class StreamResource {

uint8_t *MallocMemory(const std::string &purpose, size_t size, bool holding_lock = true);
uint8_t *MallocWeight(const std::string &purpose, size_t size);
uint8_t *GetMemoryBase() const;
const uint8_t *GetMemoryBase() const;

private:
uint8_t *DoMallocMemory(const std::string &purpose,


Loading…
Cancel
Save