Updating Kokkos lib

2017-02-13 10:50:34 -07:00
parent cb982f2f28
commit 383da816c2
180 changed files with 3657 additions and 1100 deletions
--- a/lib/kokkos/core/perf_test/PerfTestCuda.cpp
+++ b/lib/kokkos/core/perf_test/PerfTestCuda.cpp
@ -48,7 +48,7 @@

 #include <Kokkos_Core.hpp>

-#if defined( KOKKOS_HAVE_CUDA )
+#if defined( KOKKOS_ENABLE_CUDA )

 #include <impl/Kokkos_Timer.hpp>

@ -185,5 +185,5 @@ TEST_F( cuda, texture_double )

 } // namespace Test

-#endif /* #if defined( KOKKOS_HAVE_CUDA ) */
+#endif /* #if defined( KOKKOS_ENABLE_CUDA ) */