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

Merge branch 'TO/matrices' into 'develop' 

To/matrices

See merge request !58
parents 66f6c259 43a56838

Documentation/Examples/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line 
ADD_SUBDIRECTORY( Algorithms )

ADD_SUBDIRECTORY( Containers )

ADD_SUBDIRECTORY( Pointers )

ADD_SUBDIRECTORY( Matrices )



ADD_EXECUTABLE( FileExample FileExample.cpp )

ADD_CUSTOM_COMMAND( COMMAND FileExample > ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/FileExample.out OUTPUT FileExample.out )

Documentation/Examples/Matrices/CMakeLists.txt

0 → 100644
+154 −0
Original line number Diff line number Diff line 
IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( DenseMatrixExample_Constructor_init_list_cuda DenseMatrixExample_Constructor_init_list.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_Constructor_init_list_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_Constructor_init_list.out

                       OUTPUT DenseMatrixExample_Constructor_init_list.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_setElements_cuda DenseMatrixExample_setElements.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_setElements_cuda > 

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_setElements.out

                       OUTPUT DenseMatrixExample_setElements.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_getCompressedRowLengths_cuda DenseMatrixExample_getCompressedRowLengths.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getCompressedRowLengths_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getCompressedRowLengths.out

                       OUTPUT DenseMatrixExample_getCompressedRowLengths.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_getElementsCount_cuda DenseMatrixExample_getElementsCount.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getElementsCount_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getElementsCount.out

                       OUTPUT DenseMatrixExample_getElementsCount.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_getConstRow_cuda DenseMatrixExample_getConstRow.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getConstRow_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getConstRow.out

                       OUTPUT DenseMatrixExample_getConstRow.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_getRow_cuda DenseMatrixExample_getRow.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getRow_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getRow.out

                       OUTPUT DenseMatrixExample_getRow.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_setElement_cuda DenseMatrixExample_setElement.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_setElement_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_setElement.out

                       OUTPUT DenseMatrixExample_setElement.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_addElement_cuda DenseMatrixExample_addElement.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_addElement_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_addElement.out

                       OUTPUT DenseMatrixExample_addElement.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_getElement_cuda DenseMatrixExample_getElement.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getElement_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getElement.out

                       OUTPUT DenseMatrixExample_getElement.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_rowsReduction_cuda DenseMatrixExample_rowsReduction.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_rowsReduction_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_rowsReduction.out

                       OUTPUT DenseMatrixExample_rowsReduction.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_allRowsReduction_cuda DenseMatrixExample_allRowsReduction.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_allRowsReduction_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_allRowsReduction.out

                       OUTPUT DenseMatrixExample_allRowsReduction.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_forRows_cuda DenseMatrixExample_forRows.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forRows_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forRows.out

                       OUTPUT DenseMatrixExample_forRows.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixExample_forAllRows_cuda DenseMatrixExample_forAllRows.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forAllRows_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forAllRows.out

                       OUTPUT DenseMatrixExample_forAllRows.out )



ELSE()

   ADD_EXECUTABLE( DenseMatrixExample_Constructor_init_list DenseMatrixExample_Constructor_init_list.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_Constructor_init_list >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_Constructor_init_list.out

                       OUTPUT DenseMatrixExample_Constructor_init_list.out )



   ADD_EXECUTABLE( DenseMatrixExample_setElements DenseMatrixExample_setElements.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_setElements > 

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_setElements.out

                       OUTPUT DenseMatrixExample_setElements.out )



   ADD_EXECUTABLE( DenseMatrixExample_getCompressedRowLengths DenseMatrixExample_getCompressedRowLengths.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getCompressedRowLengths >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getCompressedRowLengths.out

                       OUTPUT DenseMatrixExample_getCompressedRowLengths.out )



   ADD_EXECUTABLE( DenseMatrixExample_getElementsCount DenseMatrixExample_getElementsCount.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getElementsCount >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getElementsCount.out

                       OUTPUT DenseMatrixExample_getElementsCount.out )



   ADD_EXECUTABLE( DenseMatrixExample_getConstRow DenseMatrixExample_getConstRow.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getConstRow >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getConstRow.out

                       OUTPUT DenseMatrixExample_getConstRow.out )



   ADD_EXECUTABLE( DenseMatrixExample_getRow DenseMatrixExample_getRow.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getRow >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getRow.out

                       OUTPUT DenseMatrixExample_getRow.out )



   ADD_EXECUTABLE( DenseMatrixExample_setElement DenseMatrixExample_setElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_setElement >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_setElement.out

                       OUTPUT DenseMatrixExample_setElement.out )



   ADD_EXECUTABLE( DenseMatrixExample_addElement DenseMatrixExample_addElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_addElement >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_addElement.out

                       OUTPUT DenseMatrixExample_addElement.out )



   ADD_EXECUTABLE( DenseMatrixExample_getElement DenseMatrixExample_getElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_getElement >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_getElement.out

                       OUTPUT DenseMatrixExample_getElement.out )



   ADD_EXECUTABLE( DenseMatrixExample_rowsReduction DenseMatrixExample_rowsReduction.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_rowsReduction >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_rowsReduction.out

                       OUTPUT DenseMatrixExample_rowsReduction.out )



   ADD_EXECUTABLE( DenseMatrixExample_allRowsReduction DenseMatrixExample_allRowsReduction.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_allRowsReduction >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_allRowsReduction.out

                       OUTPUT DenseMatrixExample_allRowsReduction.out )



   ADD_EXECUTABLE( DenseMatrixExample_forRows DenseMatrixExample_forRows.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forRows >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forRows.out

                       OUTPUT DenseMatrixExample_forRows.out )



   ADD_EXECUTABLE( DenseMatrixExample_forAllRows DenseMatrixExample_forAllRows.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forAllRows >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forAllRows.out

                       OUTPUT DenseMatrixExample_forAllRows.out )



