From bc152d3f45b048c90a35a0d8d8930a67fbf95ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Tue, 3 Dec 2019 11:13:28 +0100
Subject: [PATCH] Fixed const in segmentsReduction
---
src/TNL/Containers/Segments/CSR.h | 2 +-
src/TNL/Containers/Segments/CSR.hpp | 6 +++---
src/TNL/Matrices/SparseMatrix.hpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/TNL/Containers/Segments/CSR.h b/src/TNL/Containers/Segments/CSR.h
index 2f194c76de..92b4f39491 100644
--- a/src/TNL/Containers/Segments/CSR.h
+++ b/src/TNL/Containers/Segments/CSR.h
@@ -76,7 +76,7 @@ class CSR
* \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 );
+ void segmentsReduction( IndexType first, IndexType last, Fetch& fetch, 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 );
diff --git a/src/TNL/Containers/Segments/CSR.hpp b/src/TNL/Containers/Segments/CSR.hpp
index 4dcccac241..e2fd099aec 100644
--- a/src/TNL/Containers/Segments/CSR.hpp
+++ b/src/TNL/Containers/Segments/CSR.hpp
@@ -161,11 +161,11 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
CSR< Device, Index >::
-segmentsReduction( IndexType first, IndexType last, Fetch& fetch, Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args )
+segmentsReduction( IndexType first, IndexType last, Fetch& fetch, Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
using RealType = decltype( fetch( IndexType(), IndexType() ) );
- auto offsetsView = this->offsets.getConstView();
- auto l = [=] __cuda_callable__ ( const IndexType i, Args... args ) {
+ const auto offsetsView = this->offsets.getConstView();
+ auto l = [=] __cuda_callable__ ( const IndexType i, Args... args ) mutable {
const IndexType begin = offsetsView[ i ];
const IndexType end = offsetsView[ i + 1 ];
RealType aux( zero );
diff --git a/src/TNL/Matrices/SparseMatrix.hpp b/src/TNL/Matrices/SparseMatrix.hpp
index c89aeac176..067f36001c 100644
--- a/src/TNL/Matrices/SparseMatrix.hpp
+++ b/src/TNL/Matrices/SparseMatrix.hpp
@@ -502,7 +502,7 @@ vectorProduct( const InVector& inVector,
auto keeper = [=] __cuda_callable__ ( IndexType row, const RealType& value ) mutable {
outVectorView[ row ] = value;
};
- const_cast< SegmentsType* >( &this->segments )->segmentsReduction( 0, this->getRows(), fetch, reduction, keeper, ( RealType ) 0.0 );
+ this->segments.segmentsReduction( 0, this->getRows(), fetch, reduction, keeper, ( RealType ) 0.0 );
}
/*template< typename Real,
--
GitLab