Kokkos lib update

2016-09-08 13:56:18 -06:00
parent 0252347d43
commit 236ebf7fab
212 changed files with 18902 additions and 13466 deletions
--- a/lib/kokkos/example/multi_fem/SparseLinearSystem.hpp
+++ b/lib/kokkos/example/multi_fem/SparseLinearSystem.hpp
@ -243,7 +243,7 @@ void cgsolve(
  normr     = sqrt( old_rdot );
  iteration = 0 ;

-  Kokkos::Impl::Timer wall_clock ;
+  Kokkos::Timer wall_clock ;

  while ( tolerance < normr && iteration < maximum_iteration ) {