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

Fixed wrong definition of matrix types for typed tests.

parent 328a96ee

src/UnitTests/Matrices/DenseMatrixTest.h

+2 −2
Original line number Diff line number Diff line
@@ -1404,9 +1404,9 @@ using MatrixTypes = ::testing::Types 
    TNL::Matrices::Dense< int,    TNL::Devices::Host, long >,

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

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

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

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

#ifdef HAVE_CUDA

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

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

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

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

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

src/UnitTests/Matrices/SparseMatrixTest.h

+8 −8
Original line number Diff line number Diff line
@@ -354,9 +354,9 @@ using ChEllpackMatrixTypes = ::testing::Types 
    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< double, TNL::Devices::Host, long >

#ifdef HAVE_CUDA

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

    ,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 >,
@@ -472,9 +472,9 @@ using CSRMatrixTypes = ::testing::Types 
    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 >,

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

#ifdef HAVE_CUDA

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

    ,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 >,
@@ -590,9 +590,9 @@ using EllpackMatrixTypes = ::testing::Types 
    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< double, TNL::Devices::Host, long >

#ifdef HAVE_CUDA

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

    ,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 >,
@@ -708,9 +708,9 @@ using SlicedEllpackMatrixTypes = ::testing::Types 
    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< double, TNL::Devices::Host, long >

#ifdef HAVE_CUDA

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

    ,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 >,