misc: use the new group rank/lpid conversion routines

For most external usages, we only need MPIR_Group_rank_to_lpid.

Author: hzhou

src/mpi/comm/comm_impl.c

@@ -224,7 +224,7 @@ int MPII_Comm_create_calculate_mapping(MPIR_Group * group_ptr,
         subsetOfWorld = 1;
         wsize = MPIR_Process.size;
         for (i = 0; i < n; i++) {
-            uint64_t g_lpid = group_ptr->lrank_to_lpid[i].lpid;
+            MPIR_Lpid g_lpid = MPIR_Group_rank_to_lpid(group_ptr, i);
 
             /* This mapping is relative to comm world */
             MPL_DBG_MSG_FMT(MPIR_DBG_COMM, VERBOSE,
@@ -261,7 +261,7 @@ int MPII_Comm_create_calculate_mapping(MPIR_Group * group_ptr,
             for (j = 0; j < comm_ptr->local_size; j++) {
                 uint64_t comm_lpid;
                 MPID_Comm_get_lpid(comm_ptr, j, &comm_lpid, FALSE);
-                if (comm_lpid == group_ptr->lrank_to_lpid[i].lpid) {
+                if (comm_lpid == MPIR_Group_rank_to_lpid(group_ptr, i)) {
                     mapping[i] = j;
                     break;
                 }
@@ -795,7 +795,7 @@ int MPIR_Intercomm_create_from_groups_impl(MPIR_Group * local_group_ptr, int loc
 
     int tag = get_tag_from_stringtag(stringtag);
     /* FIXME: ensure lpid is from comm_world */
-    uint64_t remote_lpid = remote_group_ptr->lrank_to_lpid[remote_leader].lpid;
+    MPIR_Lpid remote_lpid = MPIR_Group_rank_to_lpid(remote_group_ptr, remote_leader);
     MPIR_Assert(remote_lpid < MPIR_Process.size);
     mpi_errno = MPIR_Intercomm_create_impl(local_comm, local_leader,
                                            MPIR_Process.comm_world, (int) remote_lpid,

src/mpid/ch3/src/ch3u_comm.c

@@ -512,7 +512,7 @@ static int nonempty_intersection(MPIR_Comm *comm, MPIR_Group *group, int *flag)
 
     for (i_g = 0; i_g < group->size; ++i_g) {
         /* FIXME: This won't work for dynamic procs */
-        MPIDI_PG_Get_vc(MPIDI_Process.my_pg, group->lrank_to_lpid[i_g].lpid, &vc_g);
+        MPIDI_PG_Get_vc(MPIDI_Process.my_pg, MPIR_Group_rank_to_lpid(group, i_g), &vc_g);
         for (i_c = 0; i_c < comm->remote_size; ++i_c) {
             MPIDI_Comm_get_vc(comm, i_c, &vc_c);
             if (vc_g == vc_c) {

src/mpid/ch3/src/ch3u_handle_connection.c

@@ -372,7 +372,7 @@ static int terminate_failed_VCs(MPIR_Group *new_failed_group)
         MPIDI_VC_t *vc;
         /* terminate the VC */
         /* FIXME: This won't work for dynamic procs */
-        MPIDI_PG_Get_vc(MPIDI_Process.my_pg, new_failed_group->lrank_to_lpid[i].lpid, &vc);
+        MPIDI_PG_Get_vc(MPIDI_Process.my_pg, MPIR_Group_rank_to_lpid(new_failed_group, i), &vc);
         mpi_errno = MPIDI_CH3_Connection_terminate(vc);
         MPIR_ERR_CHECK(mpi_errno);
     }

src/mpid/ch4/src/ch4_impl.h

@@ -387,7 +387,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDIU_valid_group_rank(MPIR_Comm * comm, int rank,
 
     MPIDI_NM_comm_get_gpid(comm, rank, &gpid, FALSE);
 
-    for (z = 0; z < size && gpid != grp->lrank_to_lpid[z].lpid; ++z) {
+    for (z = 0; z < size; ++z) {
+        if (gpid == MPIR_Group_rank_to_lpid(grp, z)) {
+            break;
+        }
     }
 
     ret = (z < size);