Changeset 2589 for XIOS3/trunk/src/manager

Timestamp:

10/06/23 11:32:05 (9 months ago)

Author:

jderouillat

Message:

Specify the usage of the xios namespace to overload the MPI funtions

Location:

XIOS3/trunk/src/manager

Files:

• daemons_manager.cpp (modified) (2 diffs)
• pool_ressource.cpp (modified) (6 diffs)
• server_context.cpp (modified) (5 diffs)
• servers_ressource.cpp (modified) (4 diffs)
• services.cpp (modified) (1 diff)

XIOS3/trunk/src/manager/daemons_manager.cpp

@@ -17 +17 @@
     MPI_Comm_rank(xiosComm,&commRank) ;
     MPI_Comm splitComm ;
-    MPI_Comm_split(xiosComm,isXiosServer,commRank,&splitComm) ;
+    xios::MPI_Comm_split(xiosComm,isXiosServer,commRank,&splitComm) ;
     
     CXios::launchRegistryManager(isXiosServer) ;
@@ -28 +28 @@
     if (isXiosServer) CServer::launchServersRessource(splitComm) ;
     MPI_Barrier(xiosComm) ;
-    MPI_Comm_free(&splitComm) ;
+    xios::MPI_Comm_free(&splitComm) ;
   }
 

XIOS3/trunk/src/manager/pool_ressource.cpp

@@ -15 +15 @@
   {
     int commRank, commSize ;
-    MPI_Comm_dup(poolComm, &poolComm_) ;
+    xios::MPI_Comm_dup(poolComm, &poolComm_) ;
     CXios::getMpiGarbageCollector().registerCommunicator(poolComm_) ;
     winNotify_ = new CWindowManager(poolComm_, maxBufferSize_,"CPoolRessource::winNotify_") ;
@@ -336 +336 @@
     else color=1 ; 
     MPI_Comm_rank(poolComm_,&commRank) ;
-    MPI_Comm_split(poolComm_, color, commRank, &freeComm) ;  // workaround
+    xios::MPI_Comm_split(poolComm_, color, commRank, &freeComm) ;  // workaround
     
     if (services_.empty()) 
     {
       MPI_Comm_rank(freeComm,&commRank) ;
-      MPI_Comm_split(freeComm, in, commRank, &serviceComm) ;
+      xios::MPI_Comm_split(freeComm, in, commRank, &serviceComm) ;
 
       // temporary for event scheduler, we must using hierarchical split of free ressources communicator.
@@ -364 +364 @@
         else  partitionId = serviceCommRank / (serviceCommSize/nbPartitions + 1) ;
 
-        MPI_Comm_split(serviceComm, partitionId, commRank, &newServiceComm) ;
+        xios::MPI_Comm_split(serviceComm, partitionId, commRank, &newServiceComm) ;
 
         MPI_Comm_size(newServiceComm,&serviceCommSize) ;
@@ -378 +378 @@
         services_[std::make_tuple(serviceId,partitionId)] = new CService(newServiceComm, childScheduler, Id_, serviceId, partitionId, type, nbPartitions) ;
        
-        MPI_Comm_free(&newServiceComm) ;
+        xios::MPI_Comm_free(&newServiceComm) ;
       }
       else
@@ -388 +388 @@
         isFirstSplit_=false ;
       }
-      MPI_Comm_free(&serviceComm) ;
-    }
-    MPI_Comm_free(&freeComm) ;
+      xios::MPI_Comm_free(&serviceComm) ;
+    }
+    xios::MPI_Comm_free(&freeComm) ;
   }
   
@@ -404 +404 @@
         const MPI_Comm& serviceComm = service.second->getCommunicator() ;
         MPI_Comm newServiceComm ;
-        MPI_Comm_dup(serviceComm, &newServiceComm) ;
+        xios::MPI_Comm_dup(serviceComm, &newServiceComm) ;
         CXios::getMpiGarbageCollector().registerCommunicator(newServiceComm) ;
         int nbPartitions = service.second->getNbPartitions() ;

XIOS3/trunk/src/manager/server_context.cpp

@@ -23 +23 @@
    int localRank, globalRank, commSize ;
 
-    MPI_Comm_dup(contextComm, &contextComm_) ;
+    xios::MPI_Comm_dup(contextComm, &contextComm_) ;
     CXios::getMpiGarbageCollector().registerCommunicator(contextComm_) ;
     xiosComm_=CXios::getXiosComm() ;
