Changeset 1070 for XIOS/dev/branch_yushan/src/client_client_dht_template_impl.hpp

Timestamp:

03/09/17 18:31:07 (7 years ago)

Author:

yushan

Message:

Preperation for merge from trunk

File:

• XIOS/dev/branch_yushan/src/client_client_dht_template_impl.hpp (modified) (19 diffs)

XIOS/dev/branch_yushan/src/client_client_dht_template_impl.hpp

@@ -107 +107 @@
                                                                  int level)
 {
-  int clientRank;
-  MPI_Comm_rank(commLevel,&clientRank);
   int groupRankBegin = this->getGroupBegin()[level];
   int nbClient = this->getNbInGroup()[level];
@@ -200 +198 @@
 
   std::vector<ep_lib::MPI_Status> status(request.size());
-
-  //printf("1(%d): calling wait all for %lu requests\n", clientRank, request.size());
-
   MPI_Waitall(request.size(), &request[0], &status[0]);
 
-
-  //printf("               1(%d): calling wait all for %lu requests OK\n", clientRank, request.size());
 
   CArray<size_t,1>* tmpGlobalIndex;
@@ -311 +304 @@
 
   std::vector<ep_lib::MPI_Status> statusOnReturn(requestOnReturn.size());
-  //printf("2(%d): calling wait all for %lu requests\n", clientRank, requestOnReturn.size());
   MPI_Waitall(requestOnReturn.size(), &requestOnReturn[0], &statusOnReturn[0]);
 
-  //printf("            2(%d): calling wait all for %lu requests OK\n", clientRank, requestOnReturn.size());
 
   Index2VectorInfoTypeMap indexToInfoMapping;
@@ -383 +374 @@
                                                             int level)
 {
-  //printf("in computeDistributedIndex(const Index2VectorInfoTypeMap& indexInfoMap, const MPI_Comm& commLevel, int level)\n");
   int clientRank;
   MPI_Comm_rank(commLevel,&clientRank);
@@ -433 +423 @@
     {
       client2ClientIndex[indexClient + groupRankBegin][sendNbIndexBuff[indexClient]] = it->first;;
-  //          ProcessDHTElement<InfoType>::packElement(it->second, client2ClientInfo[indexClient + groupRankBegin], sendNbInfo[indexClient]);
       ProcessDHTElement<InfoType>::packElement(infoTmp[idx], client2ClientInfo[indexClient + groupRankBegin], sendNbInfo[indexClient]);
       ++sendNbIndexBuff[indexClient];
     }
   }
-
-  //printf("check 4 OK. clientRank = %d\n", clientRank);
 
   // Calculate from how many clients each client receive message.
@@ -446 +433 @@
   sendRecvRank(level, sendBuff, sendNbIndexBuff,
                recvRankClient, recvNbIndexClientCount);
-  //printf("sendRecvRank OK\n");
 
   int recvNbIndexCount = 0;
@@ -459 +445 @@
     recvInfoBuff = new unsigned char[recvNbIndexCount*ProcessDHTElement<InfoType>::typeSize()];
   }
-
-  //printf("check 5 OK. clientRank = %d\n", clientRank);
 
   // If a client holds information about index and the corresponding which don't belong to it,
@@ -483 +467 @@
   }
 
-  //printf("check 6 OK. clientRank = %d\n", clientRank);
-
   boost::unordered_map<int, size_t* >::iterator itbIndex = client2ClientIndex.begin(), itIndex,
                                                 iteIndex = client2ClientIndex.end();
@@ -493 +475 @@
   }
 
-  //printf("check 7 OK. clientRank = %d\n", clientRank);
-
   boost::unordered_map<int, unsigned char*>::iterator itbInfo = client2ClientInfo.begin(), itInfo,
                                                       iteInfo = client2ClientInfo.end();
@@ -503 +483 @@
   }
 
