diff --git a/src/Benchmarks/SpMV/spmv.h b/src/Benchmarks/SpMV/spmv.h index 66f4fb236a6d10fe5e777278d37a749cfe10d16a..26ef145c9b80e9d678cea910ca36622bcc4211a5 100644 --- a/src/Benchmarks/SpMV/spmv.h +++ b/src/Benchmarks/SpMV/spmv.h @@ -159,7 +159,7 @@ benchmarkSpMV( Benchmark& benchmark, { "non-zeros", convertToString( hostMatrix.getNumberOfNonzeroMatrixElements() ) }, { "rows", convertToString( hostMatrix.getRows() ) }, { "columns", convertToString( hostMatrix.getColumns() ) }, - { "matrix format", convertToString( getMatrixFormat( hostMatrix ) ) } + { "matrix format", convertToString( getType( hostMatrix ) ) } } )); hostVector.setSize( hostMatrix.getColumns() ); @@ -287,22 +287,18 @@ benchmarkSpmvSynthetic( Benchmark& benchmark, { benchmarkSpMV< Real, Matrices::CSR >( benchmark, inputFileName, verboseMR ); benchmarkSpMV< Real, Matrices::Ellpack >( benchmark, inputFileName, verboseMR ); - benchmarkSpMV< Real, SlicedEllpackAlias >( benchmark, inputFileName, verboseMR ); - benchmarkSpMV< Real, Matrices::ChunkedEllpack >( benchmark, inputFileName, verboseMR ); + //benchmarkSpMV< Real, SlicedEllpackAlias >( benchmark, inputFileName, verboseMR ); + //benchmarkSpMV< Real, Matrices::ChunkedEllpack >( benchmark, inputFileName, verboseMR ); //// // Segments based sparse matrices - std::cerr << "*********************************" << std::endl; benchmarkSpMV< Real, SparseMatrix_CSR >( benchmark, inputFileName, verboseMR ); - std::cerr << "*********************************" << std::endl; benchmarkSpMV< Real, SparseMatrix_Ellpack >( benchmark, inputFileName, verboseMR ); - std::cerr << "*********************************" << std::endl; - benchmarkSpMV< Real, SparseMatrix_SlicedEllpack >( benchmark, inputFileName, verboseMR ); - std::cerr << "*********************************" << std::endl; + //benchmarkSpMV< Real, SparseMatrix_SlicedEllpack >( benchmark, inputFileName, verboseMR ); // AdEllpack is broken // benchmarkSpMV< Real, Matrices::AdEllpack >( benchmark, inputFileName, verboseMR ); - benchmarkSpMV< Real, Matrices::BiEllpack >( benchmark, inputFileName, verboseMR ); + //benchmarkSpMV< Real, Matrices::BiEllpack >( benchmark, inputFileName, verboseMR ); } } // namespace Benchmarks