Commit 5e419f95 authored by Lukas Cejka's avatar Lukas Cejka Committed by Tomáš Oberhuber
Browse files

Added back all formats for testing, except for AdEllpack and BiEllpack.

parent 4723ed6f

src/UnitTests/Matrices/SparseMatrixTest.h

+94 −94
Original line number Diff line number Diff line
@@ -343,31 +343,31 @@ protected: 
// types for which MatrixTest is instantiated

using ChEllpackMatrixTypes = ::testing::Types

<

//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, short >,

//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, short >,

//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, short >,

//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, short >,

//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, int >,

//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, int >,

//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, int >,

//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, int >,

//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, long >,

//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, long >,

//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, long >,

//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, long >,

    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, short >,

    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, short >,

    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, short >,

    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, short >,

    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, int >,

    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, int >,

    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, int >,

    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, int >,

    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, long >,

    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, long >,

    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, long >,

    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, long >,

#ifdef HAVE_CUDA

//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, short >,

//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, short >,

//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, short >,

//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, short >,

//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, int >,

//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, int >,

//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, int >,

//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, int >,

//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, long >,

//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, long >,

//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, long >,

//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, long >

    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, short >,

    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, short >,

    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, short >,

    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, short >,

    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, int >,

    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, int >,

    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, int >,

    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, int >,

    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, long >,

    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, long >,

    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, long >,

    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, long >

#endif

>;
@@ -461,30 +461,30 @@ protected: 
// types for which MatrixTest is instantiated

using CSRMatrixTypes = ::testing::Types

<

//    TNL::Matrices::CSR< int,    TNL::Devices::Host, short >,

//    TNL::Matrices::CSR< long,   TNL::Devices::Host, short >,

//    TNL::Matrices::CSR< float,  TNL::Devices::Host, short >,

//    TNL::Matrices::CSR< double, TNL::Devices::Host, short >,

//    TNL::Matrices::CSR< int,    TNL::Devices::Host, int >,

//    TNL::Matrices::CSR< long,   TNL::Devices::Host, int >,

//    TNL::Matrices::CSR< float,  TNL::Devices::Host, int >,

//    TNL::Matrices::CSR< double, TNL::Devices::Host, int >,

//    TNL::Matrices::CSR< int,    TNL::Devices::Host, long >,

//    TNL::Matrices::CSR< long,   TNL::Devices::Host, long >,

//    TNL::Matrices::CSR< float,  TNL::Devices::Host, long >,

    TNL::Matrices::CSR< int,    TNL::Devices::Host, short >,

    TNL::Matrices::CSR< long,   TNL::Devices::Host, short >,

    TNL::Matrices::CSR< float,  TNL::Devices::Host, short >,

    TNL::Matrices::CSR< double, TNL::Devices::Host, short >,

    TNL::Matrices::CSR< int,    TNL::Devices::Host, int >,

    TNL::Matrices::CSR< long,   TNL::Devices::Host, int >,

    TNL::Matrices::CSR< float,  TNL::Devices::Host, int >,

    TNL::Matrices::CSR< double, TNL::Devices::Host, int >,

    TNL::Matrices::CSR< int,    TNL::Devices::Host, long >,

    TNL::Matrices::CSR< long,   TNL::Devices::Host, long >,

    TNL::Matrices::CSR< float,  TNL::Devices::Host, long >,

    TNL::Matrices::CSR< double, TNL::Devices::Host, long >,

#ifdef HAVE_CUDA

//    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, short >,

//    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, short >,

//    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, short >,

//    TNL::Matrices::CSR< double, TNL::Devices::Cuda, short >,

//    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, int >,

//    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, int >,

//    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, int >,

//    TNL::Matrices::CSR< double, TNL::Devices::Cuda, int >,

//    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, long >,

//    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, long >,

//    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, long >,

    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, short >,

    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, short >,

    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, short >,

    TNL::Matrices::CSR< double, TNL::Devices::Cuda, short >,

    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, int >,

    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, int >,

    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, int >,

    TNL::Matrices::CSR< double, TNL::Devices::Cuda, int >,

    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, long >,

    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, long >,

    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, long >,

    TNL::Matrices::CSR< double, TNL::Devices::Cuda, long >

#endif

>;
@@ -579,31 +579,31 @@ protected: 
// types for which MatrixTest is instantiated

using EllpackMatrixTypes = ::testing::Types

<

//    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, short >,

//    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, short >,

//    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, short >,

//    TNL::Matrices::Ellpack< double, TNL::Devices::Host, short >,

//    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, int >,

//    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, int >,

//    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, int >,

//    TNL::Matrices::Ellpack< double, TNL::Devices::Host, int >,

//    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, long >,

//    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, long >,

//    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, long >,

//    TNL::Matrices::Ellpack< double, TNL::Devices::Host, long >,

    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, short >,

    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, short >,

    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, short >,

    TNL::Matrices::Ellpack< double, TNL::Devices::Host, short >,

    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, int >,

    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, int >,

    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, int >,

    TNL::Matrices::Ellpack< double, TNL::Devices::Host, int >,

    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, long >,

    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, long >,

    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, long >,

    TNL::Matrices::Ellpack< double, TNL::Devices::Host, long >,

#ifdef HAVE_CUDA

//    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, short >,

//    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, short >,

//    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, short >,

//    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, short >,

//    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, int >,

//    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, int >,

//    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, int >,

//    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, int >,

//    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, long >,

//    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, long >,

//    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, long >,

//    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, long >

    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, short >,

    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, short >,

    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, short >,

    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, short >,

    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, int >,

    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, int >,

    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, int >,

    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, int >,

    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, long >,

    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, long >,

    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, long >,

    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, long >

#endif

>;
@@ -697,31 +697,31 @@ protected: 
// types for which MatrixTest is instantiated

using SlicedEllpackMatrixTypes = ::testing::Types

<

//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, short >,

//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, short >,

//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, short >,

//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, short >,

//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, int >,

//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, int >,

//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, int >,

//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, int >,

//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, long >,

//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, long >,

//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, long >,

//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, long >,

    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, short >,

    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, short >,

    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, short >,

    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, short >,

    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, int >,

    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, int >,

    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, int >,

    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, int >,

    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, long >,

    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, long >,

    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, long >,

    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, long >,

#ifdef HAVE_CUDA

//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, short >,

//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, short >,

//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, short >,

//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, short >,

//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, int >,

//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, int >,

//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, int >,

//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, int >,

//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, long >,

//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, long >,

//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, long >,

//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, long >

    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, short >,

    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, short >,

    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, short >,

    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, short >,

    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, int >,

    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, int >,

    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, int >,

    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, int >,

    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, long >,

    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, long >,

    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, long >,

    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, long >

#endif

>;