Updating Kokkos lib to 2.03.00
This commit is contained in:
@ -47,152 +47,162 @@
|
||||
|
||||
namespace {
|
||||
|
||||
template<class Scalar, class ExecutionSpace>
|
||||
template< class Scalar, class ExecutionSpace >
|
||||
struct SumPlain {
|
||||
typedef ExecutionSpace execution_space;
|
||||
typedef typename Kokkos::View<Scalar*,execution_space> type;
|
||||
typedef typename Kokkos::View< Scalar*, execution_space > type;
|
||||
|
||||
type view;
|
||||
SumPlain(type view_):view(view_) {}
|
||||
|
||||
SumPlain( type view_ ) : view( view_ ) {}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator() (int i, Scalar& val) {
|
||||
void operator() ( int i, Scalar & val ) {
|
||||
val += Scalar();
|
||||
}
|
||||
};
|
||||
|
||||
template<class Scalar, class ExecutionSpace>
|
||||
template< class Scalar, class ExecutionSpace >
|
||||
struct SumInitJoinFinalValueType {
|
||||
typedef ExecutionSpace execution_space;
|
||||
typedef typename Kokkos::View<Scalar*,execution_space> type;
|
||||
type view;
|
||||
typedef typename Kokkos::View< Scalar*, execution_space > type;
|
||||
typedef Scalar value_type;
|
||||
SumInitJoinFinalValueType(type view_):view(view_) {}
|
||||
|
||||
type view;
|
||||
|
||||
SumInitJoinFinalValueType( type view_ ) : view( view_ ) {}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void init(value_type& val) const {
|
||||
void init( value_type & val ) const {
|
||||
val = value_type();
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void join(volatile value_type& val, volatile value_type& src) const {
|
||||
void join( volatile value_type & val, volatile value_type & src ) const {
|
||||
val += src;
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator() (int i, value_type& val) const {
|
||||
void operator()( int i, value_type & val ) const {
|
||||
val += value_type();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
template<class Scalar, class ExecutionSpace>
|
||||
template< class Scalar, class ExecutionSpace >
|
||||
struct SumInitJoinFinalValueType2 {
|
||||
typedef ExecutionSpace execution_space;
|
||||
typedef typename Kokkos::View<Scalar*,execution_space> type;
|
||||
type view;
|
||||
typedef typename Kokkos::View< Scalar*, execution_space > type;
|
||||
typedef Scalar value_type;
|
||||
SumInitJoinFinalValueType2(type view_):view(view_) {}
|
||||
|
||||
type view;
|
||||
|
||||
SumInitJoinFinalValueType2( type view_ ) : view( view_ ) {}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void init(volatile value_type& val) const {
|
||||
void init( volatile value_type & val ) const {
|
||||
val = value_type();
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void join(volatile value_type& val, const volatile value_type& src) const {
|
||||
void join( volatile value_type & val, const volatile value_type & src ) const {
|
||||
val += src;
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator() (int i, value_type& val) const {
|
||||
void operator()( int i, value_type & val ) const {
|
||||
val += value_type();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
template<class Scalar, class ExecutionSpace>
|
||||
template< class Scalar, class ExecutionSpace >
|
||||
struct SumInitJoinFinalValueTypeArray {
|
||||
typedef ExecutionSpace execution_space;
|
||||
typedef typename Kokkos::View<Scalar*,execution_space> type;
|
||||
type view;
|
||||
typedef typename Kokkos::View< Scalar*, execution_space > type;
|
||||
typedef Scalar value_type[];
|
||||
|
||||
type view;
|
||||
int n;
|
||||
SumInitJoinFinalValueTypeArray(type view_, int n_):view(view_),n(n_) {}
|
||||
|
||||
SumInitJoinFinalValueTypeArray( type view_, int n_ ) : view( view_ ), n( n_ ) {}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void init(value_type val) const {
|
||||
for(int k=0;k<n;k++)
|
||||
void init( value_type val ) const {
|
||||
for ( int k = 0; k < n; k++ ) {
|
||||
val[k] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void join(volatile value_type val, const volatile value_type src) const {
|
||||
for(int k=0;k<n;k++)
|
||||
void join( volatile value_type val, const volatile value_type src ) const {
|
||||
for ( int k = 0; k < n; k++ ) {
|
||||
val[k] += src[k];
|
||||
}
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator() (int i, value_type val) const {
|
||||
for(int k=0;k<n;k++)
|
||||
val[k] += k*i;
|
||||
void operator()( int i, value_type val ) const {
|
||||
for ( int k = 0; k < n; k++ ) {
|
||||
val[k] += k * i;
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
template<class Scalar, class ExecutionSpace>
|
||||
template< class Scalar, class ExecutionSpace >
|
||||
struct SumWrongInitJoinFinalValueType {
|
||||
typedef ExecutionSpace execution_space;
|
||||
typedef typename Kokkos::View<Scalar*,execution_space> type;
|
||||
type view;
|
||||
typedef typename Kokkos::View< Scalar*, execution_space > type;
|
||||
typedef Scalar value_type;
|
||||
SumWrongInitJoinFinalValueType(type view_):view(view_) {}
|
||||
|
||||
type view;
|
||||
|
||||
SumWrongInitJoinFinalValueType( type view_ ) : view( view_ ) {}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void init(double& val) const {
|
||||
void init( double & val ) const {
|
||||
val = double();
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void join(volatile value_type& val, const value_type& src) const {
|
||||
void join( volatile value_type & val, const value_type & src ) const {
|
||||
val += src;
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator() (int i, value_type& val) const {
|
||||
void operator()( int i, value_type & val ) const {
|
||||
val += value_type();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
template<class Scalar, class ExecutionSpace>
|
||||
template< class Scalar, class ExecutionSpace >
|
||||
void TestTemplateMetaFunctions() {
|
||||
typedef typename Kokkos::View<Scalar*,ExecutionSpace> type;
|
||||
type a("A",100);
|
||||
typedef typename Kokkos::View< Scalar*, ExecutionSpace > type;
|
||||
type a( "A", 100 );
|
||||
/*
|
||||
int sum_plain_has_init_arg = Kokkos::Impl::FunctorHasInit<SumPlain<Scalar,ExecutionSpace>, Scalar& >::value;
|
||||
ASSERT_EQ(sum_plain_has_init_arg,0);
|
||||
int sum_initjoinfinalvaluetype_has_init_arg = Kokkos::Impl::FunctorHasInit<SumInitJoinFinalValueType<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ(sum_initjoinfinalvaluetype_has_init_arg,1);
|
||||
int sum_initjoinfinalvaluetype_has_init_arg2 = Kokkos::Impl::FunctorHasInit<SumInitJoinFinalValueType2<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ(sum_initjoinfinalvaluetype_has_init_arg2,1);
|
||||
int sum_wronginitjoinfinalvaluetype_has_init_arg = Kokkos::Impl::FunctorHasInit<SumWrongInitJoinFinalValueType<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ(sum_wronginitjoinfinalvaluetype_has_init_arg,0);
|
||||
int sum_plain_has_init_arg = Kokkos::Impl::FunctorHasInit< SumPlain<Scalar, ExecutionSpace>, Scalar & >::value;
|
||||
ASSERT_EQ( sum_plain_has_init_arg, 0 );
|
||||
int sum_initjoinfinalvaluetype_has_init_arg = Kokkos::Impl::FunctorHasInit< SumInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ( sum_initjoinfinalvaluetype_has_init_arg, 1 );
|
||||
int sum_initjoinfinalvaluetype_has_init_arg2 = Kokkos::Impl::FunctorHasInit< SumInitJoinFinalValueType2<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ( sum_initjoinfinalvaluetype_has_init_arg2, 1 );
|
||||
int sum_wronginitjoinfinalvaluetype_has_init_arg = Kokkos::Impl::FunctorHasInit< SumWrongInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ( sum_wronginitjoinfinalvaluetype_has_init_arg, 0 );
|
||||
|
||||
//int sum_initjoinfinalvaluetypearray_has_init_arg = Kokkos::Impl::FunctorHasInit<SumInitJoinFinalValueTypeArray<Scalar,ExecutionSpace>, Scalar[] >::value;
|
||||
//ASSERT_EQ(sum_initjoinfinalvaluetypearray_has_init_arg,1);
|
||||
//int sum_initjoinfinalvaluetypearray_has_init_arg = Kokkos::Impl::FunctorHasInit< SumInitJoinFinalValueTypeArray<Scalar, ExecutionSpace>, Scalar[] >::value;
|
||||
//ASSERT_EQ( sum_initjoinfinalvaluetypearray_has_init_arg, 1 );
|
||||
|
||||
//printf("Values Init: %i %i %i\n",sum_plain_has_init_arg,sum_initjoinfinalvaluetype_has_init_arg,sum_wronginitjoinfinalvaluetype_has_init_arg);
|
||||
//printf( "Values Init: %i %i %i\n", sum_plain_has_init_arg, sum_initjoinfinalvaluetype_has_init_arg, sum_wronginitjoinfinalvaluetype_has_init_arg );
|
||||
|
||||
int sum_plain_has_join_arg = Kokkos::Impl::FunctorHasJoin<SumPlain<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ(sum_plain_has_join_arg,0);
|
||||
int sum_initjoinfinalvaluetype_has_join_arg = Kokkos::Impl::FunctorHasJoin<SumInitJoinFinalValueType<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ(sum_initjoinfinalvaluetype_has_join_arg,1);
|
||||
int sum_initjoinfinalvaluetype_has_join_arg2 = Kokkos::Impl::FunctorHasJoin<SumInitJoinFinalValueType2<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ(sum_initjoinfinalvaluetype_has_join_arg2,1);
|
||||
int sum_wronginitjoinfinalvaluetype_has_join_arg = Kokkos::Impl::FunctorHasJoin<SumWrongInitJoinFinalValueType<Scalar,ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ(sum_wronginitjoinfinalvaluetype_has_join_arg,0);
|
||||
int sum_plain_has_join_arg = Kokkos::Impl::FunctorHasJoin< SumPlain<Scalar, ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ( sum_plain_has_join_arg, 0 );
|
||||
int sum_initjoinfinalvaluetype_has_join_arg = Kokkos::Impl::FunctorHasJoin< SumInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ( sum_initjoinfinalvaluetype_has_join_arg, 1 );
|
||||
int sum_initjoinfinalvaluetype_has_join_arg2 = Kokkos::Impl::FunctorHasJoin< SumInitJoinFinalValueType2<Scalar, ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ( sum_initjoinfinalvaluetype_has_join_arg2, 1 );
|
||||
int sum_wronginitjoinfinalvaluetype_has_join_arg = Kokkos::Impl::FunctorHasJoin< SumWrongInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
|
||||
ASSERT_EQ( sum_wronginitjoinfinalvaluetype_has_join_arg, 0 );
|
||||
|
||||
//printf( "Values Join: %i %i %i\n", sum_plain_has_join_arg, sum_initjoinfinalvaluetype_has_join_arg, sum_wronginitjoinfinalvaluetype_has_join_arg );
|
||||
*/
|
||||
//printf("Values Join: %i %i %i\n",sum_plain_has_join_arg,sum_initjoinfinalvaluetype_has_join_arg,sum_wronginitjoinfinalvaluetype_has_join_arg);
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace
|
||||
|
||||
Reference in New Issue
Block a user