From a006571b9ffe370009171d6b5fcd8bdc3b3154a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Wed, 31 Mar 2021 20:47:24 +0200
Subject: [PATCH] Renaming allReduction to reduceAllSegments.
---
src/TNL/Algorithms/Segments/BiEllpack.h | 2 +-
src/TNL/Algorithms/Segments/BiEllpack.hpp | 2 +-
src/TNL/Algorithms/Segments/BiEllpackView.h | 2 +-
src/TNL/Algorithms/Segments/BiEllpackView.hpp | 2 +-
src/TNL/Algorithms/Segments/CSR.h | 2 +-
src/TNL/Algorithms/Segments/CSR.hpp | 2 +-
src/TNL/Algorithms/Segments/CSRView.h | 2 +-
src/TNL/Algorithms/Segments/CSRView.hpp | 2 +-
src/TNL/Algorithms/Segments/ChunkedEllpack.h | 2 +-
src/TNL/Algorithms/Segments/ChunkedEllpack.hpp | 2 +-
src/TNL/Algorithms/Segments/ChunkedEllpackView.h | 2 +-
src/TNL/Algorithms/Segments/ChunkedEllpackView.hpp | 2 +-
src/TNL/Algorithms/Segments/Ellpack.h | 2 +-
src/TNL/Algorithms/Segments/Ellpack.hpp | 2 +-
src/TNL/Algorithms/Segments/EllpackView.h | 2 +-
src/TNL/Algorithms/Segments/EllpackView.hpp | 2 +-
src/TNL/Algorithms/Segments/SlicedEllpack.h | 2 +-
src/TNL/Algorithms/Segments/SlicedEllpack.hpp | 6 +++---
src/TNL/Algorithms/Segments/SlicedEllpackView.h | 2 +-
src/TNL/Algorithms/Segments/SlicedEllpackView.hpp | 2 +-
src/TNL/Algorithms/Segments/detail/CSR.h | 2 +-
src/UnitTests/Algorithms/Segments/SegmentsTest.hpp | 6 +++---
src/UnitTests/Algorithms/Segments/SegmentsTest_CSR.h | 4 ++--
src/UnitTests/Algorithms/Segments/SegmentsTest_Ellpack.h | 4 ++--
.../Algorithms/Segments/SegmentsTest_SlicedEllpack.h | 4 ++--
25 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/TNL/Algorithms/Segments/BiEllpack.h b/src/TNL/Algorithms/Segments/BiEllpack.h
index b580206bc6..347bfe6286 100644
--- a/src/TNL/Algorithms/Segments/BiEllpack.h
+++ b/src/TNL/Algorithms/Segments/BiEllpack.h
@@ -119,7 +119,7 @@ namespace TNL
void reduceSegments(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, const Reduction &reduction, ResultKeeper &keeper, const Real &zero, Args... args) const;
+ void reduceAllSegments(Fetch &fetch, const Reduction &reduction, ResultKeeper &keeper, const Real &zero, Args... args) const;
BiEllpack &operator=(const BiEllpack &source) = default;
diff --git a/src/TNL/Algorithms/Segments/BiEllpack.hpp b/src/TNL/Algorithms/Segments/BiEllpack.hpp
index 5bb5a38bb8..6dfaa0ab13 100644
--- a/src/TNL/Algorithms/Segments/BiEllpack.hpp
+++ b/src/TNL/Algorithms/Segments/BiEllpack.hpp
@@ -513,7 +513,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
BiEllpack< Device, Index, IndexAllocator, Organization, WarpSize >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/BiEllpackView.h b/src/TNL/Algorithms/Segments/BiEllpackView.h
index 5a7d25310f..344f96c00b 100644
--- a/src/TNL/Algorithms/Segments/BiEllpackView.h
+++ b/src/TNL/Algorithms/Segments/BiEllpackView.h
@@ -130,7 +130,7 @@ class BiEllpackView
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
BiEllpackView& operator=( const BiEllpackView& view );
diff --git a/src/TNL/Algorithms/Segments/BiEllpackView.hpp b/src/TNL/Algorithms/Segments/BiEllpackView.hpp
index 88347e834a..29d554e0ae 100644
--- a/src/TNL/Algorithms/Segments/BiEllpackView.hpp
+++ b/src/TNL/Algorithms/Segments/BiEllpackView.hpp
@@ -442,7 +442,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
BiEllpackView< Device, Index, Organization, WarpSize >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/CSR.h b/src/TNL/Algorithms/Segments/CSR.h
index a06c287f16..aee35bbded 100644
--- a/src/TNL/Algorithms/Segments/CSR.h
+++ b/src/TNL/Algorithms/Segments/CSR.h
@@ -127,7 +127,7 @@ class CSR
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
CSR& operator=( const CSR& rhsSegments ) = default;
diff --git a/src/TNL/Algorithms/Segments/CSR.hpp b/src/TNL/Algorithms/Segments/CSR.hpp
index 8560accfeb..f0e1d78811 100644
--- a/src/TNL/Algorithms/Segments/CSR.hpp
+++ b/src/TNL/Algorithms/Segments/CSR.hpp
@@ -290,7 +290,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
CSR< Device, Index, Kernel, IndexAllocator >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/CSRView.h b/src/TNL/Algorithms/Segments/CSRView.h
index 53b441c778..6b47a4a3a5 100644
--- a/src/TNL/Algorithms/Segments/CSRView.h
+++ b/src/TNL/Algorithms/Segments/CSRView.h
@@ -124,7 +124,7 @@ class CSRView
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
CSRView& operator=( const CSRView& view );
diff --git a/src/TNL/Algorithms/Segments/CSRView.hpp b/src/TNL/Algorithms/Segments/CSRView.hpp
index ad1d956530..e6cbcfff44 100644
--- a/src/TNL/Algorithms/Segments/CSRView.hpp
+++ b/src/TNL/Algorithms/Segments/CSRView.hpp
@@ -258,7 +258,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
CSRView< Device, Index, Kernel >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/ChunkedEllpack.h b/src/TNL/Algorithms/Segments/ChunkedEllpack.h
index c24b0843c6..52ab9cd212 100644
--- a/src/TNL/Algorithms/Segments/ChunkedEllpack.h
+++ b/src/TNL/Algorithms/Segments/ChunkedEllpack.h
@@ -115,7 +115,7 @@ class ChunkedEllpack
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
ChunkedEllpack& operator=( const ChunkedEllpack& source ) = default;
diff --git a/src/TNL/Algorithms/Segments/ChunkedEllpack.hpp b/src/TNL/Algorithms/Segments/ChunkedEllpack.hpp
index 04343ce5d0..3031c7baab 100644
--- a/src/TNL/Algorithms/Segments/ChunkedEllpack.hpp
+++ b/src/TNL/Algorithms/Segments/ChunkedEllpack.hpp
@@ -455,7 +455,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
ChunkedEllpack< Device, Index, IndexAllocator, Organization >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/ChunkedEllpackView.h b/src/TNL/Algorithms/Segments/ChunkedEllpackView.h
index 134433b04b..77352f0815 100644
--- a/src/TNL/Algorithms/Segments/ChunkedEllpackView.h
+++ b/src/TNL/Algorithms/Segments/ChunkedEllpackView.h
@@ -144,7 +144,7 @@ class ChunkedEllpackView
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
ChunkedEllpackView& operator=( const ChunkedEllpackView& view );
diff --git a/src/TNL/Algorithms/Segments/ChunkedEllpackView.hpp b/src/TNL/Algorithms/Segments/ChunkedEllpackView.hpp
index 453ac9cdc3..92bc43b775 100644
--- a/src/TNL/Algorithms/Segments/ChunkedEllpackView.hpp
+++ b/src/TNL/Algorithms/Segments/ChunkedEllpackView.hpp
@@ -470,7 +470,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
ChunkedEllpackView< Device, Index, Organization >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/Ellpack.h b/src/TNL/Algorithms/Segments/Ellpack.h
index 6a1c2b1503..368d435eb0 100644
--- a/src/TNL/Algorithms/Segments/Ellpack.h
+++ b/src/TNL/Algorithms/Segments/Ellpack.h
@@ -115,7 +115,7 @@ class Ellpack
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
Ellpack& operator=( const Ellpack& source ) = default;
diff --git a/src/TNL/Algorithms/Segments/Ellpack.hpp b/src/TNL/Algorithms/Segments/Ellpack.hpp
index 52ca1ef334..0355ee62b0 100644
--- a/src/TNL/Algorithms/Segments/Ellpack.hpp
+++ b/src/TNL/Algorithms/Segments/Ellpack.hpp
@@ -320,7 +320,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
Ellpack< Device, Index, IndexAllocator, Organization, Alignment >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/EllpackView.h b/src/TNL/Algorithms/Segments/EllpackView.h
index e321730607..37e6290dbc 100644
--- a/src/TNL/Algorithms/Segments/EllpackView.h
+++ b/src/TNL/Algorithms/Segments/EllpackView.h
@@ -114,7 +114,7 @@ class EllpackView
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
EllpackView& operator=( const EllpackView& view );
diff --git a/src/TNL/Algorithms/Segments/EllpackView.hpp b/src/TNL/Algorithms/Segments/EllpackView.hpp
index 675468ea07..b399151855 100644
--- a/src/TNL/Algorithms/Segments/EllpackView.hpp
+++ b/src/TNL/Algorithms/Segments/EllpackView.hpp
@@ -316,7 +316,7 @@ template< typename Device,
int Alignment >
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void EllpackView< Device, Index, Organization, Alignment >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/SlicedEllpack.h b/src/TNL/Algorithms/Segments/SlicedEllpack.h
index 4807c86704..edb35fac3b 100644
--- a/src/TNL/Algorithms/Segments/SlicedEllpack.h
+++ b/src/TNL/Algorithms/Segments/SlicedEllpack.h
@@ -112,7 +112,7 @@ class SlicedEllpack
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
SlicedEllpack& operator=( const SlicedEllpack& source ) = default;
diff --git a/src/TNL/Algorithms/Segments/SlicedEllpack.hpp b/src/TNL/Algorithms/Segments/SlicedEllpack.hpp
index 4aa2383e9e..8f90b3aa5a 100644
--- a/src/TNL/Algorithms/Segments/SlicedEllpack.hpp
+++ b/src/TNL/Algorithms/Segments/SlicedEllpack.hpp
@@ -152,8 +152,8 @@ setSegmentsSizes( const SizesHolder& sizes )
slices_view[ i ] = res * SliceSize;
slice_segment_size_view[ i ] = res;
};
- ellpack.allReduction( fetch, reduce, keep, std::numeric_limits< IndexType >::min() );
- inplaceExclusiveScan( this->sliceOffsets );
+ ellpack.reduceAllSegments( fetch, reduce, keep, std::numeric_limits< IndexType >::min() );
+ this->sliceOffsets.template scan< Algorithms::ScanType::Exclusive >();
this->size = sum( sizes );
this->alignedSize = this->sliceOffsets.getElement( slicesCount );
}
@@ -354,7 +354,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
SlicedEllpack< Device, Index, IndexAllocator, Organization, SliceSize >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/SlicedEllpackView.h b/src/TNL/Algorithms/Segments/SlicedEllpackView.h
index dccb55faea..5b052848c4 100644
--- a/src/TNL/Algorithms/Segments/SlicedEllpackView.h
+++ b/src/TNL/Algorithms/Segments/SlicedEllpackView.h
@@ -113,7 +113,7 @@ class SlicedEllpackView
void reduceSegments( 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, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
+ void reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
SlicedEllpackView& operator=( const SlicedEllpackView& view );
diff --git a/src/TNL/Algorithms/Segments/SlicedEllpackView.hpp b/src/TNL/Algorithms/Segments/SlicedEllpackView.hpp
index 8282ea46cb..13ef6b0388 100644
--- a/src/TNL/Algorithms/Segments/SlicedEllpackView.hpp
+++ b/src/TNL/Algorithms/Segments/SlicedEllpackView.hpp
@@ -378,7 +378,7 @@ template< typename Device,
template< typename Fetch, typename Reduction, typename ResultKeeper, typename Real, typename... Args >
void
SlicedEllpackView< Device, Index, Organization, SliceSize >::
-allReduction( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
+reduceAllSegments( Fetch& fetch, const Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const
{
this->reduceSegments( 0, this->getSegmentsCount(), fetch, reduction, keeper, zero, args... );
}
diff --git a/src/TNL/Algorithms/Segments/detail/CSR.h b/src/TNL/Algorithms/Segments/detail/CSR.h
index 5b17e53732..b6ce3b6e45 100644
--- a/src/TNL/Algorithms/Segments/detail/CSR.h
+++ b/src/TNL/Algorithms/Segments/detail/CSR.h
@@ -108,7 +108,7 @@ class CSR
void reduceSegments( 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 ) const;
+ void reduceAllSegments( Fetch& fetch, Reduction& reduction, ResultKeeper& keeper, const Real& zero, Args... args ) const;
};
} // namespace detail
} // namespace Segments
diff --git a/src/UnitTests/Algorithms/Segments/SegmentsTest.hpp b/src/UnitTests/Algorithms/Segments/SegmentsTest.hpp
index 7073bdb8ab..5b92a02c8e 100644
--- a/src/UnitTests/Algorithms/Segments/SegmentsTest.hpp
+++ b/src/UnitTests/Algorithms/Segments/SegmentsTest.hpp
@@ -112,7 +112,7 @@ void test_SetSegmentsSizes_EqualSizes_EllpackOnly()
}
template< typename Segments >
-void test_AllReduction_MaximumInSegments()
+void test_reduceAllSegments_MaximumInSegments()
{
using DeviceType = typename Segments::DeviceType;
using IndexType = typename Segments::IndexType;
@@ -147,13 +147,13 @@ void test_AllReduction_MaximumInSegments()
auto keep = [=] __cuda_callable__ ( const IndexType i, const IndexType a ) mutable {
result_view[ i ] = a;
};
- segments.allReduction( fetch, reduce, keep, std::numeric_limits< IndexType >::min() );
+ segments.reduceAllSegments( fetch, reduce, keep, std::numeric_limits< IndexType >::min() );
for( IndexType i = 0; i < segmentsCount; i++ )
EXPECT_EQ( result.getElement( i ), ( i + 1 ) * segmentSize );
result_view = 0;
- segments.getView().allReduction( fetch, reduce, keep, std::numeric_limits< IndexType >::min() );
+ segments.getView().reduceAllSegments( fetch, reduce, keep, std::numeric_limits< IndexType >::min() );
for( IndexType i = 0; i < segmentsCount; i++ )
EXPECT_EQ( result.getElement( i ), ( i + 1 ) * segmentSize );
}
diff --git a/src/UnitTests/Algorithms/Segments/SegmentsTest_CSR.h b/src/UnitTests/Algorithms/Segments/SegmentsTest_CSR.h
index 74219f7db8..b1b5877122 100644
--- a/src/UnitTests/Algorithms/Segments/SegmentsTest_CSR.h
+++ b/src/UnitTests/Algorithms/Segments/SegmentsTest_CSR.h
@@ -44,11 +44,11 @@ TYPED_TEST( CSRSegmentsTest, setSegmentsSizes_EqualSizes )
test_SetSegmentsSizes_EqualSizes< CSRSegmentsType >();
}
-TYPED_TEST( CSRSegmentsTest, allReduction_MaximumInSegments )
+TYPED_TEST( CSRSegmentsTest, reduceAllSegments_MaximumInSegments )
{
using CSRSegmentsType = typename TestFixture::CSRSegmentsType;
- test_AllReduction_MaximumInSegments< CSRSegmentsType >();
+ test_reduceAllSegments_MaximumInSegments< CSRSegmentsType >();
}
#endif
diff --git a/src/UnitTests/Algorithms/Segments/SegmentsTest_Ellpack.h b/src/UnitTests/Algorithms/Segments/SegmentsTest_Ellpack.h
index 262ddce6d7..af9816ee48 100644
--- a/src/UnitTests/Algorithms/Segments/SegmentsTest_Ellpack.h
+++ b/src/UnitTests/Algorithms/Segments/SegmentsTest_Ellpack.h
@@ -51,11 +51,11 @@ TYPED_TEST( EllpackSegmentsTest, setSegmentsSizes_EqualSizes_EllpackOnly )
test_SetSegmentsSizes_EqualSizes_EllpackOnly< EllpackSegmentsType >();
}
-TYPED_TEST( EllpackSegmentsTest, allReduction_MaximumInSegments )
+TYPED_TEST( EllpackSegmentsTest, reduceAllSegments_MaximumInSegments )
{
using EllpackSegmentsType = typename TestFixture::EllpackSegmentsType;
- test_AllReduction_MaximumInSegments< EllpackSegmentsType >();
+ test_reduceAllSegments_MaximumInSegments< EllpackSegmentsType >();
}
#endif
diff --git a/src/UnitTests/Algorithms/Segments/SegmentsTest_SlicedEllpack.h b/src/UnitTests/Algorithms/Segments/SegmentsTest_SlicedEllpack.h
index 42a9e76525..2cd9fcd1cb 100644
--- a/src/UnitTests/Algorithms/Segments/SegmentsTest_SlicedEllpack.h
+++ b/src/UnitTests/Algorithms/Segments/SegmentsTest_SlicedEllpack.h
@@ -44,11 +44,11 @@ TYPED_TEST( SlicedEllpackSegmentsTest, setSegmentsSizes_EqualSizes )
test_SetSegmentsSizes_EqualSizes< SlicedEllpackSegmentsType >();
}
-TYPED_TEST( SlicedEllpackSegmentsTest, allReduction_MaximumInSegments )
+TYPED_TEST( SlicedEllpackSegmentsTest, reduceAllSegments_MaximumInSegments )
{
using SlicedEllpackSegmentsType = typename TestFixture::SlicedEllpackSegmentsType;
- test_AllReduction_MaximumInSegments< SlicedEllpackSegmentsType >();
+ test_reduceAllSegments_MaximumInSegments< SlicedEllpackSegmentsType >();
}
#endif
--
GitLab