ENDIF()











ADD_CUSTOM_TARGET( RunMatricesExamples ALL DEPENDS

   DenseMatrixExample_Constructor_init_list.out

   DenseMatrixExample_setElements.out

   DenseMatrixExample_getCompressedRowLengths.out

   DenseMatrixExample_getElementsCount.out

   DenseMatrixExample_getConstRow.out

   DenseMatrixExample_getRow.out

   DenseMatrixExample_setElement.out

   DenseMatrixExample_addElement.out

   DenseMatrixExample_getElement.out

   DenseMatrixExample_rowsReduction.out

   DenseMatrixExample_allRowsReduction.out

   DenseMatrixExample_forRows.out

   DenseMatrixExample_forAllRows.out

)

Documentation/Examples/Matrices/DenseMatrixExample_Constructor_init_list.cpp

0 → 100644
+37 −0
Original line number Diff line number Diff line 
#include <iostream>

#include <TNL/Matrices/DenseMatrix.h>

#include <TNL/Devices/Host.h>





template< typename Device >

void initializerListExample()

{

   TNL::Matrices::DenseMatrix< double, Device > matrix {

      {  1,  2,  3,  4,  5,  6 },

      {  7,  8,  9, 10, 11, 12 },

      { 13, 14, 15, 16, 17, 18 }

   };



   std::cout << "General dense matrix: " << std::endl << matrix << std::endl;



   TNL::Matrices::DenseMatrix< double, Device > triangularMatrix {

      {  1 },

      {  2,  3 },

      {  4,  5,  6 },

      {  7,  8,  9, 10 },

      { 11, 12, 13, 14, 15 }

   };



   std::cout << "Triangular dense matrix: " << std::endl << triangularMatrix << std::endl;

}



int main( int argc, char* argv[] )

{

   std::cout << "Creating matrices on CPU ... " << std::endl;

   initializerListExample< TNL::Devices::Host >();



#ifdef HAVE_CUDA

   std::cout << "Creating matrices on CUDA GPU ... " << std::endl;

   initializerListExample< TNL::Devices::Cuda >();

#endif

}

Documentation/Examples/Matrices/DenseMatrixExample_Constructor_init_list.cu

0 → 120000
+1 −0
Original line number Diff line number Diff line 
DenseMatrixExample_Constructor_init_list.cpp
 
 No newline at end of file

Documentation/Examples/Matrices/DenseMatrixExample_addElement.cpp

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#include <iostream>

#include <TNL/Matrices/DenseMatrix.h>

#include <TNL/Devices/Host.h>



template< typename Device >

void addElements()

{

   TNL::Matrices::DenseMatrix< double, Device > matrix( 5, 5 );

   for( int i = 0; i < 5; i++ )

      matrix.setElement( i, i, i );



   std::cout << "Initial matrix is: " << matrix << std::endl;



   for( int i = 0; i < 5; i++ )

      for( int j = 0; j < 5; j++ )

         matrix.addElement( i, j, 1.0, 5.0 );



   std::cout << "Matrix after addition is: " << matrix << std::endl;

}



int main( int argc, char* argv[] )

{

   std::cout << "Add elements on host:" << std::endl;

   addElements< TNL::Devices::Host >();



#ifdef HAVE_CUDA

   std::cout << "Add elements on CUDA device:" << std::endl;

   addElements< TNL::Devices::Cuda >();

#endif

}