Changeset 1642 for XIOS/dev/branch_openmp/src/client_client_dht_template_impl.hpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/client_client_dht_template_impl.hpp (modified) (18 diffs)

XIOS/dev/branch_openmp/src/client_client_dht_template_impl.hpp

@@ -169 +169 @@
     recvIndexBuff = new unsigned long[recvNbIndexCount];
 
-int request_size = 0;
+  int request_size = 0;
   for (int idx = 0; idx < recvRankClient.size(); ++idx)
   {
@@ -179 +179 @@
 
   std::vector<ep_lib::MPI_Request> request(request_size);
-  
   std::vector<int>::iterator itbRecvIndex = recvRankClient.begin(), itRecvIndex,
                              iteRecvIndex = recvRankClient.end(),
@@ -253 +252 @@
   }
 
-int requestOnReturn_size=0;
+  int requestOnReturn_size=0;
   for (int idx = 0; idx < recvRankOnReturn.size(); ++idx)
   {
@@ -482 +481 @@
  
    std::vector<ep_lib::MPI_Request> request(request_size);
+
   int currentIndex = 0;
   int nbRecvClient = recvRankClient.size();
@@ -489 +489 @@
     if (0 != recvNbIndexClientCount[idx])
     {
-        recvIndexFromClients(recvRankClient[idx], recvIndexBuff+currentIndex, recvNbIndexClientCount[idx], commLevel, &request[request_position++]);
-        recvInfoFromClients(recvRankClient[idx],
+      recvIndexFromClients(recvRankClient[idx], recvIndexBuff+currentIndex, recvNbIndexClientCount[idx], commLevel, &request[request_position++]);
+      //if(clientRank==0) printf("recv index request = %p, inserted = %p, request = %d\n", &request[0], request.back(), *static_cast< int*>(request.back()->mpi_request));
+      recvInfoFromClients(recvRankClient[idx],
                             recvInfoBuff+currentIndex*ProcessDHTElement<InfoType>::typeSize(),
                             recvNbIndexClientCount[idx]*ProcessDHTElement<InfoType>::typeSize(),
                             commLevel, &request[request_position++]);
+      //if(clientRank==0) printf("recv info request = %p, inserted = %p, request = %d\n", &request[0], request.back(), *static_cast< int*>(request.back()->mpi_request));
     }
     currentIndex += recvNbIndexClientCount[idx];
@@ -501 +503 @@
                                                 iteIndex = client2ClientIndex.end();
   for (itIndex = itbIndex; itIndex != iteIndex; ++itIndex)
-    sendIndexToClients(itIndex->first, itIndex->second, sendNbIndexBuff[itIndex->first-groupRankBegin], commLevel, &request[request_position++]);
+  {  sendIndexToClients(itIndex->first, itIndex->second, sendNbIndexBuff[itIndex->first-groupRankBegin], commLevel, &request[request_position++]);
+  }    //if(clientRank==0) printf("send index request = %p, inserted = %p, request = %d\n", &request[0], request.back(), *static_cast< int*>(request.back()->mpi_request));}
   std::unordered_map<int, unsigned char*>::iterator itbInfo = client2ClientInfo.begin(), itInfo,
                                                       iteInfo = client2ClientInfo.end();
   for (itInfo = itbInfo; itInfo != iteInfo; ++itInfo)
-    sendInfoToClients(itInfo->first, itInfo->second, sendNbInfo[itInfo->first-groupRankBegin], commLevel, &request[request_position++]);
+   { sendInfoToClients(itInfo->first, itInfo->second, sendNbInfo[itInfo->first-groupRankBegin], commLevel, &request[request_position++]);
+   }//   if(clientRank==0) printf("send info request = %p, inserted = %p, request = %d\n", &request[0], request.back(), *static_cast< int*>(request.back()->mpi_request));}
 
   std::vector<ep_lib::MPI_Status> status(request.size());
+  
   ep_lib::MPI_Waitall(request.size(), &request[0], &status[0]);
 
@@ -566 +571 @@
   ep_lib::MPI_Request request;
   requestSendIndex.push_back(request);
-  ep_lib::MPI_Isend(indices, indiceSize, MPI_UNSIGNED_LONG,
+  ep_lib::MPI_Isend(indices, indiceSize, EP_UNSIGNED_LONG,
             clientDestRank, MPI_DHT_INDEX, clientIntraComm, &(requestSendIndex.back()));
 }
@@ -583 +588 @@
                                                        ep_lib::MPI_Request* requestSendIndex)
 {
-  ep_lib::MPI_Isend(indices, indiceSize, MPI_UNSIGNED_LONG,
+  ep_lib::MPI_Isend(indices, indiceSize, EP_UNSIGNED_LONG,
             clientDestRank, MPI_DHT_INDEX, clientIntraComm, requestSendIndex);
 }
@@ -601 +606 @@
   ep_lib::MPI_Request request;
   requestRecvIndex.push_back(request);
-  ep_lib::MPI_Irecv(indices, indiceSize, MPI_UNSIGNED_LONG,
+  ep_lib::MPI_Irecv(indices, indiceSize, EP_UNSIGNED_LONG,
             clientSrcRank, MPI_DHT_INDEX, clientIntraComm, &(requestRecvIndex.back()));
 }
@@ -617 +622 @@
                                                          ep_lib::MPI_Request *requestRecvIndex)
 {
-  ep_lib::MPI_Irecv(indices, indiceSize, MPI_UNSIGNED_LONG,
+  ep_lib::MPI_Irecv(indices, indiceSize, EP_UNSIGNED_LONG,
             clientSrcRank, MPI_DHT_INDEX, clientIntraComm, requestRecvIndex);
 }
@@ -637 +642 @@
   requestSendInfo.push_back(request);
 
-  ep_lib::MPI_Isend(info, infoSize, MPI_CHAR,
+  ep_lib::MPI_Isend(info, infoSize, EP_CHAR,
             clientDestRank, MPI_DHT_INFO, clientIntraComm, &(requestSendInfo.back()));
 }
@@ -654 +659 @@
                                                       ep_lib::MPI_Request *requestSendInfo)
 {
-  ep_lib::MPI_Isend(info, infoSize, MPI_CHAR,
+  ep_lib::MPI_Isend(info, infoSize, EP_CHAR,
             clientDestRank, MPI_DHT_INFO, clientIntraComm, requestSendInfo);
 }
@@ -674 +679 @@
   requestRecvInfo.push_back(request);
 
-  ep_lib::MPI_Irecv(info, infoSize, MPI_CHAR,
+  ep_lib::MPI_Irecv(info, infoSize, EP_CHAR,
             clientSrcRank, MPI_DHT_INFO, clientIntraComm, &(requestRecvInfo.back()));
 }
@@ -691 +696 @@
                                                         ep_lib::MPI_Request* requestRecvInfo)
 {
-  ep_lib::MPI_Irecv(info, infoSize, MPI_CHAR,
+  ep_lib::MPI_Irecv(info, infoSize, EP_CHAR,
             clientSrcRank, MPI_DHT_INFO, clientIntraComm, requestRecvInfo);
 }
@@ -767 +772 @@
   for (int idx = 0; idx < recvNbRank.size(); ++idx)
   {
-    ep_lib::MPI_Irecv(&recvNbElements[0]+idx, 1, MPI_INT,
+    ep_lib::MPI_Irecv(&recvNbElements[0]+idx, 1, EP_INT,
               recvNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
     ++nRequest;
@@ -774 +779 @@
   for (int idx = 0; idx < sendNbRank.size(); ++idx)
   {
-    ep_lib::MPI_Isend(&sendNbElements[0]+idx, 1, MPI_INT,
+    ep_lib::MPI_Isend(&sendNbElements[0]+idx, 1, EP_INT,
               sendNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
     ++nRequest;
@@ -808 +813 @@
   std::vector<ep_lib::MPI_Request> request(sendBuffSize+recvBuffSize);
   std::vector<ep_lib::MPI_Status> requestStatus(sendBuffSize+recvBuffSize);
+
   int nRequest = 0;
   for (int idx = 0; idx < recvBuffSize; ++idx)
   {
-    ep_lib::MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT,
-              recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest++]);
+    ep_lib::MPI_Irecv(&recvBuff[0]+2*idx, 2, EP_INT,
+              recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
+    ++nRequest;
   }
 
@@ -824 +831 @@
   for (int idx = 0; idx < sendBuffSize; ++idx)
   {
-    ep_lib::MPI_Isend(&sendBuff[idx*2], 2, MPI_INT,
-              sendRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest++]);
+    ep_lib::MPI_Isend(&sendBuff[idx*2], 2, EP_INT,
+              sendRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
+    ++nRequest;
   }