ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating Kokkos lib

Browse Source
This commit is contained in:
Stan Moore
2017-02-13 10:50:34 -07:00
parent cb982f2f28
commit 383da816c2
180 changed files with 3657 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/kokkos/algorithms/src/Kokkos_Random.hpp
View File

@ -1014,7 +1014,7 @@ namespace Kokkos {
}
};
#if defined(KOKKOS_HAVE_CUDA) && defined(__CUDACC__)
#if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__)
template<>
class Random_XorShift1024<Kokkos::Cuda> {

4
lib/kokkos/algorithms/unit_tests/TestCuda.cpp
View File

@ -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 */

2
lib/kokkos/algorithms/unit_tests/TestOpenMP.cpp
View File

@ -52,7 +52,7 @@
namespace Test {
#ifdef KOKKOS_HAVE_OPENMP
#ifdef KOKKOS_ENABLE_OPENMP
class openmp : public ::testing::Test {
protected:
static void SetUpTestCase()

4
lib/kokkos/algorithms/unit_tests/TestSerial.cpp
View File

@ -55,7 +55,7 @@
namespace Test {
#ifdef KOKKOS_HAVE_SERIAL
#ifdef KOKKOS_ENABLE_SERIAL
class serial : public ::testing::Test {
protected:
static void SetUpTestCase()
@ -93,7 +93,7 @@ SERIAL_SORT_UNSIGNED(171)
#undef SERIAL_RANDOM_XORSHIFT1024
#undef SERIAL_SORT_UNSIGNED
#endif // KOKKOS_HAVE_SERIAL
#endif // KOKKOS_ENABLE_SERIAL
} // namespace Test

2
lib/kokkos/algorithms/unit_tests/TestThreads.cpp
View File

@ -55,7 +55,7 @@
namespace Test {
#ifdef KOKKOS_HAVE_PTHREAD
#ifdef KOKKOS_ENABLE_PTHREAD
class threads : public ::testing::Test {
protected:
static void SetUpTestCase()