Update Kokkos library to v2.7.00

This commit is contained in:
Stan Moore
2018-05-25 15:00:53 -06:00
parent ce4a446cea
commit 1422b0413b
1248 changed files with 64103 additions and 5133 deletions

View File

@ -312,7 +312,7 @@ struct TestMDRange_2D {
parallel_for( range, functor );
value_type sum = 0.0;
Kokkos::Experimental::Sum< value_type > reducer_scalar( sum );
Kokkos::Sum< value_type > reducer_scalar( sum );
parallel_reduce( range, functor, reducer_scalar );
@ -330,7 +330,7 @@ struct TestMDRange_2D {
value_type sum = 0.0;
Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
sum_view() = sum;
Kokkos::Experimental::Sum< value_type > reducer_view( sum_view );
Kokkos::Sum< value_type > reducer_view( sum_view );
parallel_reduce( range, functor, reducer_view);
sum = sum_view();
@ -852,7 +852,7 @@ struct TestMDRange_3D {
parallel_for( range, functor );
value_type sum = 0.0;
Kokkos::Experimental::Sum< value_type > reducer_scalar( sum );
Kokkos::Sum< value_type > reducer_scalar( sum );
parallel_reduce( range, functor, reducer_scalar );
@ -870,7 +870,7 @@ struct TestMDRange_3D {
value_type sum = 0.0;
Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
sum_view() = sum;
Kokkos::Experimental::Sum< value_type > reducer_view( sum_view );
Kokkos::Sum< value_type > reducer_view( sum_view );
parallel_reduce( range, functor, reducer_view);
sum = sum_view();
@ -1375,7 +1375,7 @@ struct TestMDRange_4D {
parallel_for( range, functor );
value_type sum = 0.0;
Kokkos::Experimental::Sum< value_type > reducer_scalar( sum );
Kokkos::Sum< value_type > reducer_scalar( sum );
parallel_reduce( range, functor, reducer_scalar );
@ -1394,7 +1394,7 @@ struct TestMDRange_4D {
value_type sum = 0.0;
Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
sum_view() = sum;
Kokkos::Experimental::Sum< value_type > reducer_view( sum_view );
Kokkos::Sum< value_type > reducer_view( sum_view );
parallel_reduce( range, functor, reducer_view);
sum = sum_view();
@ -1919,7 +1919,7 @@ struct TestMDRange_5D {
parallel_for( range, functor );
value_type sum = 0.0;
Kokkos::Experimental::Sum< value_type > reducer_scalar( sum );
Kokkos::Sum< value_type > reducer_scalar( sum );
parallel_reduce( range, functor, reducer_scalar );
@ -1938,7 +1938,7 @@ struct TestMDRange_5D {
value_type sum = 0.0;
Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
sum_view() = sum;
Kokkos::Experimental::Sum< value_type > reducer_view( sum_view );
Kokkos::Sum< value_type > reducer_view( sum_view );
parallel_reduce( range, functor, reducer_view);
sum = sum_view();
@ -2394,7 +2394,7 @@ struct TestMDRange_6D {
parallel_for( range, functor );
value_type sum = 0.0;
Kokkos::Experimental::Sum< value_type > reducer_scalar( sum );
Kokkos::Sum< value_type > reducer_scalar( sum );
parallel_reduce( range, functor, reducer_scalar );
@ -2413,7 +2413,7 @@ struct TestMDRange_6D {
value_type sum = 0.0;
Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
sum_view() = sum;
Kokkos::Experimental::Sum< value_type > reducer_view( sum_view );
Kokkos::Sum< value_type > reducer_view( sum_view );
parallel_reduce( range, functor, reducer_view);
sum = sum_view();
@ -3084,35 +3084,4 @@ struct TestMDRange_6D_NegIdx {
} // namespace
TEST_F( TEST_CATEGORY , mdrange_for ) {
TestMDRange_2D< TEST_EXECSPACE >::test_for2( 100, 100 );
TestMDRange_3D< TEST_EXECSPACE >::test_for3( 100, 10, 100 );
TestMDRange_4D< TEST_EXECSPACE >::test_for4( 100, 10, 10, 10 );
TestMDRange_5D< TEST_EXECSPACE >::test_for5( 100, 10, 10, 10, 5 );
TestMDRange_6D< TEST_EXECSPACE >::test_for6( 10, 10, 10, 10, 5, 5 );
}
TEST_F( TEST_CATEGORY , mdrange_reduce ) {
TestMDRange_2D< TEST_EXECSPACE >::test_reduce2( 100, 100 );
TestMDRange_3D< TEST_EXECSPACE >::test_reduce3( 100, 10, 100 );
TestMDRange_4D< TEST_EXECSPACE >::test_reduce4( 100, 10, 10, 10 );
TestMDRange_5D< TEST_EXECSPACE >::test_reduce5( 100, 10, 10, 10, 5 );
TestMDRange_6D< TEST_EXECSPACE >::test_reduce6( 100, 10, 10, 10, 5, 5 );
}
//#ifndef KOKKOS_ENABLE_CUDA
TEST_F( TEST_CATEGORY , mdrange_array_reduce ) {
TestMDRange_ReduceArray_2D< TEST_EXECSPACE >::test_arrayreduce2( 4, 5 );
TestMDRange_ReduceArray_3D< TEST_EXECSPACE >::test_arrayreduce3( 4, 5, 10 );
}
TEST_F( TEST_CATEGORY , mdrange_neg_idx ) {
TestMDRange_2D_NegIdx< TEST_EXECSPACE >::test_2D_negidx( 128, 32 );
TestMDRange_3D_NegIdx< TEST_EXECSPACE >::test_3D_negidx( 128, 32, 8 );
TestMDRange_4D_NegIdx< TEST_EXECSPACE >::test_4D_negidx( 128, 32, 8, 8 );
TestMDRange_5D_NegIdx< TEST_EXECSPACE >::test_5D_negidx( 128, 32, 8, 8, 4 );
TestMDRange_6D_NegIdx< TEST_EXECSPACE >::test_6D_negidx( 128, 32, 8, 8, 4, 2 );
}
//#endif
} // namespace Test