Browse Source

!1591 回退 'Pull Request !1283 : rungraphasync'

Merge pull request !1591 from 王涛/revert-merge-1283-master
tags/v1.3.0
王涛 Gitee 3 years ago
parent
commit
311aa90e1e
2 changed files with 7 additions and 6 deletions
  1. +6
    -5
      ge/graph/manager/host_mem_manager.cc
  2. +1
    -1
      metadef

+ 6
- 5
ge/graph/manager/host_mem_manager.cc View File

@@ -45,11 +45,12 @@ Status SharedMemAllocator::Allocate(SharedMemInfo &mem_info) {
return GE_GRAPH_MEMORY_ALLOC_FAILED;
}
mem_info.fd = output_para.fd;
mem_info.host_aligned_ptr = AlignedPtr::BuildFromAllocFunc(
[&output_para](std::unique_ptr<uint8_t[], AlignedPtr::Deleter> &ptr) {
ptr.reset(reinterpret_cast<uint8_t *>(output_para.ptr));
},
[](uint8_t *ptr) { ptr = nullptr; });
mem_info.host_aligned_ptr = AlignedPtr::BuildFromAllocFunc([&output_para](std::unique_ptr<uint8_t[], deleter> &ptr) {
ptr.reset(reinterpret_cast<uint8_t *>(output_para.ptr));
},
[](uint8_t *ptr) {
ptr = nullptr;
});
mem_info.device_address = reinterpret_cast<uint8_t *>(output_para.devPtr);
return SUCCESS;
}


+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit 1c41e02f73b6e8f95369e052ee4de285145fb34f
Subproject commit 22ab76ecd8461f679606374be4b3b6b6f7cad321

Loading…
Cancel
Save