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

Changing segments to be compatible with std::plus and simillar functionals.

parent 9f1955d9

Documentation/Examples/Matrices/CMakeLists.txt

+31 −30
Original line number Diff line number Diff line
@@ -29,36 +29,6 @@ IF( BUILD_CUDA ) 
                        ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH}/DenseMatrixExample_forRows.out

                       OUTPUT DenseMatrixExample_forRows.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
@@ -90,6 +60,37 @@ ELSE() 
                       OUTPUT DenseMatrixExample_forRows.out )

ENDIF()



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_CUSTOM_TARGET( RunMatricesExamples ALL DEPENDS

   DenseMatrixExample_Constructor_init_list.out

   DenseMatrixExample_setElements.out

Documentation/Examples/Matrices/DenseMatrixExample_allRowsReduction.cpp

+1 −8
Original line number Diff line number Diff line
@@ -32,13 +32,6 @@ void allRowsReduction() 
      return TNL::abs( value );

   };



   /***

    * Reduce lambda return maximum of given values.

    */

   auto reduce = [=] __cuda_callable__ ( double& a, const double& b ) {

      a = TNL::max( a, b );

   };



   /***

    * Keep lambda store the largest value in each row to the vector rowMax.

    */
@@ -49,7 +42,7 @@ void allRowsReduction() 
   /***

    * Compute the largest values in each row.

    */

   matrix.allRowsReduction( fetch, reduce, keep, std::numeric_limits< double >::lowest() );

   matrix.allRowsReduction( fetch, std::plus<>{}, keep, std::numeric_limits< double >::lowest() );



   std::cout << "Max. elements in rows are: " << rowMax << std::endl;

}

Documentation/Examples/Matrices/DenseMatrixExample_rowsReduction.cpp

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ void rowsReduction() 
   /***

    * Reduce lambda return maximum of given values.

    */

   auto reduce = [=] __cuda_callable__ ( double& a, const double& b ) {

      a = TNL::max( a, b );

   auto reduce = [=] __cuda_callable__ ( double& a, const double& b ) -> double {

      return TNL::max( a, b );

   };



   /***

src/TNL/Containers/Segments/BiEllpack.h

+2 −2
Original line number Diff line number Diff line
@@ -97,10 +97,10 @@ class BiEllpack 
       * \brief Go over all segments and perform a reduction in each of them.

       */

      template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >

      void segmentsReduction( IndexType first, IndexType last, Fetch& fetch, Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;

      void segmentsReduction( IndexType first, IndexType last, Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;



      template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >

      void allReduction( Fetch& fetch, Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;

      void allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;



      BiEllpack& operator=( const BiEllpack& source ) = default;

src/TNL/Containers/Segments/BiEllpack.hpp

+2 −2
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ template< typename Device, 
   template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >

void

BiEllpack< Device, Index, IndexAllocator, RowMajorOrder, WarpSize >::

segmentsReduction( IndexType first, IndexType last, Fetch& fetch, Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const

segmentsReduction( IndexType first, IndexType last, Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const

{

   this->getConstView().segmentsReduction( first, last, fetch, reduction, keeper, zero, args... );

}
@@ -467,7 +467,7 @@ template< typename Device, 
   template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >

void

BiEllpack< Device, Index, IndexAllocator, RowMajorOrder, WarpSize >::

allReduction( Fetch& fetch, Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const

allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const

{

   this->segmentsReduction( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );

}