ADI: remove MPID_Comm_get_lpid

This is fully replaced with MPIR_comm_rank_to_lpid or
MPIR_Group_rank_to_lpid.

Author: hzhou

src/mpi/coll/algorithms/treealgo/treeutil.c

@@ -504,10 +504,10 @@ static int MPII_Treeutil_hierarchy_populate(MPIR_Comm * comm, int rank, int nran
         MPIR_Assert(upper_level != NULL);
 
         /* Get wrank from the communicator as the coords are stored with wrank */
-        MPIR_Lpid temp = 0;
-        MPID_Comm_get_lpid(comm, r, &temp, FALSE);
-        int wrank = (int) temp;
-        if (wrank < 0)
+        MPIR_Lpid temp = MPIR_comm_rank_to_lpid(comm, r);
+        int world_idx = MPIR_LPID_WORLD_INDEX(temp);
+        int wrank = MPIR_LPID_WORLD_RANK(temp);
+        if (world_idx != 0)
             goto fn_fail;
         MPIR_Assert(0 <= wrank && wrank < MPIR_Process.size);
 

src/mpi/comm/comm_impl.c

@@ -73,8 +73,7 @@ static int comm_create_local_group(MPIR_Comm * comm_ptr)
     MPIR_Lpid *map = MPL_malloc(n * sizeof(MPIR_Lpid), MPL_MEM_GROUP);
 
     for (int i = 0; i < n; i++) {
-        mpi_errno = MPID_Comm_get_lpid(comm_ptr, i, &map[i], FALSE);
-        MPIR_ERR_CHECK(mpi_errno);
+        map[i] = MPIR_Group_rank_to_lpid(comm_ptr->local_group, i);
     }
 
     mpi_errno = MPIR_Group_create_map(n, comm_ptr->rank, comm_ptr->session_ptr, map,
@@ -238,8 +237,7 @@ int MPII_Comm_create_calculate_mapping(MPIR_Group * group_ptr,
             /* FIXME : BUBBLE SORT */
             mapping[i] = -1;
             for (j = 0; j < comm_ptr->local_size; j++) {
-                MPIR_Lpid comm_lpid;
-                MPID_Comm_get_lpid(comm_ptr, j, &comm_lpid, FALSE);
+                MPIR_Lpid comm_lpid = MPIR_Group_rank_to_lpid(comm_ptr->local_group, j);
                 if (comm_lpid == MPIR_Group_rank_to_lpid(group_ptr, i)) {
                     mapping[i] = j;
                     break;
@@ -918,8 +916,7 @@ int MPIR_Comm_remote_group_impl(MPIR_Comm * comm_ptr, MPIR_Group ** group_ptr)
         MPIR_Lpid *map = MPL_malloc(n * sizeof(MPIR_Lpid), MPL_MEM_GROUP);
 
         for (int i = 0; i < n; i++) {
-            mpi_errno = MPID_Comm_get_lpid(comm_ptr, i, &map[i], TRUE);
-            MPIR_ERR_CHECK(mpi_errno);
+            map[i] = MPIR_Group_rank_to_lpid(comm_ptr->remote_group, i);
         }
         mpi_errno = MPIR_Group_create_map(n, MPI_UNDEFINED, comm_ptr->session_ptr, map,
                                           &comm_ptr->remote_group);

src/mpid/ch3/include/mpidpost.h

@@ -192,7 +192,6 @@ int MPID_Intercomm_exchange(MPIR_Comm *local_comm_ptr, int local_leader,
                             int *remote_size, MPIR_Lpid **remote_lpids);
 int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr,
                                       int size, const MPIR_Lpid lpids[] );
-int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, MPIR_Lpid *lpid_ptr, bool is_remote);
 
 /* ULFM support */
 MPL_STATIC_INLINE_PREFIX int MPID_Comm_AS_enabled(MPIR_Comm * comm_ptr)

src/mpid/ch3/src/mpid_vc.c

@@ -222,25 +222,6 @@ int MPIDI_VCR_Dup(MPIDI_VCR orig_vcr, MPIDI_VCR * new_vcr)
     return MPI_SUCCESS;
 }
 
-/*@
-  MPID_Comm_get_lpid - Get the local process ID for a given VC reference
-  @*/
-int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, MPIR_Lpid *lpid_ptr, bool is_remote)
-{
-
-    MPIR_FUNC_ENTER;
-
-    if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM)
-        *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid;
-    else if (is_remote)
-        *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid;
-    else
-        *lpid_ptr = comm_ptr->dev.local_vcrt->vcr_table[idx]->lpid;
-
-    MPIR_FUNC_EXIT;
-    return MPI_SUCCESS;
-}
-
 /* 
  * The following routines convert to/from the global pids, which are 
  * represented as pairs of ints (process group id, rank in that process group)
@@ -363,13 +344,10 @@ int MPIDI_GPID_ToLpidArray( int size, MPIDI_Gpid in_gpid[], MPIR_Lpid lpid[] )
 static inline int MPIDI_LPID_GetAllInComm(MPIR_Comm *comm_ptr, int local_size,
                                           MPIR_Lpid local_lpids[])
 {
-    int i;
     int mpi_errno = MPI_SUCCESS;
     MPIR_Assert( comm_ptr->local_size == local_size );
-    for (i=0; i<comm_ptr->local_size; i++) {
-        MPIR_Lpid tmp_lpid;
-	mpi_errno |= MPID_Comm_get_lpid( comm_ptr, i, &tmp_lpid, FALSE );
-        local_lpids[i] = tmp_lpid;
+    for (int i=0; i<comm_ptr->local_size; i++) {
+        local_lpids[i] = comm_ptr->dev.vcrt->vcr_table[i]->lpid;
     }
     return mpi_errno;
 }

src/mpid/ch4/include/mpidch4.h

@@ -26,7 +26,6 @@ int MPID_Comm_get_all_failed_procs(MPIR_Comm *, MPIR_Group **, int);
 int MPID_Comm_revoke(MPIR_Comm *, int);
 int MPID_Comm_failure_ack(MPIR_Comm *);
 MPL_STATIC_INLINE_PREFIX int MPID_Comm_AS_enabled(MPIR_Comm *) MPL_STATIC_INLINE_SUFFIX;
-int MPID_Comm_get_lpid(MPIR_Comm *, int, MPIR_Lpid *, bool);
 int MPID_CS_finalize(void);
 int MPID_Finalize(void);
 int MPID_Get_universe_size(int *);

src/mpid/ch4/src/ch4_impl.h

@@ -389,7 +389,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDIU_valid_group_rank(MPIR_Comm * comm, int rank,
 
     MPIR_FUNC_ENTER;
 
-    MPID_Comm_get_lpid(comm, rank, &lpid, FALSE);
+    lpid = MPIR_comm_rank_to_lpid(comm, rank);
 
     for (z = 0; z < size; ++z) {
         if (lpid == MPIR_Group_rank_to_lpid(grp, z)) {

src/mpid/ch4/src/ch4_init.c

@@ -984,26 +984,6 @@ int MPID_Free_mem(void *user_buf)
     goto fn_exit;
 }
 
-int MPID_Comm_get_lpid(MPIR_Comm * comm_ptr, int idx, MPIR_Lpid * lpid_ptr, bool is_remote)
-{
-    int mpi_errno = MPI_SUCCESS;
-    int avtid = 0, lpid = 0;
-    MPIR_FUNC_ENTER;
-
-    if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM)
-        MPIDIU_comm_rank_to_pid(comm_ptr, idx, &lpid, &avtid);
-    else if (is_remote)
-        MPIDIU_comm_rank_to_pid(comm_ptr, idx, &lpid, &avtid);
-    else {
-        MPIDIU_comm_rank_to_pid_local(comm_ptr, idx, &lpid, &avtid);
-    }
-
-    *lpid_ptr = MPIDIU_GPID_CREATE(avtid, lpid);
-
-    MPIR_FUNC_EXIT;
-    return mpi_errno;
-}
-
 int MPID_Get_node_id(MPIR_Comm * comm, int rank, int *id_p)
 {
     int mpi_errno = MPI_SUCCESS;