portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

fixed conflicts after merging pabyle develop

Browse Source
This commit is contained in:
Mohammad Atif 2023-07-03 12:35:37 -04:00
parent 2100cc6497
commit 1bda8c47fa
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Grid/allocator/MemoryManagerCache.cc
View File

@ -223,11 +223,8 @@ void *MemoryManager::ViewOpen(void* _CpuPtr,size_t bytes,ViewMode mode,ViewAdvis
std::cout << __FILE__ << " " << __LINE__ << std::endl; std::cout << __FILE__ << " " << __LINE__ << std::endl;
uint64_t CpuPtr = (uint64_t)_CpuPtr; uint64_t CpuPtr = (uint64_t)_CpuPtr;
if( (mode==AcceleratorRead)||(mode==AcceleratorWrite)||(mode==AcceleratorWriteDiscard) ){ if( (mode==AcceleratorRead)||(mode==AcceleratorWrite)||(mode==AcceleratorWriteDiscard) ){
<<<<<<< HEAD
std::cout << __FILE__ << " " << __LINE__ << std::endl; std::cout << __FILE__ << " " << __LINE__ << std::endl;
=======
dprintf("AcceleratorViewOpen %lx\n",(uint64_t)CpuPtr); dprintf("AcceleratorViewOpen %lx\n",(uint64_t)CpuPtr);
>>>>>>> develop
return (void *) AcceleratorViewOpen(CpuPtr,bytes,mode,hint); return (void *) AcceleratorViewOpen(CpuPtr,bytes,mode,hint);
} else if( (mode==CpuRead)||(mode==CpuWrite)){ } else if( (mode==CpuRead)||(mode==CpuWrite)){
std::cout << __FILE__ << " " << __LINE__ << std::endl; std::cout << __FILE__ << " " << __LINE__ << std::endl;

2
Grid/threads/Accelerator.h
View File

@ -544,7 +544,7 @@ inline void acceleratorCopyFromDevice(void *from,void *to,size_t bytes)
std::cout << "D->H copy from device end "<<std::endl; 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 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 int acceleratorIsCommunicable(void *ptr){ return 1; }
inline void acceleratorMemSet(void *base,int value,size_t bytes) inline void acceleratorMemSet(void *base,int value,size_t bytes)