diff --git a/src/TNL/Algorithms/Segments/BiEllpack.h b/src/TNL/Algorithms/Segments/BiEllpack.h index b580206bc61980f07ee53b73c9f9f4fc8347c554..347bfe6286ded5e88a9d1e42443c2ea77a452ec0 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 5bb5a38bb8e0b88d513f675e088b3cf4e86d46c1..6dfaa0ab13ec284a511bd1ceea3bbbe230bd2f96 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 5a7d25310f357b7540ac19bcf1fd69371e5a86ae..344f96c00bbe12e8326180a8a30b92519f14a76f 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 88347e834ae5d344382ff1a888412900c251fa8f..29d554e0aee65062ae5f52785da04fa245e46536 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 a06c287f1603d9a12a9f40ed7c28670fb6e17e09..aee35bbded6f1d966ebbec910401f19b23d4eaa0 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 8560accfeb18126704ccdd2a96882bad92d05eb3..f0e1d788116c62e694702eaae168d12cff98832d 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 53b441c7788d2976bbef67a9b79ac58bbae0ac08..6b47a4a3a5bfcfa6a6083b63eb4d6130e5e37d10 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 ad1d9565304264434c491a50976ee526d4a4f081..e6cbcfff44c21a0d264f88a449885e5b45e21498 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 c24b0843c6eec505f7999f7a4a75fc412afcc162..52ab9cd212fc67abed78df39bce5e60b10601fab 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 04343ce5d033cd1894e20b7bc6f5044411757df1..3031c7baab6dabfe7986bc06dc238b6668733fa4 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 134433b04bfc888ae6c4d1801d78e8b37ea779a7..77352f081525f34df33d411ff794031d912bb5e9 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 453ac9cdc3f3cfd75a01e7dfd27947af2d9aac12..92bc43b775e62f29feffc16aa1c9a3d5c66de0ad 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 6a1c2b150380ff0fcbfb02a37228b8d59bbc7af4..368d435eb0b8322312a5e45e241422349bea12c2 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 52ca1ef33422dad8aad1ac18de3bb90cc443ac70..0355ee62b0639aedd3dd8886df0e8aa24871f497 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 e321730607e36dfa9b5e86f48cee6977ac8338e1..37e6290dbc344be8fafb6527c5d4e569a1b85ca0 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 675468ea07409b5945421affda33a7c3d3c9ce85..b399151855735575aef7a19584ea9d0da49ab42e 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 4807c8670412596df8fc0cde954d874f1a120b72..edb35fac3b660f0ffd828f49033b82a5bfa14241 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 4aa2383e9ed3a2a582a870299221f6c27a49d9bf..8f90b3aa5a2f3d16fd53c6d527548f5ddadf0f31 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 dccb55faea659dab5f269eb604b3fa15fac4d48a..5b052848c4c4e8a9ba4c2905ed0e3baa5df447c7 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 8282ea46cb07281e3e83737de46f034ca41eaf28..13ef6b038864560ac89a06d8b8779ce110535304 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 5b17e53732d7b228ac0c93463bb9cbc3fbf72da6..b6ce3b6e45428aa6a5ddb15311536ca4810097e7 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 7073bdb8ab4dc2aa5aefa6013b6867d5e2a6746b..5b92a02c8e1e31f26c427c3c9755d8451440c541 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 74219f7db8c27bc768006cb569b1edaa3df5556d..b1b58771229c8ce567da07343ffbc4a724836c6b 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 262ddce6d77246803ea5e3ef826f4c72b8444c7c..af9816ee486068e79cdb72ff961951968d14436c 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 42a9e76525ca44dc6c7bebb1731a5b5c1d5eab6b..2cd9fcd1cbe8f557fca30c781bd87dfed5329631 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