portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Catch edge case in SharedMemoryMPI::GetShmDims; Change default units to consistent MB in init args; Want last element not past last element in MemoryManagerCache.cc

Browse Source
This commit is contained in:
Christoph Lehner 2020-06-14 13:26:01 -04:00
parent b5e87e8d97
commit 3dccd7aa2c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Grid/allocator/MemoryManagerCache.cc
View File

@ -77,7 +77,7 @@ void MemoryManager::LRUinsert(AcceleratorViewEntry &AccCache)
assert(AccCache.LRU_valid==0); assert(AccCache.LRU_valid==0);
if (AccCache.transient) { if (AccCache.transient) {
LRU.push_back(AccCache.CpuPtr); LRU.push_back(AccCache.CpuPtr);
AccCache.LRU_entry = LRU.end(); AccCache.LRU_entry = --LRU.end();
} else { } else {
LRU.push_front(AccCache.CpuPtr); LRU.push_front(AccCache.CpuPtr);
AccCache.LRU_entry = LRU.begin(); AccCache.LRU_entry = LRU.begin();

2
Grid/communicator/SharedMemoryMPI.cc
View File

@ -180,7 +180,7 @@ void GlobalSharedMemory::GetShmDims(const Coordinate &WorldDims,Coordinate &ShmD
&& divides(prime,WorldShmSize/AutoShmSize) ) { && divides(prime,WorldShmSize/AutoShmSize) ) {
AutoShmSize*=prime; AutoShmSize*=prime;
ShmDims[dim]*=prime; ShmDims[dim]*=prime;
last_dim = (dim + ndimension - 1) % ndimension; last_dim = dim;
break; break;
} }
} }

8
Grid/util/Init.cc
View File

@ -297,11 +297,11 @@ void Grid_init(int *argc,char ***argv)
} }
if( GridCmdOptionExists(*argv,*argv+*argc,"--device-mem") ){ if( GridCmdOptionExists(*argv,*argv+*argc,"--device-mem") ){
int GB; int MB;
arg= GridCmdOptionPayload(*argv,*argv+*argc,"--device-mem"); arg= GridCmdOptionPayload(*argv,*argv+*argc,"--device-mem");
GridCmdOptionInt(arg,GB); GridCmdOptionInt(arg,MB);
uint64_t GB64 = GB; uint64_t MB64 = MB;
MemoryManager::DeviceMaxBytes = GB64*1024LL*1024LL*1024LL; MemoryManager::DeviceMaxBytes = MB64*1024LL*1024LL;
} }
if( GridCmdOptionExists(*argv,*argv+*argc,"--hypercube") ){ if( GridCmdOptionExists(*argv,*argv+*argc,"--hypercube") ){