-  //printf("check 8 OK. clientRank = %d\n", clientRank);
   std::vector<ep_lib::MPI_Status> status(request.size());
 
@@ -528 +507 @@
   }
 
-  //printf("check 9 OK. clientRank = %d\n", clientRank);
-
   if (0 != recvNbIndexCount)
   {
@@ -543 +520 @@
       delete [] it->second;
 
-  //printf("check 10 OK. clientRank = %d\n", clientRank);
   // Ok, now do something recursive
   if (0 < level)
@@ -608 +584 @@
   ep_lib::MPI_Request request;
   requestSendInfo.push_back(request);
-  //printf("MPI_IsendInfo(info, infoSize, MPI_CHAR,... char count = %d, dest = %d, buf_size = %d\n", infoSize, clientDestRank, sizeof(*info) );
   MPI_Isend(info, infoSize, MPI_CHAR,
             clientDestRank, MPI_DHT_INFO, clientIntraComm, &(requestSendInfo.back()));
@@ -717 +692 @@
   }
   
-  int clientRank;
-  MPI_Comm_rank(this->internalComm_,&clientRank);
-  //printf("4(%d): calling wait all for %lu requests\n", clientRank, sendNbRank.size()+recvNbRank.size());
+  
   MPI_Waitall(sendNbRank.size()+recvNbRank.size(), &request[0], &requestStatus[0]);
-  //printf("        4(%d): calling wait all for %lu requests OK\n", clientRank, sendNbRank.size()+recvNbRank.size());
 }
 
@@ -738 +710 @@
                                                  std::vector<int>& recvNbRank, std::vector<int>& recvNbElements)
 {
-  int myRank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &myRank);
-  //printf("myRank = %d, in sendRecvRank(int level, const std::vector<int>& sendNbRank, const std::vector<int>& sendNbElements, std::vector<int>& recvNbRank, std::vector<int>& recvNbElements)\n", myRank);
   int groupBegin = this->getGroupBegin()[level];
 
@@ -757 +726 @@
   for (int idx = 0; idx < recvBuffSize; ++idx)
   {
-    //printf("myRank = %d starts irecv with src = %d, tag = %d, idx = %d\n", myRank, recvRank[idx], MPI_DHT_INDEX_0, idx);
     MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT,
               recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
-    //printf("myRank = %d MPI_Irecv OK, idx = %d, nRequest = %d\n", myRank, idx, nRequest);
     ++nRequest;
   }
 
-  //printf("myRank = %d, check 1 OK\n", myRank);
 
   for (int idx = 0; idx < sendBuffSize; ++idx)
@@ -775 +741 @@
   for (int idx = 0; idx < sendBuffSize; ++idx)
   {
-    //printf("myRank = %d starts isend with dest = %d, tag = %d, idx = %d\n", myRank, sendRank[idx], MPI_DHT_INDEX_0, idx);
     MPI_Isend(&sendBuff[idx*2], 2, MPI_INT,
               sendRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
-    //printf("myRank = %d MPI_Isend OK, idx = %d, nRequest = %d\n", myRank, idx, nRequest);
     ++nRequest;
   }
@@ -784 +748 @@
   MPI_Barrier(this->internalComm_);
 
-  //printf("myRank = %d, check 2 OK\n", myRank);
-
-  int clientRank;
-  MPI_Comm_rank(this->internalComm_,&clientRank);
-
-  //printf("5(%d): calling wait all for %lu requests\n", myRank, sendBuffSize+recvBuffSize);
+
   MPI_Waitall(sendBuffSize+recvBuffSize, &request[0], &requestStatus[0]);
-  //printf("            5(%d): calling wait all for %lu requests OK\n", myRank, sendBuffSize+recvBuffSize);
-  //printf("check 3 OK\n");
 
   int nbRecvRank = 0, nbRecvElements = 0;
@@ -805 +762 @@
     }
   }
-  //printf("check 4 OK\n");
-}
-
-}
+}
+
+}