Changeset 1142 for XIOS/dev/dev_olga/src/server.cpp

Timestamp:

05/22/17 18:07:59 (7 years ago)

Author:

mhnguyen

Message:

Correcting a minor bug on initialization.

+) Make sure that color of each group (client, servers) are unique and different from others
+) Modify some message to make them clearer

Test
+) On Curie
+) test_complete:

• Mode: classical and 2 level server
• config: 4 clients + 4 servers
• passed

File:

• XIOS/dev/dev_olga/src/server.cpp (modified) (8 diffs)

XIOS/dev/dev_olga/src/server.cpp

@@ -88 +88 @@
         map<unsigned long, int>::iterator it ;
 
+        int nbSrv = 0;
         for(i=0,c=0;i<size;i++)
         {
@@ -96 +97 @@
             c++ ;
           }
-          if (hashAll[i+1] != hashAll[i])
-            lastProcesses[hashAll[i]]=i ;
+          if (hashAll[i] == hashServer) ++nbSrv;
+          //if (hashAll[i+1] != hashAll[i])  // Potential bug here!
+          //  lastProcesses[hashAll[i]]=i ; // It seems that lastprocesses is only used for calculating the server size. Can we count server size directly?
         }
 
@@ -105 +107 @@
         {
           int serverRank = rank_ - leaders[hashServer]; // server proc rank starting 0
-          serverSize_ = lastProcesses[hashServer] - leaders[hashServer] + 1;
+          serverSize_ = nbSrv; //lastProcesses[hashServer] - leaders[hashServer] + 1;
 //          serverSize_ = lastProcesses - leaders[hashServer];
           nbPools = serverSize_ * CXios::ratioServer2 / 100;
@@ -116 +118 @@
             serverLevel = 2;
             poolId = serverRank - serverSize_ + nbPools;
-            myColor = rank_;
+            myColor = rank_ + size; // + size to make sure that myColor is unique among not only servers but also clients. It's only a temporary solution
           }
         }
@@ -133 +135 @@
               MPI_Comm_size(intraComm,&intraCommSize) ;
               MPI_Comm_rank(intraComm,&intraCommRank) ;
-              info(50)<<"intercommCreate::server "<<rank_<<" intraCommSize : "<<intraCommSize
+              info(50)<<"intercommCreate::server (classical mode) "<<rank_<<" intraCommSize : "<<intraCommSize
                        <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
 
@@ -153 +155 @@
               MPI_Comm_size(intraComm, &intraCommSize) ;
               MPI_Comm_rank(intraComm, &intraCommRank) ;
-              info(50)<<"intercommCreate::server "<<rank_<<" intraCommSize : "<<intraCommSize
+              info(50)<<"intercommCreate::server (server level 1) "<<rank_<<" intraCommSize : "<<intraCommSize
                        <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
               MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
@@ -168 +170 @@
             MPI_Comm_size(intraComm, &intraCommSize) ;
             MPI_Comm_rank(intraComm, &intraCommRank) ;
-            info(50)<<"intercommCreate::client "<<rank_<<" intraCommSize : "<<intraCommSize
+            info(50)<<"intercommCreate::client (server level 1) "<<rank_<<" intraCommSize : "<<intraCommSize
                 <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< srvSndLeader<<endl ;
-            MPI_Intercomm_create(intraComm, 0, CXios::globalComm, srvSndLeader, 0, &newComm) ;
+            MPI_Intercomm_create(intraComm, 0, CXios::globalComm, srvSndLeader, 1, &newComm) ;
             interCommRight.push_back(newComm) ;
           }
@@ -181 +183 @@
           MPI_Comm_size(intraComm, &intraCommSize) ;
           MPI_Comm_rank(intraComm, &intraCommRank) ;
-          info(50)<<"intercommCreate::server "<<rank_<<" intraCommSize : "<<intraCommSize
+          info(50)<<"intercommCreate::server (server level 2) "<<rank_<<" intraCommSize : "<<intraCommSize
                    <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
 
-          MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+          MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 1, &newComm) ;
           interCommLeft.push_back(newComm) ;
         } // secondary server