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

Clean up debug prints

Browse Source
This commit is contained in:
Peter Boyle 2018-03-20 06:33:59 -04:00
parent a5cfb89304
commit ac29ebcb95
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/allocator/AlignedAllocator.h
View File

@ -165,10 +165,10 @@ public:
pointer ptr = nullptr;
#endif
//////////////////
// Hack 2MB align; could make option probably doesn't need configurability
//////////////////
#ifdef GRID_NVCC
////////////////////////////////////
// Unified (managed) memory
////////////////////////////////////
if ( ptr == (_Tp *) NULL ) {
if( cudaMallocManaged((void **)&ptr,bytes) != cudaSuccess ) {
ptr = (_Tp *) NULL;
@ -176,6 +176,9 @@ public:
}
}
#else
//////////////////////////////////////////////////////////////////////////////////////////
// 2MB align; could make option probably doesn't need configurability
//////////////////////////////////////////////////////////////////////////////////////////
#ifdef HAVE_MM_MALLOC_H
if ( ptr == (_Tp *) NULL ) ptr = (_Tp *) _mm_malloc(bytes,GRID_ALLOC_ALIGN);
#else
@ -183,6 +186,7 @@ public:
#endif
#endif
assert( ptr != (_Tp *)NULL);
/////////////////////////////////////////
// First touch optimise in threaded loop
/////////////////////////////////////////