@@ -104 +104 @@
     {
       MPI_Comm newInterCommClient, newInterCommServer ;
-      MPI_Comm_dup(contextComm_,&newInterCommClient) ;
-      MPI_Comm_dup(contextComm_,&newInterCommServer) ;
+      xios::MPI_Comm_dup(contextComm_,&newInterCommClient) ;
+      xios::MPI_Comm_dup(contextComm_,&newInterCommServer) ;
       overlapedComm_[name_]=tuple<bool, MPI_Comm, MPI_Comm>(false, newInterCommClient, newInterCommServer) ;
       MPI_Barrier(contextComm_) ;
@@ -129 +129 @@
       if (nOverlap==0)
       { 
-        MPI_Intercomm_create(intraComm, 0, xiosComm_, contextLeader, 3141, &interCommClient) ;
+        xios::MPI_Intercomm_create(intraComm, 0, xiosComm_, contextLeader, 3141, &interCommClient) ;
         CXios::getMpiGarbageCollector().registerCommunicator(interCommClient) ;
-        MPI_Comm_dup(interCommClient, &interCommServer) ;
+        xios::MPI_Comm_dup(interCommClient, &interCommServer) ;
         CXios::getMpiGarbageCollector().registerCommunicator(interCommServer) ;
-        MPI_Comm_free(&newInterCommClient) ;
-        MPI_Comm_free(&newInterCommServer) ;
+        xios::MPI_Comm_free(&newInterCommClient) ;
+        xios::MPI_Comm_free(&newInterCommServer) ;
       }
       else
@@ -320 +320 @@
     { 
       info(10)<<"CServerContext::createIntercomm : No overlap ==> context in server mode"<<endl ;
-      MPI_Intercomm_create(contextComm_, 0, xiosComm_, remoteLeader, 3141, &interCommServer) ;
+      xios::MPI_Intercomm_create(contextComm_, 0, xiosComm_, remoteLeader, 3141, &interCommServer) ;
       CXios::getMpiGarbageCollector().registerCommunicator(interCommServer) ;
-      MPI_Comm_dup(interCommServer,&interCommClient) ;
+      xios::MPI_Comm_dup(interCommServer,&interCommClient) ;
       CXios::getMpiGarbageCollector().registerCommunicator(interCommClient) ;
       context_ -> createClientInterComm(interCommClient,interCommServer) ;
@@ -339 +339 @@
     //delete winNotify_ ;
     //winNotify_=nullptr ;
-    //MPI_Comm_free(&contextComm_) ;
+    //xios::MPI_Comm_free(&contextComm_) ;
     // don't forget intercomm -> later
   }

XIOS3/trunk/src/manager/servers_ressource.cpp

@@ -22 +22 @@
   {
 
-    MPI_Comm_dup(serverComm, &serverComm_) ;
+    xios::MPI_Comm_dup(serverComm, &serverComm_) ;
     CXios::getMpiGarbageCollector().registerCommunicator(serverComm_) ; 
     MPI_Comm xiosComm=CXios::getXiosComm() ;
@@ -42 +42 @@
     }
 
-    MPI_Comm_dup(serverComm_, &freeRessourcesComm_) ; 
+    xios::MPI_Comm_dup(serverComm_, &freeRessourcesComm_) ; 
     CXios::getMpiGarbageCollector().registerCommunicator(freeRessourcesComm_) ;
     eventScheduler_ = make_shared<CEventScheduler>(freeRessourcesComm_) ;
@@ -225 +225 @@
     MPI_Comm poolComm ;
     MPI_Comm_rank(freeRessourcesComm_,&commRank) ;
-    MPI_Comm_split(freeRessourcesComm_, isPartOf, commRank, &poolComm) ;
+    xios::MPI_Comm_split(freeRessourcesComm_, isPartOf, commRank, &poolComm) ;
     
     shared_ptr<CEventScheduler> parentScheduler, childScheduler ;
@@ -236 +236 @@
     {  
       poolRessource_ = new CPoolRessource(poolComm, childScheduler, poolId, true) ;
-      MPI_Comm_free(&poolComm) ;
+      xios::MPI_Comm_free(&poolComm) ;
     }
     else 
     {
       freeRessourceEventScheduler_ = childScheduler ;
-      MPI_Comm_free(&freeRessourcesComm_) ;
+      xios::MPI_Comm_free(&freeRessourcesComm_) ;
       freeRessourcesComm_=poolComm ;
     }

XIOS3/trunk/src/manager/services.cpp

@@ -21 +21 @@
     int localRank, globalRank, commSize ;
 
-    MPI_Comm_dup(serviceComm, &serviceComm_) ;
+    xios::MPI_Comm_dup(serviceComm, &serviceComm_) ;
     CXios::getMpiGarbageCollector().registerCommunicator(serviceComm_) ;
     MPI_Comm globalComm_=CXios::getXiosComm() ;