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

Renamed sparse matrix tests.

parent 2a924e21

src/TNL/Matrices/CSR_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ class CSRDeviceDependentCode< Devices::MIC > 
         const InVector* inVectorPtr = &inVector;

         OutVector* outVectorPtr = &outVector;

#ifdef HAVE_OPENMP

#pragma omp parallel for firstprivate( matrixPtr, inVectorPtr, outVectorPtr ), schedule(static ), if( tnlHost::isOMPEnabled() )

#pragma omp parallel for firstprivate( matrixPtr, inVectorPtr, outVectorPtr ), schedule(static ), if( Devices::Host::isOMPEnabled() )

#endif         

         for( Index row = 0; row < rows; row ++ )

            ( *outVectorPtr )[ row ] = matrixPtr->rowVectorProduct( row, *inVectorPtr );

src/TNL/Matrices/SlicedEllpack_impl.h

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

                          tnlSlicedSlicedEllpack_impl.h  -  description

                          SlicedSlicedEllpack_impl.h  -  description

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

    begin                : Dec 8, 2013

    copyright            : (C) 2013 by Tomas Oberhuber

tests/unit-tests/CMakeLists.txt

+8 −8
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ ADD_TEST( core/vectors/tnlVectorOperationsTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH 
ADD_TEST( core/vectors/tnlVectorTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlVectorTest${mpiExt} )

ADD_TEST( core/vectors/tnlStaticVectorTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlStaticVectorTest${mpiExt} )



ADD_TEST( core/multimaps/tnlEllpackIndexMultimapTest{mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlEllpackIndexMultimapTest${mpiExt} )

ADD_TEST( core/multimaps/EllpackIndexMultimapTest{mpiExt} ${EXECUTABLE_OUTPUT_PATH}/EllpackIndexMultimapTest${mpiExt} )



ADD_TEST( matrices/tnlDenseTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlDenseTest${mpiExt} )

ADD_TEST( matrices/tnlTridiagonalTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlTridiagonalTest${mpiExt} )

ADD_TEST( matrices/tnlMultidiagonalTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlMultidiagonalTest${mpiExt} )

ADD_TEST( matrices/tnlEllpackTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlEllpackTest${mpiExt} )

ADD_TEST( matrices/tnlSlicedEllpackTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlSlicedEllpackTest${mpiExt} )

ADD_TEST( matrices/EllpackTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/EllpackTest${mpiExt} )

ADD_TEST( matrices/SlicedEllpackTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/SlicedEllpackTest${mpiExt} )

ADD_TEST( matrices/tnlChunkedEllpackTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlChunkedEllpackTest${mpiExt} )

ADD_TEST( matrices/tnlCSRTest${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlCSRTest${mpiExt} )
@@ -63,14 +63,14 @@ if( BUILD_CUDA ) 
   ADD_TEST( matrices/tnlMultidiagonalTest-cuda${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlMultidiagonalTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/tnlMultidiagonalTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/tnlTridiagonalTest-cuda${mpiExt} )         

            

   ADD_TEST( matrices/tnlEllpackTest-cuda${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlEllpackTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/tnlEllpackTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/tnlMultidiagonalTest-cuda${mpiExt} )

   ADD_TEST( matrices/EllpackTest-cuda${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/EllpackTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/EllpackTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/tnlMultidiagonalTest-cuda${mpiExt} )

   

   ADD_TEST( matrices/tnlSlicedEllpackTest-cuda${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlSlicedEllpackTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/tnlSlicedEllpackTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/tnlEllpackTest-cuda${mpiExt} )         

   ADD_TEST( matrices/SlicedEllpackTest-cuda${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/SlicedEllpackTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/SlicedEllpackTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/EllpackTest-cuda${mpiExt} )         

   

   ADD_TEST( matrices/tnlChunkedEllpackTest-cuda${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlChunkedEllpackTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/tnlChunkedEllpackTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/tnlSlicedEllpackTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/tnlChunkedEllpackTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/SlicedEllpackTest-cuda${mpiExt} )

   

   ADD_TEST( matrices/tnlCSRTest-cuda${mpiExt} ${EXECUTABLE_OUTPUT_PATH}/tnlCSRTest-cuda${mpiExt} )

   SET_TESTS_PROPERTIES ( matrices/tnlCSRTest-cuda${mpiExt} PROPERTIES DEPENDS core/cuda/tnlChunkedEllpackTest-cuda${mpiExt} )

tests/unit-tests/matrices/CMakeLists.txt

+11 −11
Original line number Diff line number Diff line 
set( headers tnlDenseMatrixTester.h

             tnlTridiagonalMatrixTester.h

             tnlMultidiagonalMatrixTester.h

             tnlEllpackMatrixTester.h

             tnlSlicedEllpackMatrixTester.h

             tnlSparseMatrixTester.h )

             EllpackMatrixTester.h

             SlicedEllpackMatrixTester.h

             SparseMatrixTester.h )



ADD_EXECUTABLE( tnlDenseMatrixTest${mpiExt} ${headers} tnlDenseMatrixTest.cpp )

TARGET_LINK_LIBRARIES( tnlDenseMatrixTest${mpiExt} ${CPPUNIT_LIBRARIES}
@@ -35,23 +35,23 @@ if( BUILD_CUDA ) 
                                                                      tnl )

endif()



ADD_EXECUTABLE( tnlEllpackMatrixTest${mpiExt} ${headers} tnlEllpackMatrixTest.cpp )

TARGET_LINK_LIBRARIES( tnlEllpackMatrixTest${mpiExt} ${CPPUNIT_LIBRARIES}

ADD_EXECUTABLE( EllpackMatrixTest${mpiExt} ${headers} EllpackMatrixTest.cpp )

TARGET_LINK_LIBRARIES( EllpackMatrixTest${mpiExt} ${CPPUNIT_LIBRARIES}

                                                              tnl )



if( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( tnlEllpackMatrixTest-cuda${mpiExt} ${headers} tnlEllpackMatrixTest.cu )

   TARGET_LINK_LIBRARIES( tnlEllpackMatrixTest-cuda${mpiExt} ${CPPUNIT_LIBRARIES}

   CUDA_ADD_EXECUTABLE( EllpackMatrixTest-cuda${mpiExt} ${headers} EllpackMatrixTest.cu )

   TARGET_LINK_LIBRARIES( EllpackMatrixTest-cuda${mpiExt} ${CPPUNIT_LIBRARIES}

                                                                      tnl )

endif()



ADD_EXECUTABLE( tnlSlicedEllpackMatrixTest${mpiExt} ${headers} tnlSlicedEllpackMatrixTest.cpp )

TARGET_LINK_LIBRARIES( tnlSlicedEllpackMatrixTest${mpiExt} ${CPPUNIT_LIBRARIES}

ADD_EXECUTABLE( SlicedEllpackMatrixTest${mpiExt} ${headers} SlicedEllpackMatrixTest.cpp )

TARGET_LINK_LIBRARIES( SlicedEllpackMatrixTest${mpiExt} ${CPPUNIT_LIBRARIES}

                                                              tnl )



if( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( tnlSlicedEllpackMatrixTest-cuda${mpiExt} ${headers} tnlSlicedEllpackMatrixTest.cu )

   TARGET_LINK_LIBRARIES( tnlSlicedEllpackMatrixTest-cuda${mpiExt} ${CPPUNIT_LIBRARIES}

   CUDA_ADD_EXECUTABLE( SlicedEllpackMatrixTest-cuda${mpiExt} ${headers} SlicedEllpackMatrixTest.cu )

   TARGET_LINK_LIBRARIES( SlicedEllpackMatrixTest-cuda${mpiExt} ${CPPUNIT_LIBRARIES}

                                                                      tnl )

endif()

tests/unit-tests/matrices/tnlCSRMatrixTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <TNL/Devices/Host.h>

#include <cstdlib>



#include "tnlSparseMatrixTester.h"

#include "SparseMatrixTester.h"

#include <TNL/Matrices/CSR.h>

#include "../tnlUnitTestStarter.h"