Updating Kokkos lib

2017-01-09 10:39:46 -07:00
parent 51fa33a407
commit a9f0b7d523
359 changed files with 20077 additions and 27456 deletions
--- a/lib/kokkos/core/unit_test/TestCompilerMacros.hpp
+++ b/lib/kokkos/core/unit_test/TestCompilerMacros.hpp
@ -70,8 +70,10 @@ struct AddFunctor {
 #ifdef KOKKOS_HAVE_PRAGMA_LOOPCOUNT
    #pragma loop count(128)
 #endif
+#ifndef KOKKOS_HAVE_DEBUG
 #ifdef KOKKOS_HAVE_PRAGMA_SIMD
    #pragma simd
+#endif
 #endif
    for(int j=0;j<length;j++)
      a(i,j) += b(i,j);