Changeset 2528

Timestamp:

06/30/23 10:14:07 (11 months ago)

Author:

jderouillat

Message:

Fix intracommunicator probing for attached mode

Location:

XIOS3/trunk/src/transport

Files:

• legacy_context_client.cpp (modified) (2 diffs)
• legacy_context_server.cpp (modified) (1 diff)

XIOS3/trunk/src/transport/legacy_context_client.cpp

@@ -34 +34 @@
 
       if (!isAttachedModeEnabled()) MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ;
+      else interCommMerged_ = interComm_; // interComm_ is yet an intracommunicator in attached
       
       MPI_Comm_split(intraComm_,clientRank,clientRank, &commSelf_) ; // for windows
@@ -226 +227 @@
       }
       
-      CClientBuffer* buffer = buffers[rank] = new CClientBuffer(interCommMerged_, clientSize+rank, mapBufferSize_[rank], maxEventSizes[rank]);
+      int considerServers = 1;
+      if (isAttachedModeEnabled()) considerServers = 0;
+      CClientBuffer* buffer = buffers[rank] = new CClientBuffer(interCommMerged_, considerServers*clientSize+rank, mapBufferSize_[rank], maxEventSizes[rank]);
       if (isGrowableBuffer_) buffer->setGrowableBuffer(1.2) ;
       else buffer->fixBuffer() ;

XIOS3/trunk/src/transport/legacy_context_server.cpp

@@ -44 +44 @@
 
     if (!isAttachedModeEnabled()) MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ;
+    else interCommMerged_ = interComm_; // interComm_ is yet an intracommunicator in attached
     MPI_Comm_split(intraComm_, intraCommRank, intraCommRank, &commSelf_) ; // for windows