Changeset 2584

Timestamp:

10/05/23 16:02:02 (16 months ago)

Author:

ymipsl

Message:

Set overload of mpi functions in xios namespace, so only XIOS MPI calls will be intercepted.
YM

Location:

XIOS3/trunk/src

Files:

• mpi.hpp (modified) (1 diff)
• mpi_tools.cpp (modified) (1 diff)

XIOS3/trunk/src/mpi.hpp

@@ -31 +31 @@
 #include "mpi_tools.hpp"
 
-inline int MPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm)
+namespace xios
 {
-  int ret=PMPI_Comm_dup(comm, newcomm) ;
-  xios::CCommTrack::registerComm(*newcomm) ;
-  return ret ;
+  inline int MPI_Comm_dup(::MPI_Comm comm, ::MPI_Comm * newcomm)
+  {
+    int ret=::MPI_Comm_dup(comm, newcomm) ;
+    xios::CCommTrack::registerComm(*newcomm) ;
+    return ret ;
+  }
+
+  inline int MPI_Intercomm_create(::MPI_Comm local_comm, int local_leader,
+                           ::MPI_Comm peer_comm, int remote_leader, int tag, ::MPI_Comm * newintercomm)
+  {
+    int ret=::MPI_Intercomm_create(local_comm, local_leader, peer_comm, remote_leader, tag, newintercomm) ;
+    xios::CCommTrack::registerComm(*newintercomm) ;
+    return ret ;
+  }
+
+  inline int MPI_Intercomm_merge(::MPI_Comm intercomm, int high, ::MPI_Comm * newintracomm)
+  {
+    int ret=::MPI_Intercomm_merge(intercomm, high, newintracomm) ;
+    xios::CCommTrack::registerComm(*newintracomm) ;
+    return ret ;
+  }
+
+  inline int MPI_Comm_split(::MPI_Comm comm, int color, int key, ::MPI_Comm * newcomm)
+  {
+    int ret=::MPI_Comm_split(comm, color, key,newcomm) ;
+    xios::CCommTrack::registerComm(*newcomm) ;
+    return ret ;
+  }
+
+  inline int MPI_Comm_create(::MPI_Comm comm, ::MPI_Group group, ::MPI_Comm *newcomm)
+  {
+    int ret=::MPI_Comm_create(comm, group, newcomm) ;
+    xios::CCommTrack::registerComm(*newcomm) ;
+    return ret ;
+  }
+
+  inline int MPI_Comm_free(::MPI_Comm *comm) 
+  { 
+    xios::CCommTrack::releaseComm(*comm) ;
+    return ::MPI_Comm_free(comm) ;
+  }
 }
 
-inline int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
-                         MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm * newintercomm)
-{
-  int ret=PMPI_Intercomm_create(local_comm, local_leader, peer_comm, remote_leader, tag, newintercomm) ;
-  xios::CCommTrack::registerComm(*newintercomm) ;
-  return ret ;
-}
-
-inline int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm * newintracomm)
-{
-  int ret=PMPI_Intercomm_merge(intercomm, high, newintracomm) ;
-  xios::CCommTrack::registerComm(*newintracomm) ;
-  return ret ;
-}
-
-inline int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm * newcomm)
-{
-  int ret=PMPI_Comm_split(comm, color, key,newcomm) ;
-  xios::CCommTrack::registerComm(*newcomm) ;
-  return ret ;
-}
-
-inline int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm)
-{
-  int ret=PMPI_Comm_create(comm, group, newcomm) ;
-  xios::CCommTrack::registerComm(*newcomm) ;
-  return ret ;
-}
-
-inline int MPI_Comm_free(MPI_Comm *comm) 
-{ 
-  xios::CCommTrack::releaseComm(*comm) ;
-  return PMPI_Comm_free(comm) ;
-}
-
-
 #endif

XIOS3/trunk/src/mpi_tools.cpp

@@ -22 +22 @@
   {
     auto it = commTrack_.find(comm) ;
-    if (it == commTrack_.end())  info(100)<<"WARNING : CCommtrack::releaseComm => Communicator not allocated !" << endl ;
+    //if (it == commTrack_.end())  info(100)<<"WARNING : CCommtrack::releaseComm => Communicator not allocated !" << endl ;
+    if (it == commTrack_.end())  { ERROR("void CCommTrack::releaseComm(const MPI_Comm& comm)",<<"Communicator not allocated !" << endl) ; }
     else commTrack_.erase(it) ;
   }