Updating Kokkos lib to 2.03.00
This commit is contained in:
@ -1,13 +1,13 @@
|
||||
/*
|
||||
//@HEADER
|
||||
// ************************************************************************
|
||||
//
|
||||
//
|
||||
// Kokkos v. 2.0
|
||||
// Copyright (2014) Sandia Corporation
|
||||
//
|
||||
//
|
||||
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
|
||||
// the U.S. Government retains certain rights in this software.
|
||||
//
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
@ -36,10 +36,11 @@
|
||||
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
//
|
||||
// Questions? Contact H. Carter Edwards (hcedwar@sandia.gov)
|
||||
//
|
||||
//
|
||||
// ************************************************************************
|
||||
//@HEADER
|
||||
*/
|
||||
|
||||
#include <Kokkos_Core.hpp>
|
||||
|
||||
#ifndef TESTCXX11DEDUCTION_HPP
|
||||
@ -52,43 +53,40 @@ struct TestReductionDeductionTagB {};
|
||||
|
||||
template < class ExecSpace >
|
||||
struct TestReductionDeductionFunctor {
|
||||
|
||||
// KOKKOS_INLINE_FUNCTION
|
||||
// void operator()( long i , long & value ) const
|
||||
// { value += i + 1 ; }
|
||||
// void operator()( long i, long & value ) const
|
||||
// { value += i + 1; }
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator()( TestReductionDeductionTagA , long i , long & value ) const
|
||||
void operator()( TestReductionDeductionTagA, long i, long & value ) const
|
||||
{ value += ( 2 * i + 1 ) + ( 2 * i + 2 ); }
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator()( const TestReductionDeductionTagB & , const long i , long & value ) const
|
||||
{ value += ( 3 * i + 1 ) + ( 3 * i + 2 ) + ( 3 * i + 3 ) ; }
|
||||
|
||||
void operator()( const TestReductionDeductionTagB &, const long i, long & value ) const
|
||||
{ value += ( 3 * i + 1 ) + ( 3 * i + 2 ) + ( 3 * i + 3 ); }
|
||||
};
|
||||
|
||||
template< class ExecSpace >
|
||||
void test_reduction_deduction()
|
||||
{
|
||||
typedef TestReductionDeductionFunctor< ExecSpace > Functor ;
|
||||
typedef TestReductionDeductionFunctor< ExecSpace > Functor;
|
||||
|
||||
const long N = 50 ;
|
||||
// const long answer = N % 2 ? ( N * ((N+1)/2 )) : ( (N/2) * (N+1) );
|
||||
const long answerA = N % 2 ? ( (2*N) * (((2*N)+1)/2 )) : ( ((2*N)/2) * ((2*N)+1) );
|
||||
const long answerB = N % 2 ? ( (3*N) * (((3*N)+1)/2 )) : ( ((3*N)/2) * ((3*N)+1) );
|
||||
long result = 0 ;
|
||||
const long N = 50;
|
||||
// const long answer = N % 2 ? ( N * ( ( N + 1 ) / 2 ) ) : ( ( N / 2 ) * ( N + 1 ) );
|
||||
const long answerA = N % 2 ? ( ( 2 * N ) * ( ( ( 2 * N ) + 1 ) / 2 ) ) : ( ( ( 2 * N ) / 2 ) * ( ( 2 * N ) + 1 ) );
|
||||
const long answerB = N % 2 ? ( ( 3 * N ) * ( ( ( 3 * N ) + 1 ) / 2 ) ) : ( ( ( 3 * N ) / 2 ) * ( ( 3 * N ) + 1 ) );
|
||||
long result = 0;
|
||||
|
||||
// Kokkos::parallel_reduce( Kokkos::RangePolicy<ExecSpace>(0,N) , Functor() , result );
|
||||
// ASSERT_EQ( answer , result );
|
||||
|
||||
Kokkos::parallel_reduce( Kokkos::RangePolicy<ExecSpace,TestReductionDeductionTagA>(0,N) , Functor() , result );
|
||||
ASSERT_EQ( answerA , result );
|
||||
|
||||
Kokkos::parallel_reduce( Kokkos::RangePolicy<ExecSpace,TestReductionDeductionTagB>(0,N) , Functor() , result );
|
||||
ASSERT_EQ( answerB , result );
|
||||
// Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), Functor(), result );
|
||||
// ASSERT_EQ( answer, result );
|
||||
|
||||
Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, TestReductionDeductionTagA >( 0, N ), Functor(), result );
|
||||
ASSERT_EQ( answerA, result );
|
||||
|
||||
Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, TestReductionDeductionTagB >( 0, N ), Functor(), result );
|
||||
ASSERT_EQ( answerB, result );
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace TestCXX11
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user