From 1bda8c47fa867a365f8793a0cad4b0649491bfb1 Mon Sep 17 00:00:00 2001
From: Mohammad Atif <mohammadatif4461@gmail.com>
Date: Mon, 3 Jul 2023 12:35:37 -0400
Subject: [PATCH] fixed conflicts after merging pabyle develop

---
 Grid/allocator/MemoryManagerCache.cc | 3 ---
 Grid/threads/Accelerator.h           | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Grid/allocator/MemoryManagerCache.cc b/Grid/allocator/MemoryManagerCache.cc
index 8a88577e..078dab3b 100644
--- a/Grid/allocator/MemoryManagerCache.cc
+++ b/Grid/allocator/MemoryManagerCache.cc
@@ -223,11 +223,8 @@ void *MemoryManager::ViewOpen(void* _CpuPtr,size_t bytes,ViewMode mode,ViewAdvis
   std::cout << __FILE__ << " " << __LINE__ << std::endl;
   uint64_t CpuPtr = (uint64_t)_CpuPtr;
   if( (mode==AcceleratorRead)||(mode==AcceleratorWrite)||(mode==AcceleratorWriteDiscard) ){
-<<<<<<< HEAD
   std::cout << __FILE__ << " " << __LINE__ << std::endl;
-=======
     dprintf("AcceleratorViewOpen %lx\n",(uint64_t)CpuPtr);
->>>>>>> develop
     return (void *) AcceleratorViewOpen(CpuPtr,bytes,mode,hint);
   } else if( (mode==CpuRead)||(mode==CpuWrite)){
   std::cout << __FILE__ << " " << __LINE__ << std::endl;
diff --git a/Grid/threads/Accelerator.h b/Grid/threads/Accelerator.h
index 490a6e0c..3e7c79a3 100644
--- a/Grid/threads/Accelerator.h
+++ b/Grid/threads/Accelerator.h
@@ -544,7 +544,7 @@ inline void acceleratorCopyFromDevice(void *from,void *to,size_t bytes)
   std::cout << "D->H copy from device end "<<std::endl;
 };
 inline void acceleratorCopyDeviceToDeviceAsynch(void *from,void *to,size_t bytes) { printf("TODO acceleratorCopyDeviceToDeviceAsynch");memcpy(to,from,bytes);}
-inline void acceleratorCopySynchronize(void) {printf("TODO acceleratorCopySynchronize");};
+inline void acceleratorCopySynchronise(void) {printf("TODO acceleratorCopySynchronize");};
 
 inline int  acceleratorIsCommunicable(void *ptr){ return 1; }
 inline void acceleratorMemSet(void *base,int value,size_t bytes)