From b99a7238aec05a9ff7b1effd87a686ba4f8ed9eb Mon Sep 17 00:00:00 2001
From: Lukas Cejka <lukas.ostatek@gmail.com>
Date: Sun, 1 Dec 2019 13:06:43 +0100
Subject: [PATCH] Fixed format name declaration in logs of benchmarks.
---
src/Benchmarks/SpMV/spmv.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/Benchmarks/SpMV/spmv.h b/src/Benchmarks/SpMV/spmv.h
index 408bcae297..41ede9d0a0 100644
--- a/src/Benchmarks/SpMV/spmv.h
+++ b/src/Benchmarks/SpMV/spmv.h
@@ -202,17 +202,6 @@ benchmarkSpMV( Benchmark& benchmark,
// Copy the values
resultHostVector2 = hostVector2;
- // Setup cuSPARSE MetaData, since it has the same header as CSR,
- // and therefore will not get its own headers (rows, cols, speedup etc.) in log.
- // * Not setting this up causes (among other undiscovered errors) the speedup from CPU to GPU on the input format to be overwritten.
- benchmark.setMetadataColumns( Benchmark::MetadataColumns({
- { "matrix name", convertToString( getMatrixFileName( inputFileName ) ) },
- { "non-zeros", convertToString( hostMatrix.getNumberOfNonzeroMatrixElements() ) },
- { "rows", convertToString( hostMatrix.getRows() ) },
- { "columns", convertToString( hostMatrix.getColumns() ) },
- { "matrix format", convertToString( "CSR-cuSPARSE" ) }
- } ));
-
#ifdef HAVE_CUDA
benchmark.time< Devices::Cuda >( reset, "GPU", spmvCuda );
@@ -223,6 +212,17 @@ benchmarkSpMV( Benchmark& benchmark,
resultDeviceVector2.setValue( 0.0 );
resultDeviceVector2 = deviceVector2;
+
+ // Setup cuSPARSE MetaData, since it has the same header as CSR,
+ // and therefore will not get its own headers (rows, cols, speedup etc.) in log.
+ // * Not setting this up causes (among other undiscovered errors) the speedup from CPU to GPU on the input format to be overwritten.
+ benchmark.setMetadataColumns( Benchmark::MetadataColumns({
+ { "matrix name", convertToString( getMatrixFileName( inputFileName ) ) },
+ { "non-zeros", convertToString( hostMatrix.getNumberOfNonzeroMatrixElements() ) },
+ { "rows", convertToString( hostMatrix.getRows() ) },
+ { "columns", convertToString( hostMatrix.getColumns() ) },
+ { "matrix format", convertToString( "CSR-cuSPARSE" ) }
+ } ));
benchmark.time< Devices::Cuda >( reset, "GPU", spmvCusparse );
--
GitLab