[alien,ArcaneInterface,external_packages] Fix mpi communicator access…

… in Hypre matrix, vector and solver.
arcaneframework · Oct 2, 2024 · fdb4983 · fdb4983
1 parent da444ee
commit fdb4983
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/...Interface/modules/external_packages/src/alien/kernels/hypre/data_structure/HypreMatrix.cc b/...Interface/modules/external_packages/src/alien/kernels/hypre/data_structure/HypreMatrix.cc
@@ -12,6 +12,7 @@
 #include <alien/core/impl/MultiMatrixImpl.h>
 #include <alien/data/ISpace.h>
 
+#include <arccore/message_passing/Communicator.h>
 #include <arccore/message_passing_mpi/MpiMessagePassingMng.h>
 
 /*---------------------------------------------------------------------------*/
@@ -58,15 +59,15 @@ HypreMatrix::initMatrix(const int ilower, const int iupper, const int jlower,
   delete m_internal;
   auto memory_type = HypreInternalLinearSolver::m_library_plugin->getMemoryType() ;
   auto exec_space = HypreInternalLinearSolver::m_library_plugin->getExecSpace() ;
-  auto* pm = dynamic_cast<Arccore::MessagePassing::Mpi::MpiMessagePassingMng*>(m_pm);
-  if (*static_cast<const MPI_Comm*>(pm->getMPIComm()) != MPI_COMM_NULL)
-    m_internal = new MatrixInternal(*static_cast<const MPI_Comm*>(pm->getMPIComm()),
-                                    memory_type,
-                                    exec_space);
-  else
-    m_internal = new MatrixInternal(MPI_COMM_WORLD,
-                                    memory_type,
-                                    exec_space);
+  auto pm = m_pm->communicator();
+  if (pm.isValid()) {
+    m_internal = new MatrixInternal(static_cast<MPI_Comm>(pm), memory_type, exec_space);
+  }
+  else {
+    alien_fatal([&] {
+      cout() << "Mpi is not initialized. Should be the case even in sequential";
+    });
+  }
   return m_internal->init(ilower, iupper, jlower, jupper, lineSizes);
 }
 

diff --git a/...Interface/modules/external_packages/src/alien/kernels/hypre/data_structure/HypreVector.cc b/...Interface/modules/external_packages/src/alien/kernels/hypre/data_structure/HypreVector.cc
@@ -14,6 +14,7 @@
 #include <alien/kernels/hypre/data_structure/HypreInternal.h>
 
 #include <arccore/message_passing_mpi/MpiMessagePassingMng.h>
+#include <arccore/message_passing/Communicator.h>
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
@@ -73,16 +74,16 @@ HypreVector::allocate()
   auto memory_type = HypreInternalLinearSolver::m_library_plugin->getMemoryType() ;
   auto exec_space = HypreInternalLinearSolver::m_library_plugin->getExecSpace() ;
   const VectorDistribution& dist = this->distribution();
-  auto* pm = dynamic_cast<Arccore::MessagePassing::Mpi::MpiMessagePassingMng*>(
-      dist.parallelMng());
-  if (*static_cast<const MPI_Comm*>(pm->getMPIComm()) != MPI_COMM_NULL)
-    m_internal = new VectorInternal(*static_cast<const MPI_Comm*>(pm->getMPIComm()),
-                                    memory_type,
-                                    exec_space);
-  else
-    m_internal = new VectorInternal(MPI_COMM_WORLD,
-                                    memory_type,
-                                    exec_space);
+  auto pm = dist.parallelMng()->communicator();
+  if (pm.isValid()) {
+    m_internal =
+        new VectorInternal(static_cast<const MPI_Comm>(pm), memory_type, exec_space);
+  }
+  else {
+    alien_fatal([&] {
+      cout() << "Mpi is not initialized. Should be the case even in sequential";
+    });
+  }
   int ilower = dist.offset() * m_block_size;
   int iupper = ilower + dist.localSize() * m_block_size - 1;
   m_internal->init(ilower, iupper);

diff --git a/...ules/external_packages/src/alien/kernels/hypre/linear_solver/HypreInternalLinearSolver.cc b/...ules/external_packages/src/alien/kernels/hypre/linear_solver/HypreInternalLinearSolver.cc
@@ -236,12 +236,11 @@ HypreInternalLinearSolver::solve(
   HYPRE_PtrToParSolverFcn precond_setup_function = NULL;
   int (*precond_destroy_function)(HYPRE_Solver) = NULL;
 
-  auto* pm = dynamic_cast<Arccore::MessagePassing::Mpi::MpiMessagePassingMng*>(
-      A.getParallelMng());
-  MPI_Comm comm = (*static_cast<const MPI_Comm*>(pm->getMPIComm()) == MPI_COMM_NULL)
-      ? MPI_COMM_WORLD
-      : *static_cast<const MPI_Comm*>(pm->getMPIComm());
-
+  auto pm = A.getParallelMng()->communicator();
+  if (!pm.isValid()) alien_fatal([&] {
+      cout() << "Mpi is not initialized. Should be the case even in sequential";
+    });
+  MPI_Comm comm = static_cast<const MPI_Comm>(pm);
   std::string precond_name = "undefined";
   switch (m_options->preconditioner()) {
   case HypreOptionTypes::NoPC: