[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-186-gcf631e1
Service Account
noreply at mpich.org
Wed Jul 8 09:15:30 CDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via cf631e1e71e8e1c6ea3aa1499331ddcdac78dd88 (commit)
via d0960b7439b800759df136e989bc5bc4165c24cb (commit)
from c5ee3a08c8458509849094a0c27a558b323e8ba4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/cf631e1e71e8e1c6ea3aa1499331ddcdac78dd88
commit cf631e1e71e8e1c6ea3aa1499331ddcdac78dd88
Author: Pavan Balaji <balaji at anl.gov>
Date: Mon Jul 6 23:17:20 2015 -0500
Get rid of unused lrank element in lrank_to_lpid structure.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 01cbe31..d3b491d 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -1030,7 +1030,6 @@ typedef struct MPID_Attribute {
/* This structure is used to implement the group operations such as
MPI_Group_translate_ranks */
typedef struct MPID_Group_pmap_t {
- int lrank; /* Local rank in group (between 0 and size-1) */
int lpid; /* local process id, from VCONN */
int next_lpid; /* Index of next lpid (in lpid order) */
int flag; /* marker, used to implement group operations */
diff --git a/src/mpi/comm/comm_group.c b/src/mpi/comm/comm_group.c
index 075e734..61b37f4 100644
--- a/src/mpi/comm/comm_group.c
+++ b/src/mpi/comm/comm_group.c
@@ -56,7 +56,6 @@ int MPIR_Comm_group_impl(MPID_Comm *comm_ptr, MPID_Group **group_ptr)
(*group_ptr)->is_local_dense_monotonic = TRUE;
for (i=0; i<n; i++) {
(void) MPID_VCR_Get_lpid( local_vcr[i], &lpid );
- (*group_ptr)->lrank_to_lpid[i].lrank = i;
(*group_ptr)->lrank_to_lpid[i].lpid = lpid;
if (lpid > comm_world_size ||
(i > 0 && (*group_ptr)->lrank_to_lpid[i-1].lpid != (lpid-1)))
diff --git a/src/mpi/comm/comm_remote_group.c b/src/mpi/comm/comm_remote_group.c
index c71e11c..86544a5 100644
--- a/src/mpi/comm/comm_remote_group.c
+++ b/src/mpi/comm/comm_remote_group.c
@@ -44,7 +44,6 @@ int MPIR_Comm_remote_group_impl(MPID_Comm *comm_ptr, MPID_Group **group_ptr)
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
for (i=0; i<n; i++) {
- (*group_ptr)->lrank_to_lpid[i].lrank = i;
(void) MPID_VCR_Get_lpid( comm_ptr->vcr[i], &lpid );
(*group_ptr)->lrank_to_lpid[i].lpid = lpid;
/* TODO calculate is_local_dense_monotonic */
diff --git a/src/mpi/group/group_difference.c b/src/mpi/group/group_difference.c
index 2232eea..7e8ccec 100644
--- a/src/mpi/group/group_difference.c
+++ b/src/mpi/group/group_difference.c
@@ -86,7 +86,6 @@ int MPIR_Group_difference_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, M
k = 0;
for (i=0; i<size1; i++) {
if (!group_ptr1->lrank_to_lpid[i].flag) {
- (*new_group_ptr)->lrank_to_lpid[k].lrank = k;
(*new_group_ptr)->lrank_to_lpid[k].lpid = group_ptr1->lrank_to_lpid[i].lpid;
if (i == group_ptr1->rank)
(*new_group_ptr)->rank = k;
diff --git a/src/mpi/group/group_excl.c b/src/mpi/group/group_excl.c
index c81cbd9..bf33ae1 100644
--- a/src/mpi/group/group_excl.c
+++ b/src/mpi/group/group_excl.c
@@ -57,7 +57,6 @@ int MPIR_Group_excl_impl(MPID_Group *group_ptr, int n, const int ranks[], MPID_G
newi = 0;
for (i = 0; i < size; i++) {
if (group_ptr->lrank_to_lpid[i].flag == 0) {
- (*new_group_ptr)->lrank_to_lpid[newi].lrank = newi;
(*new_group_ptr)->lrank_to_lpid[newi].lpid = group_ptr->lrank_to_lpid[i].lpid;
if (group_ptr->rank == i)
(*new_group_ptr)->rank = newi;
diff --git a/src/mpi/group/group_incl.c b/src/mpi/group/group_incl.c
index 913dc27..4ed64d9 100644
--- a/src/mpi/group/group_incl.c
+++ b/src/mpi/group/group_incl.c
@@ -49,7 +49,6 @@ int MPIR_Group_incl_impl(MPID_Group *group_ptr, int n, const int ranks[], MPID_G
(*new_group_ptr)->rank = MPI_UNDEFINED;
for (i = 0; i < n; i++) {
- (*new_group_ptr)->lrank_to_lpid[i].lrank = i;
(*new_group_ptr)->lrank_to_lpid[i].lpid = group_ptr->lrank_to_lpid[ranks[i]].lpid;
if (ranks[i] == group_ptr->rank)
(*new_group_ptr)->rank = i;
diff --git a/src/mpi/group/group_intersection.c b/src/mpi/group/group_intersection.c
index 7f662d7..0deea2a 100644
--- a/src/mpi/group/group_intersection.c
+++ b/src/mpi/group/group_intersection.c
@@ -82,7 +82,6 @@ int MPIR_Group_intersection_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2,
for (i = 0; i < size1; i++) {
if (group_ptr1->lrank_to_lpid[i].flag) {
int lpid = group_ptr1->lrank_to_lpid[i].lpid;
- (*new_group_ptr)->lrank_to_lpid[k].lrank = k;
(*new_group_ptr)->lrank_to_lpid[k].lpid = lpid;
if (i == group_ptr1->rank)
(*new_group_ptr)->rank = k;
diff --git a/src/mpi/group/group_range_excl.c b/src/mpi/group/group_range_excl.c
index 9950217..0de4457 100644
--- a/src/mpi/group/group_range_excl.c
+++ b/src/mpi/group/group_range_excl.c
@@ -91,7 +91,6 @@ int MPIR_Group_range_excl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MP
k = 0;
for (i = 0; i < size; i++) {
if (!group_ptr->lrank_to_lpid[i].flag) {
- (*new_group_ptr)->lrank_to_lpid[k].lrank = k;
(*new_group_ptr)->lrank_to_lpid[k].lpid = group_ptr->lrank_to_lpid[i].lpid;
if (group_ptr->rank == i) {
(*new_group_ptr)->rank = k;
diff --git a/src/mpi/group/group_range_incl.c b/src/mpi/group/group_range_incl.c
index 9cace13..f230c4f 100644
--- a/src/mpi/group/group_range_incl.c
+++ b/src/mpi/group/group_range_incl.c
@@ -65,7 +65,6 @@ int MPIR_Group_range_incl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MP
first = ranges[i][0]; last = ranges[i][1]; stride = ranges[i][2];
if (stride > 0) {
for (j=first; j<=last; j += stride) {
- (*new_group_ptr)->lrank_to_lpid[k].lrank = k;
(*new_group_ptr)->lrank_to_lpid[k].lpid =
group_ptr->lrank_to_lpid[j].lpid;
if (j == group_ptr->rank)
@@ -75,7 +74,6 @@ int MPIR_Group_range_incl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MP
}
else {
for (j=first; j>=last; j += stride) {
- (*new_group_ptr)->lrank_to_lpid[k].lrank = k;
(*new_group_ptr)->lrank_to_lpid[k].lpid =
group_ptr->lrank_to_lpid[j].lpid;
if (j == group_ptr->rank)
diff --git a/src/mpi/group/group_translate_ranks.c b/src/mpi/group/group_translate_ranks.c
index d0f9e3f..6e794c3 100644
--- a/src/mpi/group/group_translate_ranks.c
+++ b/src/mpi/group/group_translate_ranks.c
@@ -96,7 +96,7 @@ int MPIR_Group_translate_ranks_impl(MPID_Group *gp1, int n, const int ranks1[],
l2_pid = -1;
}
if (l1_pid == l2_pid)
- ranks2[i] = gp2->lrank_to_lpid[g2_idx].lrank;
+ ranks2[i] = g2_idx;
}
}
}
diff --git a/src/mpi/group/group_union.c b/src/mpi/group/group_union.c
index bf655ad..97e9554 100644
--- a/src/mpi/group/group_union.c
+++ b/src/mpi/group/group_union.c
@@ -106,7 +106,6 @@ int MPIR_Group_union_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_G
/* Add group1 */
size1 = group_ptr1->size;
for (i = 0; i < size1; i++) {
- (*new_group_ptr)->lrank_to_lpid[i].lrank = i;
(*new_group_ptr)->lrank_to_lpid[i].lpid =
group_ptr1->lrank_to_lpid[i].lpid;
}
@@ -123,7 +122,6 @@ int MPIR_Group_union_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_G
k = size1;
for (i = 0; i < size2; i++) {
if (group_ptr2->lrank_to_lpid[i].flag) {
- (*new_group_ptr)->lrank_to_lpid[k].lrank = k;
(*new_group_ptr)->lrank_to_lpid[k].lpid = group_ptr2->lrank_to_lpid[i].lpid;
if ((*new_group_ptr)->rank == MPI_UNDEFINED &&
group_ptr2->lrank_to_lpid[i].lpid == mylpid)
diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c
index bd452ea..ff2ce39 100644
--- a/src/mpi/group/grouputil.c
+++ b/src/mpi/group/grouputil.c
@@ -390,7 +390,6 @@ int MPIR_GroupCheckVCRSubset( MPID_Group *group_ptr, int vsize, MPID_VCR *vcr )
/* Initialize the vmap */
for (i=0; i<vsize; i++) {
MPID_VCR_Get_lpid( vcr[i], &vmap[i].lpid );
- vmap[i].lrank = i;
vmap[i].next_lpid = 0;
vmap[i].flag = 0;
}
http://git.mpich.org/mpich.git/commitdiff/d0960b7439b800759df136e989bc5bc4165c24cb
commit d0960b7439b800759df136e989bc5bc4165c24cb
Author: Pavan Balaji <balaji at anl.gov>
Date: Mon Jul 6 17:58:09 2015 -0500
Remove unused parameter.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index a6cf10d..01cbe31 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -1114,7 +1114,7 @@ extern MPID_Group * const MPID_Group_empty;
do { MPIU_Object_release_ref( _group, _inuse ); } while (0)
void MPIR_Group_setup_lpid_list( MPID_Group * );
-int MPIR_GroupCheckVCRSubset( MPID_Group *group_ptr, int vsize, MPID_VCR *vcr, int *idx );
+int MPIR_GroupCheckVCRSubset( MPID_Group *group_ptr, int vsize, MPID_VCR *vcr );
/* ------------------------------------------------------------------------- */
diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c
index 9d9f100..87f31c9 100644
--- a/src/mpi/comm/comm_create.c
+++ b/src/mpi/comm/comm_create.c
@@ -125,8 +125,7 @@ int MPIR_Comm_create_calculate_mapping(MPID_Group *group_ptr,
{
MPID_BEGIN_ERROR_CHECKS;
{
- int idx;
- mpi_errno = MPIR_GroupCheckVCRSubset( group_ptr, vcr_size, vcr, &idx );
+ mpi_errno = MPIR_GroupCheckVCRSubset( group_ptr, vcr_size, vcr );
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
}
MPID_END_ERROR_CHECKS;
diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c
index da427ee..bd452ea 100644
--- a/src/mpi/group/grouputil.c
+++ b/src/mpi/group/grouputil.c
@@ -375,8 +375,7 @@ int MPIR_Group_check_valid_ranges( MPID_Group *group_ptr,
We sort the lpids for the group and the vcr. If the group has an
lpid that is not in the vcr, then report an error.
*/
-int MPIR_GroupCheckVCRSubset( MPID_Group *group_ptr, int vsize, MPID_VCR *vcr,
- int *idx )
+int MPIR_GroupCheckVCRSubset( MPID_Group *group_ptr, int vsize, MPID_VCR *vcr )
{
int mpi_errno = MPI_SUCCESS;
int g1_idx, g2_idx, l1_pid, l2_pid, i;
-----------------------------------------------------------------------
Summary of changes:
src/include/mpiimpl.h | 3 +--
src/mpi/comm/comm_create.c | 3 +--
src/mpi/comm/comm_group.c | 1 -
src/mpi/comm/comm_remote_group.c | 1 -
src/mpi/group/group_difference.c | 1 -
src/mpi/group/group_excl.c | 1 -
src/mpi/group/group_incl.c | 1 -
src/mpi/group/group_intersection.c | 1 -
src/mpi/group/group_range_excl.c | 1 -
src/mpi/group/group_range_incl.c | 2 --
src/mpi/group/group_translate_ranks.c | 2 +-
src/mpi/group/group_union.c | 2 --
src/mpi/group/grouputil.c | 4 +---
13 files changed, 4 insertions(+), 19 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list