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/algorithms/unit_tests/TestCuda.cpp
+++ b/lib/kokkos/algorithms/unit_tests/TestCuda.cpp
@ -49,7 +49,7 @@

 #include <Kokkos_Core.hpp>

-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA

 #include <TestRandom.hpp>
 #include <TestSort.hpp>
@ -106,5 +106,5 @@ CUDA_SORT_UNSIGNED(171)
 #undef CUDA_SORT_UNSIGNED
 }

-#endif  /* #ifdef KOKKOS_HAVE_CUDA */
+#endif  /* #ifdef KOKKOS_ENABLE_CUDA */