Merge pull request #1263 from LLNL/feature/gunney/parallel-marching-c…

…ubes Improve marching cubes performance on GPUs
LLNL · Mar 17, 2024 · 2c02493 · 2c02493
2 parents 4864dfc + d101063
commit 2c02493
Show file tree

Hide file tree

Showing 18 changed files with 2,814 additions and 2,779 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -39,6 +39,11 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
   user code to read in a subset of a Pro/E ASCII tetrahedron mesh file.
 
 ### Changed
+- `MarchingCubes` has optimizations to improve GPU performance, particularly for
+  repeated computations.  The constructor has changed and a new `setMesh` method
+  is added to set (or change) the mesh.  New accessors present output data
+  without moving them from device to host.  These accessors are an interim
+  solution and likely to be updated in the future.
 - `DistributedClosestPoint` outputs are now controlled by the `setOutput` method.
 - `MarchingCubes` allows user to select the underlying data-parallel implementation
   - `fullParallel` works best on GPUs.

diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp
@@ -734,7 +734,10 @@ class Array : public ArrayBase<T, DIM, Array<T, DIM, SPACE>>
    *
    * \note Reallocation is done if the new size will exceed the capacity.
    */
-  template <typename... Args, typename Enable = std::enable_if_t<sizeof...(Args) == DIM>>
+  template <
+    typename... Args,
+    typename Enable = typename std::enable_if<
+      sizeof...(Args) == DIM && detail::all_types_are_integral<Args...>::value>::type>
   void resize(Args... args)
   {
     static_assert(std::is_default_constructible<T>::value,
@@ -746,7 +749,10 @@ class Array : public ArrayBase<T, DIM, Array<T, DIM, SPACE>>
   }
 
   /// \overload
-  template <typename... Args, typename Enable = std::enable_if_t<sizeof...(Args) == DIM>>
+  template <
+    typename... Args,
+    typename Enable = typename std::enable_if<
+      sizeof...(Args) == DIM && detail::all_types_are_integral<Args...>::value>::type>
   void resize(ArrayOptions::Uninitialized, Args... args)
   {
     const StackArray<IndexType, DIM> dims {{static_cast<IndexType>(args)...}};

diff --git a/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp b/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp
@@ -137,8 +137,8 @@ inline CellType initializeFromGroup(
                   "sidre::Group " << group->getPathName()
                                   << " does not conform to mesh blueprint.");
 
-    sidre::View* type_view = elems_group->getView("types");
-    m_types = std::make_unique<sidre::Array<CellType>>(type_view);
+    sidre::View* elem_type_view = elems_group->getView("types");
+    m_types = std::make_unique<sidre::Array<CellType>>(elem_type_view);
   }
 
   return cell_type;

diff --git a/src/axom/primal/geometry/Vector.hpp b/src/axom/primal/geometry/Vector.hpp
@@ -126,7 +126,7 @@ AXOM_HOST_DEVICE Vector<T, NDIMS> operator*(const T scalar,
 /*!
  * \brief Scalar division of vector; Scalar on rhs.
  * \param [in] vec vector instance
- * \param [in]n scalar user-supplied scalar.
+ * \param [in] scalar user-supplied scalar.
  * \return C resulting vector, \f$ \ni: C_i = vec_i / scalar, \forall i\f$
  * \pre scalar != 0.0
  */