Merge remote-tracking branch 'upstream/master' into master2

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<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;
 }

metadef

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

parser

@@ -1 +1 @@
-Subproject commit dda9def8bdb5177054a3abc132bf376172c3f01f
+Subproject commit f12a4159641de89e38460205be89da8ef74eba8a