Remove overloading of function mpi_get_size

The function mpi_get_size in mpi_utils.cc was renamed to include the name of the type it is operating on, i.e.: mpi_get_comm_size, mpi_get_group_size and mpi_get_type_size. Overloading does not work on MPI implementations where the MPI_Comm and MPI_Group types are the same.
INCF · Aug 25, 2022 · f33b66e · f33b66e
1 parent 8ac4052
commit f33b66e
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 30 deletions.
diff --git a/src/application_map.cc b/src/application_map.cc
@@ -120,7 +120,7 @@ namespace MUSIC {
   {
     std::map<int, int> leaders;
 
-    int size = mpi_get_size (MPI_COMM_WORLD);
+    int size = mpi_get_comm_size (MPI_COMM_WORLD);
     int rank = mpi_get_rank (MPI_COMM_WORLD);
     int *colors = new int[size];
     colors[rank] = lookup (my_app_label)->color ();

diff --git a/src/application_mapper.cc b/src/application_mapper.cc
@@ -87,7 +87,7 @@ namespace MUSIC {
       }
     else
       {
-        int nRanks = mpi_get_size (MPI_COMM_WORLD);
+        int nRanks = mpi_get_comm_size (MPI_COMM_WORLD);
         int my_rank = mpi_get_rank (MPI_COMM_WORLD);
 
 #if HAVE_SYS_STAT_H

diff --git a/src/collector.cc b/src/collector.cc
@@ -104,7 +104,7 @@ namespace MUSIC {
 	BIFO* buffer = b->first;
 	Intervals& intervals = b->second;
 	sort (intervals.begin (), intervals.end ());
-	int elementSize = mpi_get_size (dataMap->type ());
+	int elementSize = mpi_get_type_size (dataMap->type ());
 	int size = 0;
 	for (Intervals::iterator i = intervals.begin ();
 	     i != intervals.end ();

diff --git a/src/connector.cc b/src/connector.cc
@@ -683,7 +683,7 @@ namespace MUSIC {
   EventOutputConnector::makeSubconnector (int remoteRank)
   {
     //////
-/*              int world_size = mpi_get_size (MPI_COMM_WORLD);
+/*              int world_size = mpi_get_comm_size (MPI_COMM_WORLD);
                 if (mpi_get_rank (MPI_COMM_WORLD) < world_size/2)
                   std::cout << remoteRank << std::flush << std::endl;*/
     return new EventOutputSubconnector (//&synch,
@@ -1041,9 +1041,9 @@ error( "LOCAL Indices are not supported with MUSIC_ANYSOURCE");
 
     for (NegotiationIterator i  = spatialNegotiator_->negotiate (info.nProcesses (), this);  !i.end (); ++i)
       {
-	int begin = (i->displ()) * mpi_get_size (data_type_);
+	int begin = (i->displ()) * mpi_get_type_size (data_type_);
 	// length field is stored overlapping the end field
-	int end = (i->end() - i->begin()) * mpi_get_size (data_type_);
+	int end = (i->end() - i->begin()) * mpi_get_type_size (data_type_);
 	receiver_intrvs.insert (std::make_pair ( remoteToCollectiveRankMap[i->rank ()], Interval(begin, end)));
 	intrvs.push_back(i->interval());
       }

diff --git a/src/distributor.cc b/src/distributor.cc
@@ -104,7 +104,7 @@ namespace MUSIC {
 	FIBO* buffer = b->first;
 	Intervals& intervals = b->second;
 	sort (intervals.begin (), intervals.end ());
-	int elementSize = mpi_get_size (dataMap->type ());
+	int elementSize = mpi_get_type_size (dataMap->type ());
 	int size = 0;
 	for (Intervals::iterator i = intervals.begin ();
 	     i != intervals.end ();

diff --git a/src/mpi_utils.cc b/src/mpi_utils.cc
@@ -37,23 +37,23 @@ namespace MUSIC {
   }
 
   int
-  mpi_get_size (MPI_Comm comm)
+  mpi_get_comm_size (MPI_Comm comm)
   {
     int size;
     MPI_Comm_size (comm, &size);
     return size;
   }
 
   int
-  mpi_get_size (MPI_Group group)
+  mpi_get_group_size (MPI_Group group)
   {
     int size;
     MPI_Group_size (group, &size);
     return size;
   }
 
   int
-  mpi_get_size (MPI_Datatype type)
+  mpi_get_type_size (MPI_Datatype type)
   {
     int size;
     MPI_Type_size (type, &size);

diff --git a/src/multibuffer.cc b/src/multibuffer.cc
@@ -49,7 +49,7 @@ namespace MUSIC {
     MPI_Comm_group (MPI_COMM_WORLD, &worldGroup);
     MPI_Group localGroup;
     MPI_Comm_group (comm, &localGroup);
-    int localSize = mpi_get_size (localGroup);
+    int localSize = mpi_get_group_size (localGroup);
 
     // maps leaders to vectors mapping local ranks to COMM_WORLD ranks
     RankMap* rankMap = new RankMap ();
@@ -250,7 +250,7 @@ namespace MUSIC {
   void
   MultiBuffer::setupRankMap (int localRank, RankMap* rankMap)
   {
-    int worldSize = mpi_get_size (MPI_COMM_WORLD);
+    int worldSize = mpi_get_comm_size (MPI_COMM_WORLD);
     int worldRank = mpi_get_rank (MPI_COMM_WORLD);
     std::vector<RankInfo> rankInfos (worldSize);
     rankInfos[worldRank] = RankInfo (localLeader_, localRank);
@@ -609,7 +609,8 @@ namespace MUSIC {
       idstr_ << ':' << cid->first << cid->second;
     id_ = "mc" + idstr_.str ();
 
-    if (!isContiguous || mpi_get_size (group_) < mpi_get_size (MPI_COMM_WORLD))
+    if (!isContiguous
+	|| mpi_get_group_size (group_) < mpi_get_comm_size (MPI_COMM_WORLD))
       MPI_Comm_create (MPI_COMM_WORLD, group_, &comm_);
     else
       comm_ = MPI_COMM_WORLD;

diff --git a/src/music/mpi_utils.hh b/src/music/mpi_utils.hh
@@ -26,9 +26,9 @@ namespace MUSIC
 {
   bool mpi_is_initialized ();
   int mpi_get_rank (MPI_Comm comm);
-  int mpi_get_size (MPI_Comm comm);
-  int mpi_get_size (MPI_Group group);
-  int mpi_get_size (MPI_Datatype type);
+  int mpi_get_comm_size (MPI_Comm comm);
+  int mpi_get_group_size (MPI_Group group);
+  int mpi_get_type_size (MPI_Datatype type);
   MPI_Group mpi_get_group (MPI_Comm comm);
 }
 

diff --git a/src/music/multibuffer.hh b/src/music/multibuffer.hh
@@ -346,7 +346,7 @@ namespace MUSIC {
     void mergeGroup (int leader, bool isInput);
 
     int rank () const { return mpi_get_rank (comm_); }
-    int size () const { return mpi_get_size (comm_); }
+    int size () const { return mpi_get_comm_size (comm_); }
     //void setErrorFlag (MultiBuffer::BufferType buffer);
 #ifdef MUSIC_TWOSTAGE_ALLGATHER
     void processReceived ();

diff --git a/src/music/subconnector.hh b/src/music/subconnector.hh
@@ -353,7 +353,7 @@ namespace MUSIC {
 	: Subconnector(type),
 	  CollectiveSubconnector (intracomm),
 	  intervals_ (intervals),
-	  width_ (width * mpi_get_size (type))
+	  width_ (width * mpi_get_type_size (type))
       {
 	allocAllgathervArrays ();
       }

diff --git a/src/sampler.cc b/src/sampler.cc
@@ -64,7 +64,7 @@ namespace MUSIC {
   void
   Sampler::initialize ()
   {
-    elementSize = mpi_get_size (dataMap_->type ());
+    elementSize = mpi_get_type_size (dataMap_->type ());
 
     size = 0;
     IndexMap* indices = dataMap_->indexMap ();

diff --git a/src/setup.cc b/src/setup.cc
@@ -280,7 +280,7 @@ namespace MUSIC {
   {
     ApplicationMap* apps = applicationMap ();
     int nRequestedProc = apps->nProcesses ();
-    int nMPIProc = mpi_get_size (MPI_COMM_WORLD);
+    int nMPIProc = mpi_get_comm_size (MPI_COMM_WORLD);
     if (nMPIProc != nRequestedProc)
       {
 	std::ostringstream msg;
@@ -359,7 +359,7 @@ namespace MUSIC {
   int
   Setup::nProcs ()
   {
-    return mpi_get_size (comm);
+    return mpi_get_comm_size (comm);
   }
 
 

diff --git a/src/spatial.cc b/src/spatial.cc
@@ -140,7 +140,7 @@ namespace MUSIC {
   : comm(c), indices (ind), type (type_)
   {
 
-	  nProcesses = mpi_get_size (comm);
+	  nProcesses = mpi_get_comm_size (comm);
 	  localRank = mpi_get_rank (comm);
 	  negotiateWidth ();
 

diff --git a/src/subconnector.cc b/src/subconnector.cc
@@ -116,7 +116,7 @@ namespace MUSIC {
 
 	MUSIC_LOGR ("Sending to rank " << remoteRank_);
 	MPI_Ssend (buffer,
-		   CONT_BUFFER_MAX / mpi_get_size (type_),
+		   CONT_BUFFER_MAX / mpi_get_type_size (type_),
 		   type_,
 		   remoteRank_,
 		   CONT_MSG,
@@ -126,7 +126,7 @@ namespace MUSIC {
       }
     MUSIC_LOGR ("Last send to rank " << remoteRank_);
     MPI_Ssend (buffer,
-	       size / mpi_get_size (type_),
+	       size / mpi_get_type_size (type_),
 	       type_,
 	       remoteRank_,
 	       CONT_MSG,
@@ -196,7 +196,7 @@ namespace MUSIC {
     char* data;
     MPI_Status status;
     int size, maxCount;
-    maxCount = CONT_BUFFER_MAX / mpi_get_size (type_);
+    maxCount = CONT_BUFFER_MAX / mpi_get_type_size (type_);
     do
       {
 	data = static_cast<char*> (buffer_.insertBlock ());
@@ -216,7 +216,7 @@ namespace MUSIC {
 	    return;
 	  }
 	MPI_Get_count (&status, type_, &size);
-	buffer_.trimBlock (mpi_get_size (type_) * size);
+	buffer_.trimBlock (mpi_get_type_size (type_) * size);
       }
     while (size == maxCount);
   }
@@ -747,7 +747,7 @@ namespace MUSIC {
   void
   CollectiveSubconnector::allocAllgathervArrays ()
   {
-    nProcesses = mpi_get_size (intracomm_);
+    nProcesses = mpi_get_comm_size (intracomm_);
     ppBytes = new int[nProcesses];
     displ = new int[nProcesses];
   }

diff --git a/src/temporal.cc b/src/temporal.cc
@@ -82,7 +82,7 @@ namespace MUSIC
   bool
   TemporalNegotiator::hasPeers ()
   {
-    return mpi_get_size (setup_->communicator ()) > 1;
+    return mpi_get_comm_size (setup_->communicator ()) > 1;
   }
 
 

diff --git a/testsuite/sanitytests/multiport.cc b/testsuite/sanitytests/multiport.cc
@@ -105,7 +105,7 @@ class OutputPort : public Port {
   {
     MPI_Comm comm = setup_->communicator ();
     int rank = MUSIC::mpi_get_rank (comm);
-    int nProcesses = MUSIC::mpi_get_size (comm);
+    int nProcesses = MUSIC::mpi_get_comm_size (comm);
 
     if (indextype == "global")
       type = MUSIC::Index::GLOBAL;
@@ -218,7 +218,7 @@ class InputPort : public Port {
   {
     MPI_Comm comm = setup_->communicator ();
     int rank = MUSIC::mpi_get_rank (comm);
-    int nProcesses = MUSIC::mpi_get_size (comm);
+    int nProcesses = MUSIC::mpi_get_comm_size (comm);
 
     if (imaptype == "linear")
       {
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,7 @@ namespace MUSIC @@
       bool
       TemporalNegotiator::hasPeers ()
       {
-        return mpi_get_size (setup_->communicator ()) > 1;
+        return mpi_get_comm_size (setup_->communicator ()) > 1;
       }
@@ Expand Down @@