From 514417326e29f5f6e369bd73baab6717777dc3a7 Mon Sep 17 00:00:00 2001
From: jackzhang235 <zhangmingwei@cambricon.com>
Date: Wed, 18 Mar 2020 10:36:39 +0000
Subject: [PATCH] try to avoid merge conflict

---
 lite/core/memory.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lite/core/memory.h b/lite/core/memory.h
index 77589a5365..bc382d8c36 100644
--- a/lite/core/memory.h
+++ b/lite/core/memory.h
@@ -76,6 +76,11 @@ void CopySync(void* dst, const void* src, size_t size, IoDirection dir) {
       TargetWrapperCL::MemcpySync(dst, src, size, dir);
       break;
 #endif  // LITE_WITH_OPENCL
+#ifdef LITE_WITH_MLU
+    case TARGET(kMLU):
+      TargetWrapperMlu::MemcpySync(dst, src, size, dir);
+      break;
+#endif
 #ifdef LITE_WITH_FPGA
     case TARGET(kFPGA):
       TargetWrapper<TARGET(kFPGA)>::MemcpySync(dst, src, size, dir);
-- 
GitLab