Merge pull request #44 from E3SM-Project/develop

Develop

Author: ambrad

cedr/cedr_caas.hpp

@@ -18,8 +18,8 @@ class CAAS : public CDR {
   typedef typename cedr::impl::DeviceType<ExeSpace>::type Device;
   typedef CAAS<ExeSpace> Me;
   typedef std::shared_ptr<Me> Ptr;
-  typedef Kokkos::View<Real*, Kokkos::LayoutLeft, Device> RealList;
-  typedef Kokkos::View<Int*, Kokkos::LayoutLeft, Device> IntList;
+  typedef Kokkos::View<Real*, Kokkos::LayoutRight, Device> RealList;
+  typedef Kokkos::View<Int*, Kokkos::LayoutRight, Device> IntList;
 
 public:
 

cedr/cedr_kokkos.hpp

@@ -74,7 +74,7 @@ struct DeviceType {
                          typename ExeSpace::memory_space> type;
 };
 
-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA
 typedef Kokkos::Device<Kokkos::CudaSpace::execution_space,
                        Kokkos::CudaSpace::memory_space> DefaultDeviceType;
 

siqk/siqk_defs.hpp

@@ -21,12 +21,6 @@
 // Always want this for GPU.
 #define SIQK_NONRECURSIVE
 
-#ifdef KOKKOS_HAVE_CUDA
-# define KOKKOS_CONSTANT __constant__ __device__
-#else
-# define KOKKOS_CONSTANT
-#endif
-
 namespace siqk {
 namespace ko = Kokkos;
 #define pr(m) do {                              \
@@ -109,7 +103,7 @@ KOKKOS_INLINE_FUNCTION static void message (const char* const msg)
 typedef int Int;
 typedef double Real;
 
-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA
 typedef ko::LayoutLeft Layout;
 #else
 typedef ko::LayoutRight Layout;
@@ -144,7 +138,7 @@ template <typename VT> struct InExeSpace<VT, ko::HostSpace> {
   typedef typename VT::HostMirror type;
 };
 
-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA
 // A 1D slice of an array.
 template <typename VT> KOKKOS_FORCEINLINE_FUNCTION
 ko::View<typename VT::value_type*, ko::LayoutStride, typename VT::device_type,