Changeset 1542 for XIOS/trunk/src/client_client_dht_template_impl.hpp

Timestamp:

06/13/18 16:48:53 (6 years ago)

Author:

oabramkina

Message:

Replacing Boost's unordered_map and shared_pointer by its STL counterparts.

Two notes for Curie:

• one can see the content of unordered_map with ddt only if XIOS has been compiled with gnu
• XIOS will not compile any more with pgi (all available versions use old STL which are not up to the c++11 norms)

File:

• XIOS/trunk/src/client_client_dht_template_impl.hpp (modified) (9 diffs)

XIOS/trunk/src/client_client_dht_template_impl.hpp

@@ -116 +116 @@
   size_t index;
   HashXIOS<size_t> hashGlobalIndex;
-  boost::unordered_map<size_t,int> nbIndices;
+  std::unordered_map<size_t,int> nbIndices;
   nbIndices.rehash(std::ceil(ssize/nbIndices.max_load_factor()));
   for (int i = 0; i < ssize; ++i)
@@ -131 +131 @@
   }
 
-  boost::unordered_map<int, size_t* > client2ClientIndex;
+  std::unordered_map<int, size_t* > client2ClientIndex;
   for (int idx = 0; idx < nbClient; ++idx)
   {
@@ -183 +183 @@
   }
 
-  boost::unordered_map<int, size_t* >::iterator itbIndex = client2ClientIndex.begin(), itIndex,
+  std::unordered_map<int, size_t* >::iterator itbIndex = client2ClientIndex.begin(), itIndex,
                                                 iteIndex = client2ClientIndex.end();
   for (itIndex = itbIndex; itIndex != iteIndex; ++itIndex)
@@ -257 +257 @@
   }
 
-  boost::unordered_map<int,unsigned char*> client2ClientInfoOnReturn;
-  boost::unordered_map<int,size_t*> client2ClientIndexOnReturn;
+  std::unordered_map<int,unsigned char*> client2ClientInfoOnReturn;
+  std::unordered_map<int,size_t*> client2ClientIndexOnReturn;
   currentIndex = 0;
   for (int idx = 0; idx < nbRecvClient; ++idx)
@@ -308 +308 @@
   indexToInfoMappingLevel_.swap(indexToInfoMapping);
   if (0 != recvNbIndexCount) delete [] recvIndexBuff;
-  for (boost::unordered_map<int,size_t*>::const_iterator it = client2ClientIndex.begin();
+  for (std::unordered_map<int,size_t*>::const_iterator it = client2ClientIndex.begin();
                                                         it != client2ClientIndex.end(); ++it)
       delete [] it->second;
@@ -319 +319 @@
   }
 
-  for (boost::unordered_map<int,unsigned char*>::const_iterator it = client2ClientInfoOnReturn.begin();
+  for (std::unordered_map<int,unsigned char*>::const_iterator it = client2ClientInfoOnReturn.begin();
                                                                it != client2ClientInfoOnReturn.end(); ++it)
       delete [] it->second;
 
-  for (boost::unordered_map<int,size_t*>::const_iterator it = client2ClientIndexOnReturn.begin();
+  for (std::unordered_map<int,size_t*>::const_iterator it = client2ClientIndexOnReturn.begin();
                                             it != client2ClientIndexOnReturn.end(); ++it)
       delete [] it->second;
@@ -389 +389 @@
   }
 
-  boost::unordered_map<int, size_t*> client2ClientIndex;
-  boost::unordered_map<int, unsigned char*> client2ClientInfo;
+  std::unordered_map<int, size_t*> client2ClientIndex;
+  std::unordered_map<int, unsigned char*> client2ClientInfo;
   for (int idx = 0; idx < nbClient; ++idx)
   {
@@ -455 +455 @@
   }
 
-  boost::unordered_map<int, size_t* >::iterator itbIndex = client2ClientIndex.begin(), itIndex,
+  std::unordered_map<int, size_t* >::iterator itbIndex = client2ClientIndex.begin(), itIndex,
                                                 iteIndex = client2ClientIndex.end();
   for (itIndex = itbIndex; itIndex != iteIndex; ++itIndex)
     sendIndexToClients(itIndex->first, itIndex->second, sendNbIndexBuff[itIndex->first-groupRankBegin], commLevel, request);
-  boost::unordered_map<int, unsigned char*>::iterator itbInfo = client2ClientInfo.begin(), itInfo,
+  std::unordered_map<int, unsigned char*>::iterator itbInfo = client2ClientInfo.begin(), itInfo,
                                                       iteInfo = client2ClientInfo.end();
   for (itInfo = itbInfo; itInfo != iteInfo; ++itInfo)
@@ -490 +490 @@
     delete [] recvInfoBuff;
   }
-  for (boost::unordered_map<int,unsigned char*>::const_iterator it = client2ClientInfo.begin();
+  for (std::unordered_map<int,unsigned char*>::const_iterator it = client2ClientInfo.begin();
                                                                it != client2ClientInfo.end(); ++it)
       delete [] it->second;
 
-  for (boost::unordered_map<int,size_t*>::const_iterator it = client2ClientIndex.begin();
+  for (std::unordered_map<int,size_t*>::const_iterator it = client2ClientIndex.begin();
                                                         it != client2ClientIndex.end(); ++it)
       delete [] it->second;