Commit dec4b388 authored by Jakub Klinkovský's avatar Jakub Klinkovský Committed by Tomáš Oberhuber
Browse files

Removed tests for sparse matrices which use short as IndexType to speed up the compilation

parent c22a969b

src/UnitTests/Matrices/BinarySparseMatrixTest_CSR.h

+1 −9
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ protected: 
// types for which MatrixTest is instantiated

using CSRMatrixTypes = ::testing::Types

<

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,
@@ -42,11 +38,7 @@ using CSRMatrixTypes = ::testing::Types 
    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, long,  TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, long,  TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >

#ifdef HAVE_CUDA

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, short, TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, int,   TNL::Matrices::BinaryMatrix, TNL::Containers::Segments::CSR >,

src/UnitTests/Matrices/BinarySparseMatrixTest_Ellpack.h

+1 −9
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ using ColumnMajorEllpack = TNL::Containers::Segments::Ellpack< Device, Index, In 
// types for which MatrixTest is instantiated

using EllpackMatrixTypes = ::testing::Types

<

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorEllpack >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, RowMajorEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, RowMajorEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, RowMajorEllpack >,
@@ -53,11 +49,7 @@ using EllpackMatrixTypes = ::testing::Types 
    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, RowMajorEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, RowMajorEllpack >

#ifdef HAVE_CUDA

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorEllpack >,

src/UnitTests/Matrices/BinarySparseMatrixTest_SlicedEllpack.h

+1 −9
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ using ColumnMajorSlicedEllpack = TNL::Containers::Segments::SlicedEllpack< Devic 
// types for which MatrixTest is instantiated

using SlicedEllpackMatrixTypes = ::testing::Types

<

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, short, TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,
@@ -53,11 +49,7 @@ using SlicedEllpackMatrixTypes = ::testing::Types 
    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Host, long,  TNL::Matrices::GeneralMatrix, RowMajorSlicedEllpack >

#ifdef HAVE_CUDA

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, short, TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

   ,TNL::Matrices::SparseMatrix< int,     TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< float,   TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

    TNL::Matrices::SparseMatrix< double,  TNL::Devices::Cuda, int,   TNL::Matrices::GeneralMatrix, ColumnMajorSlicedEllpack >,

src/UnitTests/Matrices/Legacy/SparseMatrixTest_AdEllpack.h

+1 −9
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ protected: 
// types for which MatrixTest is instantiated

using AdEllpackMatrixTypes = ::testing::Types

<

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

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

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

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

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

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

    TNL::Matrices::AdEllpack< float,  TNL::Devices::Host, int >,
@@ -40,11 +36,7 @@ using AdEllpackMatrixTypes = ::testing::Types 
    TNL::Matrices::AdEllpack< float,  TNL::Devices::Host, long >,

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

#ifdef HAVE_CUDA

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

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

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

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

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

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

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

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

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

src/UnitTests/Matrices/Legacy/SparseMatrixTest_BiEllpack.h

+1 −9
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ protected: 
// types for which MatrixTest is instantiated

using BiEllpackMatrixTypes = ::testing::Types

<

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

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

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

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

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

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

    TNL::Matrices::BiEllpack< float,  TNL::Devices::Host, int >,
@@ -40,11 +36,7 @@ using BiEllpackMatrixTypes = ::testing::Types 
    TNL::Matrices::BiEllpack< float,  TNL::Devices::Host, long >,

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

#ifdef HAVE_CUDA

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

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

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

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

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

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

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

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

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