Allowing to build with Kokkos with any backend

ornladios · Jan 29, 2023 · 9648e12 · 9648e12
1 parent d6e03a1
commit 9648e12
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/bindings/CXX11/adios2/cxx11/KokkosView.h b/bindings/CXX11/adios2/cxx11/KokkosView.h
@@ -17,7 +17,7 @@ struct memspace_kokkos_to_adios2<Kokkos::HostSpace>
     static constexpr adios2::MemorySpace value = adios2::MemorySpace::Host;
 };
 
-#if define(KOKKOS_ENABLE_CUDA) || define(ADIOS2_HAVE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA) || defined(ADIOS2_HAVE_CUDA)
 
 template <>
 struct memspace_kokkos_to_adios2<Kokkos::CudaSpace>

diff --git a/source/adios2/core/VariableBase.cpp b/source/adios2/core/VariableBase.cpp
@@ -48,12 +48,12 @@ size_t VariableBase::TotalSize() const noexcept
 
 MemorySpace VariableBase::GetMemorySpace(const void *ptr)
 {
+#ifdef ADIOS2_HAVE_GPU_SUPPORT
     if (m_MemSpace != MemorySpace::Detect)
     {
         return m_MemSpace;
     }
 
-#ifdef ADIOS2_HAVE_GPU_SUPPORT
     if (helper::IsGPUbuffer(ptr))
     {
         return MemorySpace::GPU;

diff --git a/source/adios2/helper/adiosKokkos.cpp b/source/adios2/helper/adiosKokkos.cpp
@@ -81,12 +81,14 @@ void MemcpyBufferToGPU(char *GPUbuffer, const char *src, size_t byteCount)
 
 bool IsGPUbuffer(const void *ptr)
 {
+#ifdef KOKKOS_ENABLE_CUDA
     cudaPointerAttributes attr;
     cudaPointerGetAttributes(&attr, ptr);
     if (attr.type == cudaMemoryTypeDevice)
     {
         return true;
     }
+#endif
     return false;
 }
 

diff --git a/source/adios2/helper/adiosKokkos.h b/source/adios2/helper/adiosKokkos.h
@@ -6,6 +6,8 @@
 #ifndef ADIOS2_HELPER_ADIOSKOKKOS_H_
 #define ADIOS2_HELPER_ADIOSKOKKOS_H_
 
+#include <cstddef>
+
 namespace adios2
 {
 namespace helper