Add HypreCSRMatrix wrapper class to replace mfem::SparseMatrix

This allows OpenMP and better GPU acceleration for ceed::Operator full assembly into a CSR matrix using Hypre's functionality.
awslabs · Feb 28, 2024 · ee10c84 · ee10c84
1 parent 2a2f00a
commit ee10c84
Show file tree

Hide file tree

Showing 11 changed files with 338 additions and 340 deletions.
diff --git a/palace/fem/bilinearform.cpp b/palace/fem/bilinearform.cpp
@@ -113,8 +113,8 @@ BilinearForm::PartialAssemble(const FiniteElementSpace &trial_fespace,
   return op;
 }
 
-std::unique_ptr<mfem::SparseMatrix> BilinearForm::FullAssemble(const ceed::Operator &op,
-                                                               bool skip_zeros, bool set)
+std::unique_ptr<hypre::HypreCSRMatrix> BilinearForm::FullAssemble(const ceed::Operator &op,
+                                                                  bool skip_zeros, bool set)
 {
   return ceed::CeedOperatorFullAssemble(op, skip_zeros, set);
 }

diff --git a/palace/fem/bilinearform.hpp b/palace/fem/bilinearform.hpp
@@ -9,6 +9,7 @@
 #include <mfem.hpp>
 #include "fem/integrator.hpp"
 #include "fem/libceed/operator.hpp"
+#include "linalg/hypre.hpp"
 
 namespace palace
 {
@@ -69,19 +70,19 @@ class BilinearForm
     return PartialAssemble(GetTrialSpace(), GetTestSpace());
   }
 
-  std::unique_ptr<mfem::SparseMatrix> FullAssemble(bool skip_zeros) const
+  std::unique_ptr<hypre::HypreCSRMatrix> FullAssemble(bool skip_zeros) const
   {
     return FullAssemble(*PartialAssemble(), skip_zeros, false);
   }
 
-  static std::unique_ptr<mfem::SparseMatrix> FullAssemble(const ceed::Operator &op,
-                                                          bool skip_zeros)
+  static std::unique_ptr<hypre::HypreCSRMatrix> FullAssemble(const ceed::Operator &op,
+                                                             bool skip_zeros)
   {
     return FullAssemble(op, skip_zeros, false);
   }
 
-  static std::unique_ptr<mfem::SparseMatrix> FullAssemble(const ceed::Operator &op,
-                                                          bool skip_zeros, bool set);
+  static std::unique_ptr<hypre::HypreCSRMatrix> FullAssemble(const ceed::Operator &op,
+                                                             bool skip_zeros, bool set);
 
   std::unique_ptr<Operator> Assemble(bool skip_zeros) const;
 
@@ -120,13 +121,13 @@ class DiscreteLinearOperator
 
   std::unique_ptr<ceed::Operator> PartialAssemble() const;
 
-  std::unique_ptr<mfem::SparseMatrix> FullAssemble(bool skip_zeros) const
+  std::unique_ptr<hypre::HypreCSRMatrix> FullAssemble(bool skip_zeros) const
   {
     return BilinearForm::FullAssemble(*PartialAssemble(), skip_zeros, true);
   }
 
-  static std::unique_ptr<mfem::SparseMatrix> FullAssemble(const ceed::Operator &op,
-                                                          bool skip_zeros)
+  static std::unique_ptr<hypre::HypreCSRMatrix> FullAssemble(const ceed::Operator &op,
+                                                             bool skip_zeros)
   {
     return BilinearForm::FullAssemble(op, skip_zeros, true);
   }