portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-04 19:25:56 +01:00
Code Releases Activity

Travis fail fix attempt

Browse Source
This commit is contained in:
azusayamaguchi 2016-10-25 01:45:53 +01:00
parent 460d0753a1
commit d7d92af09d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Stencil.h
View File

@ -821,7 +821,7 @@ PARALLEL_FOR_LOOP
cobj *send_buf = (cobj *)_grid->ShmBufferTranslate(xmit_to_rank,u_recv_buf_p); cobj *send_buf = (cobj *)_grid->ShmBufferTranslate(xmit_to_rank,u_recv_buf_p);
if ( (send_buf==NULL) ) { if ( send_buf==NULL ) {
send_buf = u_send_buf_p; send_buf = u_send_buf_p;
} }
// std::cout << " send_bufs "<<std::hex<< send_buf <<" ubp "<<u_send_buf_p <<std::dec<<std::endl; // std::cout << " send_bufs "<<std::hex<< send_buf <<" ubp "<<u_send_buf_p <<std::dec<<std::endl;

3
lib/communicator/Communicator_base.cc
View File

@ -48,10 +48,11 @@ void *CartesianCommunicator::ShmBufferMalloc(size_t bytes){
void *ptr = (void *)heap_top; void *ptr = (void *)heap_top;
heap_top += bytes; heap_top += bytes;
heap_bytes+= bytes; heap_bytes+= bytes;
std::cout <<"Shm alloc "<<ptr<<std::endl;
assert(heap_bytes < MAX_MPI_SHM_BYTES); assert(heap_bytes < MAX_MPI_SHM_BYTES);
return ptr; return ptr;
} }
void *CartesianCommunicator::ShmBufferFreeAll(void) { void CartesianCommunicator::ShmBufferFreeAll(void) {
heap_top =(size_t)ShmBufferSelf(); heap_top =(size_t)ShmBufferSelf();
heap_bytes=0; heap_bytes=0;
} }

2
lib/communicator/Communicator_base.h
View File

@ -104,7 +104,7 @@ class CartesianCommunicator {
void *ShmBuffer(int rank); void *ShmBuffer(int rank);
void *ShmBufferTranslate(int rank,void * local_p); void *ShmBufferTranslate(int rank,void * local_p);
void *ShmBufferMalloc(size_t bytes); void *ShmBufferMalloc(size_t bytes);
void *ShmBufferFreeAll(void) ; void ShmBufferFreeAll(void) ;
//////////////////////////////////////////////// ////////////////////////////////////////////////
// Must call in Grid startup // Must call in Grid startup