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

Fixing examples for multidiagonal matrix.

parent 53d3728d

Documentation/Examples/Matrices/LambdaMatrix/LambdaMatrixExample_allRowsReduction.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ void allRowsReduction() 
         value = TNL::max( rowIdx - columnIdx + 1, 0 );

   };



   using MatrixFactory = TNL::Matrices::LambdaMatrixFactory< double, TNL::Devices::AnyDevice, int >;

   using MatrixFactory = TNL::Matrices::LambdaMatrixFactory< double, Device, int >;

   auto matrix = MatrixFactory::create( 5, 5, matrixElements, rowLengths );



   /***

Documentation/Examples/Matrices/LambdaMatrix/LambdaMatrixExample_forAllRows.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ void forRowsExample() 
         value = TNL::max( rowIdx - columnIdx + 1, 0 );

   };



   using MatrixFactory = TNL::Matrices::LambdaMatrixFactory< double, TNL::Devices::AnyDevice, int >;

   using MatrixFactory = TNL::Matrices::LambdaMatrixFactory< double, Device, int >;

   auto matrix = MatrixFactory::create( 5, 5, matrixElements, rowLengths );



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

Documentation/Examples/Matrices/LambdaMatrix/LambdaMatrixExample_rowsReduction.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ void rowsReduction() 
         value = TNL::max( rowIdx - columnIdx + 1, 0 );

   };



   using MatrixFactory = TNL::Matrices::LambdaMatrixFactory< double, TNL::Devices::AnyDevice, int >;

   using MatrixFactory = TNL::Matrices::LambdaMatrixFactory< double, Device, int >;

   auto matrix = MatrixFactory::create( 5, 5, matrixElements, rowLengths );



   /***

Documentation/Examples/Matrices/MultidiagonalMatrix/CMakeLists.txt

+16 −8
Original line number Diff line number Diff line
@@ -39,10 +39,11 @@ IF( BUILD_CUDA ) 
                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/MultidiagonalMatrixExample_getRow.out

                       OUTPUT MultidiagonalMatrixExample_getRow.out )



   CUDA_ADD_EXECUTABLE( MultidiagonalMatrixExample_setElement_cuda MultidiagonalMatrixExample_setElement.cu )

   ADD_CUSTOM_COMMAND( COMMAND MultidiagonalMatrixExample_setElement_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/MultidiagonalMatrixExample_setElement.out

                       OUTPUT MultidiagonalMatrixExample_setElement.out )

# This example does not work with nvcc 10.1. Restore it here when it works.

#   CUDA_ADD_EXECUTABLE( MultidiagonalMatrixExample_setElement_cuda MultidiagonalMatrixExample_setElement.cu )

#   ADD_CUSTOM_COMMAND( COMMAND MultidiagonalMatrixExample_setElement_cuda >

#                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/MultidiagonalMatrixExample_setElement.out

#                       OUTPUT MultidiagonalMatrixExample_setElement.out )



   CUDA_ADD_EXECUTABLE( MultidiagonalMatrixExample_addElement_cuda MultidiagonalMatrixExample_addElement.cu )

   ADD_CUSTOM_COMMAND( COMMAND MultidiagonalMatrixExample_addElement_cuda >
@@ -165,10 +166,11 @@ ELSE() 
                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/MultidiagonalMatrixExample_getRow.out

                       OUTPUT MultidiagonalMatrixExample_getRow.out )



   ADD_EXECUTABLE( MultidiagonalMatrixExample_setElement MultidiagonalMatrixExample_setElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND MultidiagonalMatrixExample_setElement >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/MultidiagonalMatrixExample_setElement.out

                       OUTPUT MultidiagonalMatrixExample_setElement.out )

#  This example does not work with nvcc 10.1. Restore it here when it works.

#   ADD_EXECUTABLE( MultidiagonalMatrixExample_setElement MultidiagonalMatrixExample_setElement.cpp )

#   ADD_CUSTOM_COMMAND( COMMAND MultidiagonalMatrixExample_setElement >

#                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/MultidiagonalMatrixExample_setElement.out

#                       OUTPUT MultidiagonalMatrixExample_setElement.out )



   ADD_EXECUTABLE( MultidiagonalMatrixExample_addElement MultidiagonalMatrixExample_addElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND MultidiagonalMatrixExample_addElement >
@@ -252,6 +254,12 @@ ELSE() 


ENDIF()



   ADD_EXECUTABLE( MultidiagonalMatrixExample_setElement MultidiagonalMatrixExample_setElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND MultidiagonalMatrixExample_setElement >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/MultidiagonalMatrixExample_setElement.out

                       OUTPUT MultidiagonalMatrixExample_setElement.out )





ADD_CUSTOM_TARGET( RunMatricesExamples ALL DEPENDS

   MultidiagonalMatrixExample_Constructor.out

   MultidiagonalMatrixExample_Constructor_init_list_1.out

Documentation/Examples/Matrices/MultidiagonalMatrix/MultidiagonalMatrixExample_Constructor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void laplaceOperatorMatrix() 
         row.setElement( 4, -1.0 );

      }

   };

   TNL::Algorithms::ParallelFor2D< TNL::Devices::Sequential >::exec( 0, 0, gridSize, gridSize, f );

   TNL::Algorithms::ParallelFor2D< Device >::exec( 0, 0, gridSize, gridSize, f );



   std::cout << "Laplace operator matrix: " << std::endl << matrix << std::endl;

}