From 5eb09d2d627578b16ac5b8e717e4957c6ee6a2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Fri, 27 Dec 2019 21:19:22 +0100
Subject: [PATCH] SpMV benchmark is printing full matrix types.
---
src/Benchmarks/SpMV/spmv.h | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/Benchmarks/SpMV/spmv.h b/src/Benchmarks/SpMV/spmv.h
index 66f4fb236a..26ef145c9b 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
--
GitLab