Commit 38912934 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber Committed by Jakub Klinkovský
Browse files

Fixing names of CSR Light kernels in spmv benchmarks.

parent 00409974

src/Benchmarks/SpMV/spmv.h

+28 −27
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ benchmarkSpMV( BenchmarkType& benchmark, 
template< typename Real,

          typename InputMatrix,

          template< typename, typename, typename > class Matrix,

          typename TestReal = Real,

          template< typename, typename, typename, typename > class Vector = Containers::Vector >

void

benchmarkSpMVCSRLight( BenchmarkType& benchmark,
@@ -371,8 +372,8 @@ benchmarkSpMVCSRLight( BenchmarkType& benchmark, 
                       bool allCpuTests,

                       bool verboseMR )

{

   using HostMatrix = Matrix< Real, TNL::Devices::Host, int >;

   using CudaMatrix = Matrix< Real, TNL::Devices::Cuda, int >;

   using HostMatrix = Matrix< TestReal, TNL::Devices::Host, int >;

   using CudaMatrix = Matrix< TestReal, TNL::Devices::Cuda, int >;

   using HostVector = Containers::Vector< Real, Devices::Host, int >;

   using CudaVector = Containers::Vector< Real, Devices::Cuda, int >;
@@ -761,7 +762,7 @@ benchmarkSpmv( BenchmarkType& benchmark, 
#ifdef WITH_TNL_BENCHMARK_SPMV_BINARY_MATRICES

   benchmarkBinarySpMV< Real, HostMatrixType, SparseMatrix_CSR_Scalar              >( benchmark, hostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

   benchmarkBinarySpMV< Real, HostMatrixType, SparseMatrix_CSR_Vector              >( benchmark, hostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

   benchmarkBinarySpMV< Real, HostMatrixType, SparseMatrix_CSR_Light              >( benchmark, hostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

   benchmarkSpMVCSRLight< Real, HostMatrixType, SparseMatrix_CSR_Light, bool >( benchmark, hostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

   benchmarkBinarySpMV< Real, HostMatrixType, SparseMatrix_CSR_Adaptive            >( benchmark, hostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

   benchmarkBinarySpMV< Real, HostMatrixType, SparseMatrix_Ellpack                 >( benchmark, hostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

   benchmarkBinarySpMV< Real, HostMatrixType, SparseMatrix_SlicedEllpack           >( benchmark, hostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );
@@ -812,7 +813,7 @@ benchmarkSpmv( BenchmarkType& benchmark, 
      benchmarkBinarySpMV< Real, SymmetricInputMatrix, SymmetricSparseMatrix_CSR_Scalar              >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

      benchmarkBinarySpMV< Real, SymmetricInputMatrix, SymmetricSparseMatrix_CSR_Vector              >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

      //benchmarkBinarySpMV< Real, SymmetricInputMatrix, SymmetricSparseMatrix_CSR_Hybrid            >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

      benchmarkBinarySpMV< Real, SymmetricInputMatrix, SymmetricSparseMatrix_CSR_Light              >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

      benchmarkSpMVCSRLight< Real, SymmetricInputMatrix, SymmetricSparseMatrix_CSR_Light, bool       >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

      benchmarkBinarySpMV< Real, SymmetricInputMatrix, SymmetricSparseMatrix_CSR_Adaptive            >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

      benchmarkBinarySpMV< Real, SymmetricInputMatrix, SymmetricSparseMatrix_Ellpack                 >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );

      benchmarkBinarySpMV< Real, SymmetricInputMatrix, SymmetricSparseMatrix_SlicedEllpack           >( benchmark, symmetricHostMatrix, hostOutVector, inputFileName, allCpuTests, verboseMR );