Changeset 2343 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

Timestamp:

06/29/22 18:19:45 (2 years ago)

Author:

ymipsl

Message:

• Implement new infrastructure for transfert protocol.
• new purelly one sided protocol is now available, the previous protocol (legacy, mix send/recv and one sided) is still available. Other specific protocol could be implemented more easilly in future.
• switch can be operate with "transport_protocol" variable in XIOS context :

ex:
<variable id="transport_protocol" type="string">one_sided</variable>

Available protocols are : one_sided, legacy or default. The default protocol is "legacy".

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

@@ -162 +162 @@
      }
 
-     std::unordered_map<int, vector<size_t> >::const_iterator itIndexEnd = indSrv_[client->serverSize].end();
+     std::unordered_map<int, vector<size_t> >::const_iterator itIndexEnd = indSrv_[client->getRemoteSize()].end();
      // std::map<int, std::vector<int> >::const_iterator itWrittenIndexEnd = indWrittenSrv_.end();
-     for (size_t k = 0; k < connectedServerRank_[client->serverSize].size(); ++k)
-     {
-       int rank = connectedServerRank_[client->serverSize][k];
-       std::unordered_map<int, std::vector<size_t> >::const_iterator it = indSrv_[client->serverSize].find(rank);
+     for (size_t k = 0; k < connectedServerRank_[client->getRemoteSize()].size(); ++k)
+     {
+       int rank = connectedServerRank_[client->getRemoteSize()][k];
+       std::unordered_map<int, std::vector<size_t> >::const_iterator it = indSrv_[client->getRemoteSize()].find(rank);
        size_t idxCount = (it != itIndexEnd) ? it->second.size() : 0;
 
@@ -1883 +1883 @@
     if (type==EDistributionType::BANDS) // Bands distribution to send to file server
     {
-      int nbServer = client->serverSize;
+      int nbServer = client->getRemoteSize();
       std::vector<int> nGlobDomain(2);
       nGlobDomain[0] = this->ni_glo;
@@ -1919 +1919 @@
     if (distType==EDistributionType::BANDS) // Bands distribution to send to file server
     {
-      int nbServer = client->serverSize;
-      int nbClient = client->clientSize ;
-      int rankClient = client->clientRank ;
+      int nbServer = client->getRemoteSize();
+      int nbClient = client->getIntraCommSize() ;
+      int rankClient = client->getIntraCommRank() ;
       int size = nbServer / nbClient ;
       int start ;
@@ -1952 +1952 @@
     else if (distType==EDistributionType::COLUMNS) // Bands distribution to send to file server
     {
-      int nbServer = client->serverSize;
-      int nbClient = client->clientSize ;
-      int rankClient = client->clientRank ;
+      int nbServer = client->getRemoteSize();
+      int nbClient = client->getIntraCommSize() ;
+      int rankClient = client->getIntraCommRank() ;
       int size = nbServer / nbClient ;
       int start ;
@@ -1988 +1988 @@
     else if (distType==EDistributionType::NONE) // domain is not distributed ie all servers get the same local domain
     {
-      int nbServer = client->serverSize;
+      int nbServer = client->getRemoteSize();
       int nglo=ni_glo*nj_glo ;
       CArray<size_t,1> indGlo ;