From 92d07ceba48a0880df1cad7b88b8f23d88f68441 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Wed, 24 Jul 2024 08:28:17 -0400
Subject: [PATCH] Backport of commit 8bba2d12ec12dbb065a3db9a029088b10e033c65 :
 Fix bug in GPU/CPU overlap

---
 src/KOKKOS/atom_vec_kokkos.h | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/KOKKOS/atom_vec_kokkos.h b/src/KOKKOS/atom_vec_kokkos.h
index 9d267176f1..ff8985096e 100644
--- a/src/KOKKOS/atom_vec_kokkos.h
+++ b/src/KOKKOS/atom_vec_kokkos.h
@@ -142,28 +142,6 @@ class AtomVecKokkos : virtual public AtomVec {
  public:
 
   #ifdef LMP_KOKKOS_GPU
-  template<class ViewType>
-  Kokkos::View<typename ViewType::data_type,
-               typename ViewType::array_layout,
-               LMPPinnedHostType,
-               Kokkos::MemoryTraits<Kokkos::Unmanaged> >
-  create_async_copy(const ViewType& src) {
-    typedef Kokkos::View<typename ViewType::data_type,
-                 typename ViewType::array_layout,
-                 typename std::conditional<
-                   std::is_same<typename ViewType::execution_space,LMPDeviceType>::value,
-                   LMPPinnedHostType,typename ViewType::memory_space>::type,
-                 Kokkos::MemoryTraits<Kokkos::Unmanaged> > mirror_type;
-    if (buffer_size == 0) {
-       buffer = Kokkos::kokkos_malloc<LMPPinnedHostType>(src.span());
-       buffer_size = src.span();
-    } else if (buffer_size < src.span()) {
-       buffer = Kokkos::kokkos_realloc<LMPPinnedHostType>(buffer,src.span());
-       buffer_size = src.span();
-    }
-    return mirror_type(buffer, src.d_view.layout());
-  }
-
   template<class ViewType>
   void perform_async_copy(ViewType& src, unsigned int space) {
     typedef Kokkos::View<typename ViewType::data_type,
@@ -173,11 +151,11 @@ class AtomVecKokkos : virtual public AtomVec {
                    LMPPinnedHostType,typename ViewType::memory_space>::type,
                  Kokkos::MemoryTraits<Kokkos::Unmanaged> > mirror_type;
     if (buffer_size == 0) {
-       buffer = Kokkos::kokkos_malloc<LMPPinnedHostType>(src.span()*sizeof(typename ViewType::value_type));
-       buffer_size = src.span();
-    } else if (buffer_size < src.span()) {
-       buffer = Kokkos::kokkos_realloc<LMPPinnedHostType>(buffer,src.span()*sizeof(typename ViewType::value_type));
-       buffer_size = src.span();
+      buffer_size = src.span() * sizeof(typename ViewType::value_type);
+      buffer = Kokkos::kokkos_malloc<LMPPinnedHostType>(buffer_size);
+    } else if (buffer_size < (src.span() * sizeof(typename ViewType::value_type))) {
+       buffer_size = src.span() * sizeof(typename ViewType::value_type);
+       buffer = Kokkos::kokkos_realloc<LMPPinnedHostType>(buffer, buffer_size);
     }
     mirror_type tmp_view((typename ViewType::value_type*)buffer, src.d_view.layout());