TagBoxArray on GPU

TagBoxArray functions can now run on GPU now. We no longer rely on unified memory for TagBoxArray functions.
AMReX-Codes · Aug 15, 2020 · 9f33e26 · 9f33e26
1 parent ac2128c
commit 9f33e26
Show file tree

Hide file tree

Showing 3 changed files with 369 additions and 224 deletions.
diff --git a/Src/AmrCore/AMReX_TagBox.H b/Src/AmrCore/AMReX_TagBox.H
@@ -62,41 +62,19 @@ public:
 
     /**
     * \brief Mark neighbors of every tagged cell a distance nbuff away
-    * only search interior for initial tagged points where nwid
-    * is given as the width of the bndry region.
     *
     * \param nbuff
-    * \param nwid
     */
-    void buffer (const IntVect& nbuf, const IntVect& nwid) noexcept;
-
-    /**
-    * \brief Add location of every tagged cell to IntVect array,
-    * starting at given location.  Returns the number of
-    * collated points.
-    *
-    * \param ar
-    * \param start
-    */
-    Long collate (Vector<IntVect>& ar, int start) const noexcept;
-
-    /**
-    * \brief Returns number of tagged cells in specified Box.
-    *
-    * \param bx
-    */
-    Long numTags (const Box& bx) const noexcept;
-
-    /**
-    * \brief Returns total number of tagged cells in the TagBox.
-    */
-    Long numTags () const noexcept;
+    void buffer (const IntVect& nbuf) noexcept;
 
     /**
     * \brief Returns Vector\<int\> of size domain.numPts() suitable for calling
     * Fortran, with positions set to same value as in the TagBox
     * dataPtr().
     */
+//#if (__cplusplus >= 201402L)
+//    [[deprecated("No need to use this unless calling Fortran < 2003")]]
+//#endif
     Vector<int> tags () const noexcept;
 
     /**
@@ -107,6 +85,9 @@ public:
     * \param ar
     * \param tilebx
     */
+//#if (__cplusplus >= 201402L)
+//    [[deprecated("No need to use this unless calling Fortran < 2003")]]
+//#endif
     void get_itags(Vector<int>& ar, const Box& tilebx) const noexcept;
 
     /**
@@ -115,6 +96,9 @@ public:
     *
     * \param ar
     */
+//#if (__cplusplus >= 201402L)
+//    [[deprecated("No need to use this unless calling Fortran < 2003")]]
+//#endif
     void tags (const Vector<int>& ar) noexcept;
 
     /**
@@ -123,6 +107,9 @@ public:
     *
     * \param ar
     */
+//#if (__cplusplus >= 201402L)
+//    [[deprecated("No need to use this unless calling Fortran < 2003")]]
+//#endif
     void tags_and_untags (const Vector<int>& ar) noexcept;
 
     /**
@@ -132,6 +119,9 @@ public:
     * \param ar
     * \param tilebx
     */
+//#if (__cplusplus >= 201402L)
+//    [[deprecated("No need to use this unless calling Fortran < 2003")]]
+//#endif
     void tags (const Vector<int>& ar, const Box& tilebx) noexcept;
 
     /**
@@ -141,6 +131,9 @@ public:
     * \param ar
     * \param tilebx
     */
+//#if (__cplusplus >= 201402L)
+//    [[deprecated("No need to use this unless calling Fortran < 2003")]]
+//#endif
     void tags_and_untags (const Vector<int>& ar, const Box& tilebx) noexcept;
 };
 
@@ -225,17 +218,17 @@ public:
     */
     void coarsen (const IntVect& ratio);
 
-    /**
-    * \brief The total number of Tags in all the contained TagBoxes.
-    */
-    Long numTags () const;
-
     /**
     * \brief Calls collate() on all contained TagBoxes.
     *
     * \param TheGlobalCollateSpace
     */
     void collate (Vector<IntVect>& TheGlobalCollateSpace) const;
+
+    void local_collate_cpu (Vector<IntVect>& v) const;
+#ifdef AMREX_USE_GPU
+    void local_collate_gpu (Vector<IntVect>& v) const;
+#endif
 };
 
 }