Commit 3c2b8bcc authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixing namespaces in sorting source files. 

Fixing header including in Nvidia bitonic sort wrapper.

Fixing namespaces definition.
parent be107229

src/Benchmarks/Sorting/Measurer.h

+1 −1
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ 
#ifdef HAVE_CUDA

#ifdef HAVE_CUDA_SAMPLES

#include "ReferenceAlgorithms/MancaQuicksort.h"

#include "ReferenceAlgorithms/NvidiaBitonicSort.h"

#endif

#include "ReferenceAlgorithms/CedermanQuicksort.h"

#include "ReferenceAlgorithms/ThrustRadixsort.h"

#include "ReferenceAlgorithms/NvidiaBitonicSort.h"

#endif



#include "timer.h"

src/Benchmarks/Sorting/ReferenceAlgorithms/CedermanQuicksort.h

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ int gpuqsort(unsigned int *data, unsigned int size, unsigned int blockscount, un 


struct CedermanQuicksort

{

   static void sort( Containers::ArrayView< int, Devices::Cuda >& array )

   static void sort( TNL::Containers::ArrayView< int, TNL::Devices::Cuda >& array )

   {

      gpuqsort( ( unsigned int * ) array.getData(), ( unsigned int ) array.getSize() );

   }

src/Benchmarks/Sorting/ReferenceAlgorithms/MancaQuicksort.h

+1 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ void CUDA_Quicksort_64(double* inputData,double* outputData, uint dataSize, uint 


struct MancaQuicksort

{

   static void sort( Containers::ArrayView< int, Devices::Cuda >& array )

   static void sort( TNL::Containers::ArrayView< int, TNL::Devices::Cuda >& array )

   {

      double timer;

      CUDA_Quicksort( ( unsigned * ) array.getData(),  (unsigned * ) array.getData(), array.getSize(), 256, 0, &timer );

src/Benchmarks/Sorting/ReferenceAlgorithms/NvidiaBitonicSort.h

+9 −1
Original line number Diff line number Diff line 


#ifdef HAVE_CUDA_SAMPLES

#include <6_Advanced/sortingNetworks/bitonicSort.cu>

#endif

#include <TNL/Containers/Array.h>



namespace TNL {



struct NvidiaBitonicSort

{

   static void sort( Containers::ArrayView< int, Devices::Cuda >& view )

   {

      Array<int, Devices::Cuda> arr;

#ifdef HAVE_CUDA_SAMPLES

      Containers::Array<int, Devices::Cuda> arr;

      arr = view;

      bitonicSort((unsigned *)view.getData(), (unsigned *)arr.getData(),

                  (unsigned *)view.getData(), (unsigned *)arr.getData(),

                  1, arr.getSize(), 1);

      cudaDeviceSynchronize();

#endif

   }

};



} // namespace TNL

src/Benchmarks/Sorting/ReferenceAlgorithms/ThrustRadixsort.h

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <thrust/execution_policy.h>

#include <TNL/Containers/Array.h>



namespace TNL {



struct ThrustRadixsort

{
@@ -11,3 +12,5 @@ struct ThrustRadixsort 
      cudaDeviceSynchronize();

   }

};



} // namespace TNL