Fix a few issues on GPU

LLNL · Feb 18, 2021 · 9bf0bcc · 9bf0bcc
1 parent 3fb9870
commit 9bf0bcc
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 12 deletions.
diff --git a/src/pb/FDkernels.cc b/src/pb/FDkernels.cc
@@ -544,9 +544,24 @@ template void FDkernelDel2_8th<float>(const Grid& grid, float* v, float* b,
     const size_t nfunc, MemorySpace::Host);
 
 #ifdef HAVE_MAGMA
+template void FDkernelDel2_2nd<double>(const Grid& grid, double* v, double* b,
+    const size_t nfunc, MemorySpace::Device);
+template void FDkernelDel2_2nd<float>(const Grid& grid, float* v, float* b,
+    const size_t nfunc, MemorySpace::Device);
+
 template void FDkernelDel2_4th<double>(const Grid& grid, double* v, double* b,
     const size_t nfunc, MemorySpace::Device);
 template void FDkernelDel2_4th<float>(const Grid& grid, float* v, float* b,
     const size_t nfunc, MemorySpace::Device);
+
+template void FDkernelDel2_6th<double>(const Grid& grid, double* v, double* b,
+    const size_t nfunc, MemorySpace::Device);
+template void FDkernelDel2_6th<float>(const Grid& grid, float* v, float* b,
+    const size_t nfunc, MemorySpace::Device);
+
+template void FDkernelDel2_8th<double>(const Grid& grid, double* v, double* b,
+    const size_t nfunc, MemorySpace::Device);
+template void FDkernelDel2_8th<float>(const Grid& grid, float* v, float* b,
+    const size_t nfunc, MemorySpace::Device);
 #endif
 } // namespace pb
diff --git a/src/pb/FDkernels.h b/src/pb/FDkernels.h
@@ -19,23 +19,50 @@ template <typename ScalarType>
 void FDkernelDel2_4th(const Grid& grid, ScalarType* v, ScalarType* b,
     const size_t nfunc, MemorySpace::Host);
 
+template <typename ScalarType>
+void FDkernelDel2_4th_Mehr(const Grid& grid, ScalarType* v, ScalarType* b,
+    const size_t nfunc, MemorySpace::Host);
+
+template <typename ScalarType>
+void FDkernelDel2_6th(const Grid& grid, ScalarType* v, ScalarType* b,
+    const size_t nfunc, MemorySpace::Host);
+
+template <typename ScalarType>
+void FDkernelDel2_8th(const Grid& grid, ScalarType* v, ScalarType* b,
+    const size_t nfunc, MemorySpace::Host);
+
 #ifdef HAVE_MAGMA
+template <typename ScalarType>
+void FDkernelDel2_2nd(const Grid& grid, ScalarType* v, ScalarType* b,
+    const size_t nfunc, MemorySpace::Device)
+{/*to be implemented*/ 
+std::cerr<<"Function not implemented!!!"<<std::endl; abort();};
+
 template <typename ScalarType>
 void FDkernelDel2_4th(const Grid& grid, ScalarType* v, ScalarType* b,
     const size_t nfunc, MemorySpace::Device);
-#endif
 
 template <typename ScalarType>
 void FDkernelDel2_4th_Mehr(const Grid& grid, ScalarType* v, ScalarType* b,
-    const size_t nfunc, MemorySpace::Host);
+    const size_t nfunc, MemorySpace::Device)
+{/*to be implemented*/
+std::cerr<<"Function not implemented!!!"<<std::endl; abort();
+};
 
 template <typename ScalarType>
 void FDkernelDel2_6th(const Grid& grid, ScalarType* v, ScalarType* b,
-    const size_t nfunc, MemorySpace::Host);
+    const size_t nfunc, MemorySpace::Device)
+{/*to be implemented*/
+std::cerr<<"Function not implemented!!!"<<std::endl; abort();
+};
 
 template <typename ScalarType>
 void FDkernelDel2_8th(const Grid& grid, ScalarType* v, ScalarType* b,
-    const size_t nfunc, MemorySpace::Host);
+    const size_t nfunc, MemorySpace::Device)
+{/*to be implemented*/
+std::cerr<<"Function not implemented!!!"<<std::endl; abort();
+};
+#endif
 }
 
 #endif
