- Fix for linux compilation error in block-reduce-raking-commutative for

non-POD types
- Fix for runtime out-of-memory error during quick sorting tests

Former-commit-id: 1c06a94

Author: dumerrill

cub/block/block_raking_layout.cuh

@@ -104,7 +104,10 @@ struct BlockRakingLayout
     /**
      * \brief Shared memory storage type
      */
-    typedef T TempStorage[BlockRakingLayout::GRID_ELEMENTS];
+    typedef T _TempStorage[BlockRakingLayout::GRID_ELEMENTS];
+
+    /// Alias wrapper allowing storage to be unioned
+    struct TempStorage : Uninitialized<_TempStorage> {};
 
 
     /**
@@ -124,7 +127,7 @@ struct BlockRakingLayout
         }
 
         // Incorporating a block of padding partials every shared memory segment
-        return temp_storage + offset;
+        return temp_storage.Alias() + offset;
     }
 
 
@@ -135,7 +138,7 @@ struct BlockRakingLayout
         TempStorage &temp_storage,
         int linear_tid)
     {
-        return temp_storage + (linear_tid * (SEGMENT_LENGTH + SEGMENT_PADDING));
+        return temp_storage.Alias() + (linear_tid * (SEGMENT_LENGTH + SEGMENT_PADDING));
     }
 };
 

test/Makefile

@@ -195,7 +195,7 @@ INC += -I. -I..
 # Libs
 #-------------------------------------------------------------------------------
 
-LIBS += -lcudart
+#LIBS += -lcudart
 
 
 #-------------------------------------------------------------------------------

test/test_device_radix_sort.cu

@@ -713,7 +713,7 @@ int main(int argc, char** argv)
 #ifdef QUICK_TEST
 
     // Compile/run quick tests
-    if (num_items < 0) num_items = 32000000;
+    if (num_items < 0) num_items = 20000000;
 
     // Compare CUB and thrust on 32b keys-only
     Test<CUB, unsigned int, NullType, false> (num_items, RANDOM, entropy_reduction, 0, g_bits, CUB_TYPE_STRING(unsigned int));