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

Renaming forRows -> forElements forAllRows -> forEachElement for matrices.

parent c8ebd474

Documentation/Examples/Matrices/DenseMatrix/CMakeLists.txt

+38 −38
Original line number Diff line number Diff line
@@ -54,15 +54,15 @@ IF( BUILD_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_forElements_cuda DenseMatrixExample_forElements.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forElements_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forElements.out

                       OUTPUT DenseMatrixExample_forElements.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 )

   CUDA_ADD_EXECUTABLE( DenseMatrixExample_forEachElement_cuda DenseMatrixExample_forEachElement.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forEachElement_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forEachElement.out

                       OUTPUT DenseMatrixExample_forEachElement.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixViewExample_constructor_cuda DenseMatrixViewExample_constructor.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_constructor_cuda >
@@ -114,15 +114,15 @@ IF( BUILD_CUDA ) 
                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_allRowsReduction.out

                       OUTPUT DenseMatrixViewExample_allRowsReduction.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixViewExample_forRows_cuda DenseMatrixViewExample_forRows.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forRows_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forRows.out

                       OUTPUT DenseMatrixViewExample_forRows.out )

   CUDA_ADD_EXECUTABLE( DenseMatrixViewExample_forElements_cuda DenseMatrixViewExample_forElements.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forElements_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forElements.out

                       OUTPUT DenseMatrixViewExample_forElements.out )



   CUDA_ADD_EXECUTABLE( DenseMatrixViewExample_forAllRows_cuda DenseMatrixViewExample_forAllRows.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forAllRows_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forAllRows.out

                       OUTPUT DenseMatrixViewExample_forAllRows.out )

   CUDA_ADD_EXECUTABLE( DenseMatrixViewExample_forEachElement_cuda DenseMatrixViewExample_forEachElement.cu )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forEachElement_cuda >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forEachElement.out

                       OUTPUT DenseMatrixViewExample_forEachElement.out )



ELSE()

   ADD_EXECUTABLE( DenseMatrixExample_Constructor_init_list DenseMatrixExample_Constructor_init_list.cpp )
@@ -180,15 +180,15 @@ ELSE() 
                        ${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_forElements DenseMatrixExample_forElements.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forElements >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forElements.out

                       OUTPUT DenseMatrixExample_forElements.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 )

   ADD_EXECUTABLE( DenseMatrixExample_forEachElement DenseMatrixExample_forEachElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixExample_forEachElement >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forEachElement.out

                       OUTPUT DenseMatrixExample_forEachElement.out )



   ADD_EXECUTABLE( DenseMatrixViewExample_constructor DenseMatrixViewExample_constructor.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_constructor >
@@ -240,15 +240,15 @@ ELSE() 
                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_allRowsReduction.out

                       OUTPUT DenseMatrixViewExample_allRowsReduction.out )



   ADD_EXECUTABLE( DenseMatrixViewExample_forRows DenseMatrixViewExample_forRows.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forRows >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forRows.out

                       OUTPUT DenseMatrixViewExample_forRows.out )

   ADD_EXECUTABLE( DenseMatrixViewExample_forElements DenseMatrixViewExample_forElements.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forElements >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forElements.out

                       OUTPUT DenseMatrixViewExample_forElements.out )



   ADD_EXECUTABLE( DenseMatrixViewExample_forAllRows DenseMatrixViewExample_forAllRows.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forAllRows >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forAllRows.out

                       OUTPUT DenseMatrixViewExample_forAllRows.out )

   ADD_EXECUTABLE( DenseMatrixViewExample_forEachElement DenseMatrixViewExample_forEachElement.cpp )

   ADD_CUSTOM_COMMAND( COMMAND DenseMatrixViewExample_forEachElement >

                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixViewExample_forEachElement.out

                       OUTPUT DenseMatrixViewExample_forEachElement.out )



ENDIF()
@@ -264,8 +264,8 @@ ADD_CUSTOM_TARGET( RunDenseMatricesExamples ALL DEPENDS 
   DenseMatrixExample_getElement.out

   DenseMatrixExample_rowsReduction.out

   DenseMatrixExample_allRowsReduction.out

   DenseMatrixExample_forRows.out

   DenseMatrixExample_forAllRows.out

   DenseMatrixExample_forElements.out

   DenseMatrixExample_forEachElement.out

   DenseMatrixViewExample_constructor.out

   DenseMatrixViewExample_getCompressedRowLengths.out

   DenseMatrixViewExample_getElementsCount.out
@@ -276,8 +276,8 @@ ADD_CUSTOM_TARGET( RunDenseMatricesExamples ALL DEPENDS 
   DenseMatrixViewExample_getElement.out

   DenseMatrixViewExample_rowsReduction.out

   DenseMatrixViewExample_allRowsReduction.out

   DenseMatrixViewExample_forRows.out

   DenseMatrixViewExample_forAllRows.out

   DenseMatrixViewExample_forElements.out

   DenseMatrixViewExample_forEachElement.out



)

Documentation/Examples/Matrices/DenseMatrix/DenseMatrixExample_forAllRows.cu

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

Documentation/Examples/Matrices/DenseMatrix/DenseMatrixExample_forAllRows.cpp→Documentation/Examples/Matrices/DenseMatrix/DenseMatrixExample_forEachElement.cpp

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <TNL/Devices/Cuda.h>



template< typename Device >

void forAllRowsExample()

void forEachElementExample()

{

   TNL::Matrices::DenseMatrix< double, Device > matrix( 5, 5 );
@@ -15,17 +15,17 @@ void forAllRowsExample() 
         value = rowIdx + columnIdx;

   };



   matrix.forAllRows( f );

   matrix.forEachElement( f );

   std::cout << matrix << std::endl;

}



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

{

   std::cout << "Creating matrix on host: " << std::endl;

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

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



#ifdef HAVE_CUDA

   std::cout << "Creating matrix on CUDA device: " << std::endl;

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

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

#endif

}

Documentation/Examples/Matrices/DenseMatrix/DenseMatrixExample_forEachElement.cu

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

Documentation/Examples/Matrices/DenseMatrix/DenseMatrixExample_forRows.cpp→Documentation/Examples/Matrices/DenseMatrix/DenseMatrixExample_forElements.cpp

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <TNL/Devices/Cuda.h>



template< typename Device >

void forRowsExample()

void forElementsExample()

{

   TNL::Matrices::DenseMatrix< double, Device > matrix( 5, 5 );
@@ -15,17 +15,17 @@ void forRowsExample() 
         value = rowIdx + columnIdx;

   };



   matrix.forRows( 0, matrix.getRows(), f );

   matrix.forElements( 0, matrix.getRows(), f );

   std::cout << matrix << std::endl;

}



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

{

   std::cout << "Creating matrix on host: " << std::endl;

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

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



#ifdef HAVE_CUDA

   std::cout << "Creating matrix on CUDA device: " << std::endl;

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

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

#endif

}