From 1765a6b2a5b7c743f8ba5443ea316a208adaac95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz> Date: Tue, 3 Sep 2019 13:15:04 +0200 Subject: [PATCH] Cleaned up examples in reduction tutorials --- .../Tutorials/ReductionAndScan/ExclusiveScanExample.cpp | 4 ---- .../Tutorials/ReductionAndScan/MapReduceExample-1.cpp | 2 -- Documentation/Tutorials/ReductionAndScan/ScanExample.cpp | 4 ---- .../Tutorials/ReductionAndScan/SegmentedScanExample.cpp | 4 ---- .../Tutorials/ReductionAndScan/SequentialSumWithLambdas.cpp | 4 ++-- Documentation/Tutorials/ReductionAndScan/SumExample.cpp | 3 --- 6 files changed, 2 insertions(+), 19 deletions(-) diff --git a/Documentation/Tutorials/ReductionAndScan/ExclusiveScanExample.cpp b/Documentation/Tutorials/ReductionAndScan/ExclusiveScanExample.cpp index 0277ad9a43..9ccb5baa86 100644 --- a/Documentation/Tutorials/ReductionAndScan/ExclusiveScanExample.cpp +++ b/Documentation/Tutorials/ReductionAndScan/ExclusiveScanExample.cpp @@ -1,10 +1,6 @@ #include <iostream> #include <cstdlib> #include <TNL/Containers/Vector.h> -#include <TNL/Containers/Array.h> -#include <TNL/Containers/Algorithms/Reduction.h> - -#include <TNL/Containers/StaticVector.h> using namespace TNL; using namespace TNL::Containers; diff --git a/Documentation/Tutorials/ReductionAndScan/MapReduceExample-1.cpp b/Documentation/Tutorials/ReductionAndScan/MapReduceExample-1.cpp index 419607f056..8d21107fdc 100644 --- a/Documentation/Tutorials/ReductionAndScan/MapReduceExample-1.cpp +++ b/Documentation/Tutorials/ReductionAndScan/MapReduceExample-1.cpp @@ -2,7 +2,6 @@ #include <cstdlib> #include <TNL/Containers/Vector.h> #include <TNL/Containers/Algorithms/Reduction.h> -#include <TNL/Timer.h> using namespace TNL; using namespace TNL::Containers; @@ -20,7 +19,6 @@ double mapReduce( Vector< double, Device >& u ) int main( int argc, char* argv[] ) { - Timer timer; Vector< double, Devices::Host > host_u( 10 ); host_u.evaluate( [] __cuda_callable__ ( int i ) { return sin( ( double ) i ); } ); double result = mapReduce( host_u ); diff --git a/Documentation/Tutorials/ReductionAndScan/ScanExample.cpp b/Documentation/Tutorials/ReductionAndScan/ScanExample.cpp index 4f7c990e7e..38f44ccdda 100644 --- a/Documentation/Tutorials/ReductionAndScan/ScanExample.cpp +++ b/Documentation/Tutorials/ReductionAndScan/ScanExample.cpp @@ -1,10 +1,6 @@ #include <iostream> #include <cstdlib> #include <TNL/Containers/Vector.h> -#include <TNL/Containers/Array.h> -#include <TNL/Containers/Algorithms/Reduction.h> - -#include <TNL/Containers/StaticVector.h> using namespace TNL; using namespace TNL::Containers; diff --git a/Documentation/Tutorials/ReductionAndScan/SegmentedScanExample.cpp b/Documentation/Tutorials/ReductionAndScan/SegmentedScanExample.cpp index 607757e89a..b3f6776390 100644 --- a/Documentation/Tutorials/ReductionAndScan/SegmentedScanExample.cpp +++ b/Documentation/Tutorials/ReductionAndScan/SegmentedScanExample.cpp @@ -1,10 +1,6 @@ #include <iostream> #include <cstdlib> #include <TNL/Containers/Vector.h> -#include <TNL/Containers/Array.h> -#include <TNL/Containers/Algorithms/Reduction.h> - -#include <TNL/Containers/StaticVector.h> using namespace TNL; using namespace TNL::Containers; diff --git a/Documentation/Tutorials/ReductionAndScan/SequentialSumWithLambdas.cpp b/Documentation/Tutorials/ReductionAndScan/SequentialSumWithLambdas.cpp index 7990faee58..0932b8b181 100644 --- a/Documentation/Tutorials/ReductionAndScan/SequentialSumWithLambdas.cpp +++ b/Documentation/Tutorials/ReductionAndScan/SequentialSumWithLambdas.cpp @@ -1,11 +1,11 @@ double sequentialSum( const double* a, const int size ) { auto fetch = [=] (int i)->double { return a[ i ]; }; - auto reduce = [] (double& x, const double& y) { x += y; }; + auto reduce = [] (double& x, const double& y) { return x + y; }; double sum( 0.0 ); for( int i = 0; i < size; i++ ) - reduce( sum, fetch( i ) ); + sum = reduce( sum, fetch( i ) ); return sum; } diff --git a/Documentation/Tutorials/ReductionAndScan/SumExample.cpp b/Documentation/Tutorials/ReductionAndScan/SumExample.cpp index 092fc4a94f..3be04bd924 100644 --- a/Documentation/Tutorials/ReductionAndScan/SumExample.cpp +++ b/Documentation/Tutorials/ReductionAndScan/SumExample.cpp @@ -1,11 +1,8 @@ #include <iostream> #include <cstdlib> #include <TNL/Containers/Vector.h> -#include <TNL/Containers/Array.h> #include <TNL/Containers/Algorithms/Reduction.h> -#include <TNL/Containers/StaticVector.h> - using namespace TNL; using namespace TNL::Containers; using namespace TNL::Containers::Algorithms; -- GitLab