From 203b93cac9fd545ff946a50838c0059cdfa5c4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Sun, 31 Jan 2021 13:37:15 +0100
Subject: [PATCH] Refactoring matrix reader and writer.
---
.../tnl-benchmark-linear-solvers.h | 2 +-
src/Benchmarks/SpMV/spmv-legacy.h | 2 +-
src/TNL/Matrices/MatrixReader.h | 27 +++---
src/TNL/Matrices/MatrixReader.hpp | 31 ++++---
src/TNL/Matrices/MatrixWriter.h | 72 ++++++++--------
src/TNL/Matrices/MatrixWriter.hpp | 85 +++++++++----------
6 files changed, 109 insertions(+), 110 deletions(-)
diff --git a/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h b/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
index d7152e1d35..35d63bca6b 100644
--- a/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
+++ b/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
@@ -351,7 +351,7 @@ struct LinearSolversBenchmark
// load the matrix
if( file_matrix.endsWith( ".mtx" ) ) {
Matrices::MatrixReader< MatrixType > reader;
- reader.readMtxFile( file_matrix, *matrixPointer );
+ reader.readMtx( file_matrix, *matrixPointer );
}
else {
matrixPointer->load( file_matrix );
diff --git a/src/Benchmarks/SpMV/spmv-legacy.h b/src/Benchmarks/SpMV/spmv-legacy.h
index eb1ee4ecd2..7d58d17b5a 100644
--- a/src/Benchmarks/SpMV/spmv-legacy.h
+++ b/src/Benchmarks/SpMV/spmv-legacy.h
@@ -250,7 +250,7 @@ benchmarkSpmvSynthetic( Benchmark& benchmark,
////
// Set-up benchmark datasize
//
- MatrixReader< CSRHostMatrix >::readMtxFile( inputFileName, csrHostMatrix, verboseMR );
+ MatrixReader< CSRHostMatrix >::readMtx( inputFileName, csrHostMatrix, verboseMR );
const int elements = csrHostMatrix.getNumberOfNonzeroMatrixElements();
const double datasetSize = (double) elements * ( 2 * sizeof( Real ) + sizeof( int ) ) / oneGB;
benchmark.setOperation( datasetSize );
diff --git a/src/TNL/Matrices/MatrixReader.h b/src/TNL/Matrices/MatrixReader.h
index 15dee4b8f3..b12f561d77 100644
--- a/src/TNL/Matrices/MatrixReader.h
+++ b/src/TNL/Matrices/MatrixReader.h
@@ -45,7 +45,6 @@ class MatrixReader
* \brief Type used for indexing of matrix elements.
*/
using IndexType = typename Matrix::IndexType;
- using HostMatrix = typename Matrix::Self< RealType, TNL::Devices::Host >;
/**
* \brief Method for importing matrix from file with given filename.
@@ -60,9 +59,9 @@ class MatrixReader
* \include Matrices/MatrixWriterReaderExample.out
*
*/
- static void readMtxFile( const String& fileName,
- Matrix& matrix,
- bool verbose = false );
+ static void readMtx( const String& fileName,
+ Matrix& matrix,
+ bool verbose = false );
/**
* \brief Method for importing matrix from STL input stream.
@@ -71,9 +70,11 @@ class MatrixReader
* \param matrix is the target matrix.
* \param verbose controls verbosity of the matrix import.
*/
- static void readMtxFile( std::istream& file,
- Matrix& matrix,
- bool verbose = false );
+ static void readMtx( std::istream& file,
+ Matrix& matrix,
+ bool verbose = false );
+
+ using HostMatrix = typename Matrix::template Self< RealType, TNL::Devices::Host >;
};
/// This is to prevent from appearing in Doxygen documentation.
@@ -112,9 +113,9 @@ class MatrixReader< Matrix, TNL::Devices::Host >
* \include Matrices/MatrixWriterReaderExample.out
*
*/
- static void readMtxFile( const String& fileName,
- Matrix& matrix,
- bool verbose = false );
+ static void readMtx( const String& fileName,
+ Matrix& matrix,
+ bool verbose = false );
/**
* \brief Method for importing matrix from STL input stream.
@@ -123,9 +124,9 @@ class MatrixReader< Matrix, TNL::Devices::Host >
* \param matrix is the target matrix.
* \param verbose controls verbosity of the matrix import.
*/
- static void readMtxFile( std::istream& file,
- Matrix& matrix,
- bool verbose = false );
+ static void readMtx( std::istream& file,
+ Matrix& matrix,
+ bool verbose = false );
protected:
diff --git a/src/TNL/Matrices/MatrixReader.hpp b/src/TNL/Matrices/MatrixReader.hpp
index 0cf2ceed0a..30342bbd98 100644
--- a/src/TNL/Matrices/MatrixReader.hpp
+++ b/src/TNL/Matrices/MatrixReader.hpp
@@ -24,28 +24,27 @@ namespace Matrices {
template< typename Matrix, typename Device >
void
MatrixReader< Matrix, Device >::
-readMtxFile( const TNL::String& fileName,
- Matrix& matrix,
- bool verbose )
+readMtx( const TNL::String& fileName,
+ Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
- MatrixReader< HostMatrix >::readMtxFile( fileName, hostMatrix, verbose );
+ MatrixReader< HostMatrix >::readMtx( fileName, hostMatrix, verbose );
matrix = hostMatrix;
}
template< typename Matrix, typename Device >
void
MatrixReader< Matrix, Device >::
-readMtxFile( std::istream& str,
- Matrix& matrix,
- bool verbose )
+readMtx( std::istream& str,
+ Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
- MatrixReader< HostMatrix >::readMtxFile( str, hostMatrix, verbose );
+ MatrixReader< HostMatrix >::readMtx( str, hostMatrix, verbose );
matrix = hostMatrix;
}
-
/**
* MatrixReader specialization for TNL::Devices::Host.
*/
@@ -53,23 +52,23 @@ readMtxFile( std::istream& str,
template< typename Matrix >
void
MatrixReader< Matrix, TNL::Devices::Host >::
-readMtxFile( const String& fileName,
- Matrix& matrix,
- bool verbose )
+readMtx( const String& fileName,
+ Matrix& matrix,
+ bool verbose )
{
std::fstream file;
file.open( fileName.getString(), std::ios::in );
if( ! file )
throw std::runtime_error( std::string( "I am not able to open the file " ) + fileName.getString() );
- readMtxFile( file, matrix, verbose );
+ readMtx( file, matrix, verbose );
}
template< typename Matrix >
void
MatrixReader< Matrix, TNL::Devices::Host >::
-readMtxFile( std::istream& file,
- Matrix& matrix,
- bool verbose )
+readMtx( std::istream& file,
+ Matrix& matrix,
+ bool verbose )
{
IndexType rows, columns;
bool symmetricSourceMatrix( false );
diff --git a/src/TNL/Matrices/MatrixWriter.h b/src/TNL/Matrices/MatrixWriter.h
index 0359eb5bc8..a06d20851c 100644
--- a/src/TNL/Matrices/MatrixWriter.h
+++ b/src/TNL/Matrices/MatrixWriter.h
@@ -28,30 +28,30 @@ class MatrixWriter
using HostMatrix = typename Matrix::Self< RealType, TNL::Devices::Host >;
- static void writeToGnuplot( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeGnuplot( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToGnuplot( std::ostream& str,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeGnuplot( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToEps( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeEps( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToEps( std::ostream& str,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeEps( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToMtx( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeMtx( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToMtx( std::ostream& str,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeMtx( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose = false );
};
template< typename Matrix >
@@ -62,30 +62,30 @@ class MatrixWriter< Matrix, TNL::Devices::Host >
typedef typename Matrix::IndexType IndexType;
typedef typename Matrix::RealType RealType;
- static void writeToGnuplot( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeGnuplot( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToGnuplot( std::ostream& str,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeGnuplot( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToEps( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeEps( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToEps( std::ostream& str,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeEps( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToMtx( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeMtx( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose = false );
- static void writeToMtx( std::ostream& str,
- const Matrix& matrix,
- bool verbose = false );
+ static void writeMtx( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose = false );
protected:
diff --git a/src/TNL/Matrices/MatrixWriter.hpp b/src/TNL/Matrices/MatrixWriter.hpp
index 016f6ff3a0..97310c19ed 100644
--- a/src/TNL/Matrices/MatrixWriter.hpp
+++ b/src/TNL/Matrices/MatrixWriter.hpp
@@ -19,97 +19,96 @@ namespace Matrices {
template< typename Matrix, typename Device >
void
MatrixWriter< Matrix, Device >::
-writeToGnuplot( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose )
+writeGnuplot( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
hostMatrix = matrix;
- MatrixWriter< HostMatrix >::writeToGnuplot( fileName, hostMatrix, verbose );
+ MatrixWriter< HostMatrix >::writeGnuplot( fileName, hostMatrix, verbose );
}
template< typename Matrix, typename Device >
void
MatrixWriter< Matrix, Device >::
-writeToGnuplot( std::ostream& str,
- const Matrix& matrix,
- bool verbose )
+writeGnuplot( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
hostMatrix = matrix;
- MatrixWriter< HostMatrix >::writeToGnuplot( str, hostMatrix, verbose );
+ MatrixWriter< HostMatrix >::writeGnuplot( str, hostMatrix, verbose );
}
template< typename Matrix, typename Device >
void
MatrixWriter< Matrix, Device >::
-writeToMtx( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose )
+writeMtx( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
hostMatrix = matrix;
- MatrixWriter< HostMatrix >::writeToMtx( fileName, hostMatrix, verbose );
+ MatrixWriter< HostMatrix >::writeMtx( fileName, hostMatrix, verbose );
}
template< typename Matrix, typename Device >
void
MatrixWriter< Matrix, Device >::
-writeToMtx( std::ostream& str,
- const Matrix& matrix,
- bool verbose )
+writeMtx( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
hostMatrix = matrix;
- MatrixWriter< HostMatrix >::writeToMtx( str, hostMatrix, verbose );
+ MatrixWriter< HostMatrix >::writeMtx( str, hostMatrix, verbose );
}
template< typename Matrix, typename Device >
void
MatrixWriter< Matrix, Device >::
-writeToEps( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose )
+writeEps( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
hostMatrix = matrix;
- MatrixWriter< HostMatrix >::writeToEps( fileName, hostMatrix, verbose );
+ MatrixWriter< HostMatrix >::writeEps( fileName, hostMatrix, verbose );
}
template< typename Matrix, typename Device >
void
MatrixWriter< Matrix, Device >::
-writeToEps( std::ostream& str,
- const Matrix& matrix,
- bool verbose )
+writeEps( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose )
{
HostMatrix hostMatrix;
hostMatrix = matrix;
- MatrixWriter< HostMatrix >::writeToEps( str, hostMatrix, verbose );
+ MatrixWriter< HostMatrix >::writeEps( str, hostMatrix, verbose );
}
/**
* MatrixWriter specialization for TNL::Devices::Host.
*/
-
template< typename Matrix >
void
MatrixWriter< Matrix, TNL::Devices::Host >::
-writeToGnuplot( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose )
+writeGnuplot( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose )
{
std::fstream str;
str.open( fileName.getString(), std::ios::out );
- MatrixWriter< Matrix >::writeToGnuplot( str, matrix, verbose );
+ MatrixWriter< Matrix >::writeGnuplot( str, matrix, verbose );
}
template< typename Matrix >
void
MatrixWriter< Matrix, TNL::Devices::Host >::
-writeToGnuplot( std::ostream& str,
- const Matrix& matrix,
- bool verbose )
+writeGnuplot( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose )
{
str << "# This file was generated by TNL (www.tnl-project.org)" << std::endl;
for( IndexType row = 0; row < matrix.getRows(); row ++ )
@@ -130,21 +129,21 @@ writeToGnuplot( std::ostream& str,
template< typename Matrix >
void
MatrixWriter< Matrix, TNL::Devices::Host >::
-writeToMtx( const TNL::String& fileName,
- const Matrix& matrix,
- bool verbose )
+writeMtx( const TNL::String& fileName,
+ const Matrix& matrix,
+ bool verbose )
{
std::fstream str;
str.open( fileName.getString(), std::ios::out );
- MatrixWriter< Matrix >::writeToMtx( str, matrix, verbose );
+ MatrixWriter< Matrix >::writeMtx( str, matrix, verbose );
}
template< typename Matrix >
void
MatrixWriter< Matrix, TNL::Devices::Host >::
-writeToMtx( std::ostream& str,
- const Matrix& matrix,
- bool verbose )
+writeMtx( std::ostream& str,
+ const Matrix& matrix,
+ bool verbose )
{
str << "%%MatrixMarket matrix coordinate real general" << std::endl;
str << "%%" << std::endl;
@@ -161,25 +160,25 @@ writeToMtx( std::ostream& str,
*cout_ptr << "Drawing the row " << rowIdx << " \r" << std::flush;
}
};
- matrix.forAllRows( f );
+ matrix.sequentialForAllRows( f );
}
template< typename Matrix >
void
MatrixWriter< Matrix, TNL::Devices::Host >::
-writeToEps( const TNL::String& fileName,
+writeEps( const TNL::String& fileName,
const Matrix& matrix,
bool verbose )
{
std::fstream str;
str.open( fileName.getString(), std::ios::out );
- MatrixWriter< Matrix >::writeToEps( str, matrix, verbose );
+ MatrixWriter< Matrix >::writeEps( str, matrix, verbose );
}
template< typename Matrix >
void
MatrixWriter< Matrix, TNL::Devices::Host >::
-writeToEps( std::ostream& str,
+writeEps( std::ostream& str,
const Matrix& matrix,
bool verbose )
{
--
GitLab