diff --git a/src/pb/GridFuncVector.h b/src/pb/GridFuncVector.h
@@ -19,9 +19,6 @@
 #include <type_traits>
 #include <vector>
 
-template <class T>
-class Lap;
-
 namespace pb
 {
 #ifdef HAVE_OPENMP_OFFLOAD
@@ -270,7 +267,10 @@ class GridFuncVector
         return *functions_[k];
     }
 
-    void del2_4th(GridFuncVector<ScalarType>& rhs)
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Host, MST>::value>::type* = nullptr>
+    void del2_4th(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
     {
         trade_boundaries();
 
@@ -280,7 +280,23 @@ class GridFuncVector
         rhs.set_updated_boundaries(0);
     }
 
-    void del2_4th_Mehr(GridFuncVector<ScalarType>& rhs)
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Device, MST>::value>::type* = nullptr>
+    void del2_4th(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
+    {
+        trade_boundaries();
+
+        FDkernelDel2_4th(
+            grid(), data(), rhs.data(), size(), MemorySpace::Device());
+
+        rhs.set_updated_boundaries(0);
+    }
+
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Host, MST>::value>::type* = nullptr>
+    void del2_4th_Mehr(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
     {
         trade_boundaries();
 
@@ -290,7 +306,23 @@ class GridFuncVector
         rhs.set_updated_boundaries(0);
     }
 
-    void del2_2nd(GridFuncVector<ScalarType>& rhs)
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Device, MST>::value>::type* = nullptr>
+    void del2_4th_Mehr(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
+    {
+        trade_boundaries();
+
+        FDkernelDel2_4th_Mehr(
+            grid(), data(), rhs.data(), size(), MemorySpace::Device());
+
+        rhs.set_updated_boundaries(0);
+    }
+
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Host, MST>::value>::type* = nullptr>
+    void del2_2nd(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
     {
         trade_boundaries();
 
@@ -300,7 +332,23 @@ class GridFuncVector
         rhs.set_updated_boundaries(0);
     }
 
-    void del2_6th(GridFuncVector<ScalarType>& rhs)
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Device, MST>::value>::type* = nullptr>
+    void del2_2nd(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
+    {
+        trade_boundaries();
+
+        FDkernelDel2_2nd(
+            grid(), data(), rhs.data(), size(), MemorySpace::Device());
+
+        rhs.set_updated_boundaries(0);
+    }
+
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Host, MST>::value>::type* = nullptr>
+    void del2_6th(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
     {
         trade_boundaries();
 
@@ -310,7 +358,23 @@ class GridFuncVector
         rhs.set_updated_boundaries(0);
     }
 
-    void del2_8th(GridFuncVector<ScalarType>& rhs)
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Device, MST>::value>::type* = nullptr>
+    void del2_6th(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
+    {
+        trade_boundaries();
+
+        FDkernelDel2_6th(
+            grid(), data(), rhs.data(), size(), MemorySpace::Device());
+
+        rhs.set_updated_boundaries(0);
+    }
+
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Host, MST>::value>::type* = nullptr>
+    void del2_8th(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
     {
         trade_boundaries();
 
@@ -320,6 +384,19 @@ class GridFuncVector
         rhs.set_updated_boundaries(0);
     }
 
+    template <typename MST = MemorySpaceType,
+        typename std::enable_if<
+            std::is_same<MemorySpace::Device, MST>::value>::type* = nullptr>
+    void del2_8th(GridFuncVector<ScalarType,MemorySpaceType>& rhs)
+    {
+        trade_boundaries();
+
+        FDkernelDel2_8th(
+            grid(), data(), rhs.data(), size(), MemorySpace::Device());
+
+        rhs.set_updated_boundaries(0);
+    }
+
     void trade_boundaries();
     void trade_boundaries_colors(const short, const short);