Matrices revision

src/Benchmarks/SpMV/spmv.h

@@ -59,6 +59,18 @@ std::string getMatrixFormat( const Matrix& matrix )
     return format;
 }
 
+template< typename Matrix >
+std::string getFormatShort( const Matrix& matrix )
+{
+    std::string mtrxFullType = getType( matrix );
+    std::string mtrxType = mtrxFullType.substr( 0, mtrxFullType.find( "<" ) );
+    std::string format = mtrxType.substr( mtrxType.find( ':' ) + 2 );
+    format = format.substr( format.find(':') + 2);
+    format = format.substr( 0, 3 );
+
+    return format;
+}
+
 // Print information about the matrix.
 template< typename Matrix >
 void printMatrixInfo( const Matrix& matrix,
@@ -202,17 +214,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 +224,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-" + getFormatShort( hostMatrix ) ) }
+       } ));
 
     benchmark.time< Devices::Cuda >( reset, "GPU", spmvCusparse );