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

Refactoring sparse matrix unite tests.

parent 86f37904

src/UnitTests/Matrices/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ IF( BUILD_CUDA ) 
   CUDA_ADD_EXECUTABLE( SparseMatrixTest_SlicedEllpack SparseMatrixTest_SlicedEllpack.cu OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( SparseMatrixTest_SlicedEllpack ${GTEST_BOTH_LIBRARIES} )



   CUDA_ADD_EXECUTABLE( SparseMatrixTest_ChunkedEllpack SparseMatrixTest_ChunkedEllpack.cu OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( SparseMatrixTest_ChunkedEllpack ${GTEST_BOTH_LIBRARIES} )



   CUDA_ADD_EXECUTABLE( SparseMatrixCopyTest SparseMatrixCopyTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( SparseMatrixCopyTest ${GTEST_BOTH_LIBRARIES} )
@@ -109,6 +112,7 @@ ADD_TEST( MultidiagonalMatrixTest ${EXECUTABLE_OUTPUT_PATH}/MultidiagonalMatrixT 
ADD_TEST( SparseMatrixTest_CSR ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_CSR${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( SparseMatrixTest_Ellpack ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_Ellpack${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( SparseMatrixTest_SlicedEllpack ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_SlicedEllpack${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( SparseMatrixTest_ChunkedEllpack ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_ChunkedEllpack${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( SparseMatrixCopyTest ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixCopyTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( BinarySparseMatrixTest_CSR ${EXECUTABLE_OUTPUT_PATH}/BinarySparseMatrixTest_CSR${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( BinarySparseMatrixTest_Ellpack ${EXECUTABLE_OUTPUT_PATH}/BinarySparseMatrixTest_Ellpack${CMAKE_EXECUTABLE_SUFFIX} )

src/UnitTests/Matrices/SparseMatrixTest.h

+49 −1386

File changed.

Preview size limit exceeded, changes collapsed.

src/UnitTests/Matrices/SparseMatrixTest.hpp

0 → 100644
+1459 −0

File added.

Preview size limit exceeded, changes collapsed.

src/UnitTests/Matrices/SparseMatrixTest_CSR.h

+4 −99
Original line number Diff line number Diff line
@@ -8,26 +8,17 @@ 


/* See Copyright Notice in tnl/Copyright */



#include <iostream>

#include <TNL/Containers/Segments/CSR.h>

#include <TNL/Matrices/SparseMatrix.h>





#include "SparseMatrixTest.h"

#include <iostream>



#ifdef HAVE_GTEST

#include <gtest/gtest.h>



// test fixture for typed tests

template< typename Matrix >

class CSRMatrixTest : public ::testing::Test

{

protected:

   using CSRMatrixType = Matrix;

};

const char* saveAndLoadFileName = "test_SparseMatrixTest_CSR_segments";



// types for which MatrixTest is instantiated

using CSRMatrixTypes = ::testing::Types

using MatrixTypes = ::testing::Types

<

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

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, TNL::Containers::Segments::CSR >,
@@ -49,93 +40,7 @@ using CSRMatrixTypes = ::testing::Types 
#endif

>;



TYPED_TEST_SUITE( CSRMatrixTest, CSRMatrixTypes);



TYPED_TEST( CSRMatrixTest, Constructors )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_Constructors< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, setDimensionsTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_SetDimensions< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, setCompressedRowLengthsTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_SetCompressedRowLengths< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, setLikeTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_SetLike< CSRMatrixType, CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, resetTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_Reset< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, getRowTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_GetRow< CSRMatrixType >();

}





TYPED_TEST( CSRMatrixTest, setElementTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_SetElement< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, addElementTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_AddElement< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, vectorProductTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_VectorProduct< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, rowsReduction )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_RowsReduction< CSRMatrixType >();

}



TYPED_TEST( CSRMatrixTest, saveAndLoadTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_SaveAndLoad< CSRMatrixType >( "test_SparseMatrixTest_CSR_segments" );

}



TYPED_TEST( CSRMatrixTest, printTest )

{

    using CSRMatrixType = typename TestFixture::CSRMatrixType;



    test_Print< CSRMatrixType >();

}



#endif



#include "SparseMatrixTest.h"

#include "../main.h"

src/UnitTests/Matrices/SparseMatrixTest_Ellpack.h

+3 −106
Original line number Diff line number Diff line
@@ -8,37 +8,27 @@ 


/* See Copyright Notice in tnl/Copyright */



#include <iostream>

#include <TNL/Containers/Segments/Ellpack.h>

#include <TNL/Matrices/SparseMatrix.h>





#include "SparseMatrixTest.h"

#include <iostream>



#ifdef HAVE_GTEST

#include <gtest/gtest.h>



// test fixture for typed tests

template< typename Matrix >

class EllpackMatrixTest : public ::testing::Test

{

protected:

   using EllpackMatrixType = Matrix;

};

const char* saveAndLoadFileName = "test_SparseMatrixTest_Ellpack_segments";



////

// Row-major format is used for the host system

template< typename Device, typename Index, typename IndexAlocator >

using RowMajorEllpack = TNL::Containers::Segments::Ellpack< Device, Index, IndexAlocator, true, 32 >;





////

// Column-major format is used for GPUs

template< typename Device, typename Index, typename IndexAllocator >

using ColumnMajorEllpack = TNL::Containers::Segments::Ellpack< Device, Index, IndexAllocator, false, 32 >;



// types for which MatrixTest is instantiated

using EllpackMatrixTypes = ::testing::Types

using MatrixTypes = ::testing::Types

<

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

    TNL::Matrices::SparseMatrix< long,    TNL::Devices::Host, int,   TNL::Matrices::GeneralMatrix, RowMajorEllpack >,
@@ -60,99 +50,6 @@ using EllpackMatrixTypes = ::testing::Types 
#endif

>;



TYPED_TEST_SUITE( EllpackMatrixTest, EllpackMatrixTypes);



TYPED_TEST( EllpackMatrixTest, Constructors )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_Constructors< EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, setDimensionsTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_SetDimensions< EllpackMatrixType >();

}



//TYPED_TEST( EllpackMatrixTest, setCompressedRowLengthsTest )

//{

////    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;

//

////    test_SetCompressedRowLengths< EllpackMatrixType >();

//

//    bool testRan = false;

//    EXPECT_TRUE( testRan );

//    std::cout << "\nTEST DID NOT RUN. NOT WORKING.\n\n";

//    std::cout << "      This test is dependent on the input format. \n";

//    std::cout << "      Almost every format allocates elements per row differently.\n\n";

//    std::cout << "\n    TODO: Finish implementation of getNonZeroRowLength (Only non-zero elements, not the number of allocated elements.)\n\n";

//}



TYPED_TEST( EllpackMatrixTest, setLikeTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_SetLike< EllpackMatrixType, EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, resetTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_Reset< EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, getRowTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_GetRow< EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, setElementTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_SetElement< EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, addElementTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_AddElement< EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, vectorProductTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_VectorProduct< EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, rowsReduction )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_RowsReduction< EllpackMatrixType >();

}



TYPED_TEST( EllpackMatrixTest, saveAndLoadTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_SaveAndLoad< EllpackMatrixType >( "test_SparseMatrixTest_Ellpack_segments" );

}



TYPED_TEST( EllpackMatrixTest, printTest )

{

    using EllpackMatrixType = typename TestFixture::EllpackMatrixType;



    test_Print< EllpackMatrixType >();

}



#endif



#include "../main.h"