From 150dc080748030c68de0dce78552a42ee3178418 Mon Sep 17 00:00:00 2001 From: wqtshg Date: Tue, 27 Apr 2021 11:33:03 +0800 Subject: [PATCH 1/2] update submodule --- parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser b/parser index dda9def8..f12a4159 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit dda9def8bdb5177054a3abc132bf376172c3f01f +Subproject commit f12a4159641de89e38460205be89da8ef74eba8a From f394e85f8b195fb2b3ce073466e4eaeea9802ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B6=9B?= Date: Tue, 27 Apr 2021 15:08:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!128?= =?UTF-8?q?3=20:=20rungraphasync'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ge/graph/manager/host_mem_manager.cc | 11 ++++++----- metadef | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ge/graph/manager/host_mem_manager.cc b/ge/graph/manager/host_mem_manager.cc index 2908df39..40a0d1b9 100644 --- a/ge/graph/manager/host_mem_manager.cc +++ b/ge/graph/manager/host_mem_manager.cc @@ -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 &ptr) { - ptr.reset(reinterpret_cast(output_para.ptr)); - }, - [](uint8_t *ptr) { ptr = nullptr; }); + mem_info.host_aligned_ptr = AlignedPtr::BuildFromAllocFunc([&output_para](std::unique_ptr &ptr) { + ptr.reset(reinterpret_cast(output_para.ptr)); + }, + [](uint8_t *ptr) { + ptr = nullptr; + }); mem_info.device_address = reinterpret_cast(output_para.devPtr); return SUCCESS; } diff --git a/metadef b/metadef index 1c41e02f..22ab76ec 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 1c41e02f73b6e8f95369e052ee4de285145fb34f +Subproject commit 22ab76ecd8461f679606374be4b3b6b6f7cad321