Commit a42d2a3f authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Renaming SparseMatrix_CSR unit test to SparseMatrix_CSRScalar.

parent d564ca7b

src/UnitTests/Matrices/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ set( COMMON_TESTS 
            TridiagonalMatrixTest

            MultidiagonalMatrixTest



            SparseMatrixTest_CSR

            SparseMatrixTest_CSRScalar

            SparseMatrixTest_Ellpack

            SparseMatrixTest_SlicedEllpack

            SparseMatrixTest_ChunkedEllpack

src/UnitTests/Matrices/SparseMatrixTest_CSR.cu→src/UnitTests/Matrices/SparseMatrixTest_CSRScalar.cpp

+2 −2
Original line number Diff line number Diff line 
/***************************************************************************

                          SparseMatrixTest_CSR.cu -  description

                          SparseMatrixTest_CSRScalar.cpp -  description

                             -------------------

    begin                : Dec 3, 2019

    copyright            : (C) 2019 by Tomas Oberhuber et al.
@@ -8,4 +8,4 @@ 


/* See Copyright Notice in tnl/Copyright */



#include "SparseMatrixTest_CSR.h"
 
#include "SparseMatrixTest_CSRScalar.h"

src/UnitTests/Matrices/SparseMatrixTest_CSR.cpp→src/UnitTests/Matrices/SparseMatrixTest_CSRScalar.cu

+2 −2
Original line number Diff line number Diff line 
/***************************************************************************

                          SparseMatrixTest_CSR.cpp -  description

                          SparseMatrixTest_CSRScalar.cu -  description

                             -------------------

    begin                : Dec 3, 2019

    copyright            : (C) 2019 by Tomas Oberhuber et al.
@@ -8,4 +8,4 @@ 


/* See Copyright Notice in tnl/Copyright */



#include "SparseMatrixTest_CSR.h"
 
#include "SparseMatrixTest_CSRScalar.h"

src/UnitTests/Matrices/SparseMatrixTest_CSR.h→src/UnitTests/Matrices/SparseMatrixTest_CSRScalar.h

+17 −17
Original line number Diff line number Diff line 
/***************************************************************************

                          SparseMatrixTest_CSR.h -  description

                          SparseMatrixTest_CSRScalar.h -  description

                             -------------------

    begin                : Dec 2, 2019

    copyright            : (C) 2019 by Tomas Oberhuber et al.
@@ -20,23 +20,23 @@ const char* saveAndLoadFileName = "test_SparseMatrixTest_CSR_segments"; 
// types for which MatrixTest is instantiated

using MatrixTypes = ::testing::Types

<

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >

#ifdef HAVE_CUDA

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRDefault >

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, long,  TNL::Matrices::GeneralMatrix, TNL::Algorithms::Segments::CSRScalar >

#endif

>;