[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-226-g8670745
Service Account
noreply at mpich.org
Fri Feb 26 15:29:31 CST 2016
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 8670745250d3d258b803b1e4f1628eaa334ba04f (commit)
from c07971228507a036a32ff2c6fcf8b5fe29069c52 (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/8670745250d3d258b803b1e4f1628eaa334ba04f
commit 8670745250d3d258b803b1e4f1628eaa334ba04f
Author: Yanfei Guo <yguo at anl.gov>
Date: Fri Feb 26 13:17:16 2016 -0600
Change MPID_Gpid to MPIR_Gpid.
The MPIR_ is the correct name space for GPID. The device specific part
is in this structure.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 73c5472..02147ba 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -1279,13 +1279,13 @@ typedef struct MPID_Comm {
} MPID_Comm;
extern MPIU_Object_alloc_t MPID_Comm_mem;
-typedef struct MPID_Gpid {
+typedef struct MPIR_Gpid {
#ifdef MPID_DEV_GPID_DECL
MPID_DEV_GPID_DECL
#else
int dummy; /* don't create an empty structure */
#endif
-}MPID_Gpid;
+}MPIR_Gpid;
/* this function should not be called by normal code! */
int MPIR_Comm_delete_internal(MPID_Comm * comm_ptr);
diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c
index 436293d..33867ad 100644
--- a/src/mpi/comm/intercomm_create.c
+++ b/src/mpi/comm/intercomm_create.c
@@ -127,7 +127,7 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader,
MPIU_Context_id_t final_context_id, recvcontext_id;
int remote_size, *remote_lpids=0, singlePG;
int local_size,*local_lpids=0;
- MPID_Gpid *local_gpids=NULL, *remote_gpids=NULL;
+ MPIR_Gpid *local_gpids=NULL, *remote_gpids=NULL;
int comm_info[3];
int is_low_group = 0;
int cts_tag;
@@ -177,18 +177,18 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader,
remote_size ));
/* With this information, we can now send and receive the
global process ids from the peer. */
- MPIU_CHKLMEM_MALLOC(remote_gpids,MPID_Gpid*,remote_size*sizeof(MPID_Gpid), mpi_errno,"remote_gpids");
+ MPIU_CHKLMEM_MALLOC(remote_gpids,MPIR_Gpid*,remote_size*sizeof(MPIR_Gpid), mpi_errno,"remote_gpids");
MPIU_CHKLMEM_MALLOC(remote_lpids,int*,remote_size*sizeof(int), mpi_errno,"remote_lpids");
- MPIU_CHKLMEM_MALLOC(local_gpids,MPID_Gpid*,local_size*sizeof(MPID_Gpid), mpi_errno,"local_gpids");
+ MPIU_CHKLMEM_MALLOC(local_gpids,MPIR_Gpid*,local_size*sizeof(MPIR_Gpid), mpi_errno,"local_gpids");
MPIU_CHKLMEM_MALLOC(local_lpids,int*,local_size*sizeof(int), mpi_errno,"local_lpids");
mpi_errno = MPID_GPID_GetAllInComm( local_comm_ptr, local_size, local_gpids, &singlePG );
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
/* Exchange the lpid arrays */
- mpi_errno = MPIC_Sendrecv( local_gpids, local_size*sizeof(MPID_Gpid), MPI_BYTE,
+ mpi_errno = MPIC_Sendrecv( local_gpids, local_size*sizeof(MPIR_Gpid), MPI_BYTE,
remote_leader, cts_tag,
- remote_gpids, remote_size*sizeof(MPID_Gpid), MPI_BYTE,
+ remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE,
remote_leader, cts_tag, peer_comm_ptr,
MPI_STATUS_IGNORE, &errflag );
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
@@ -262,7 +262,7 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader,
mpi_errno = MPIR_Bcast_impl( comm_info, 3, MPI_INT, local_leader, local_comm_ptr, &errflag );
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail");
- mpi_errno = MPIR_Bcast_impl( remote_gpids, remote_size*sizeof(MPID_Gpid), MPI_BYTE, local_leader,
+ mpi_errno = MPIR_Bcast_impl( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader,
local_comm_ptr, &errflag );
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail");
@@ -277,9 +277,9 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader,
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail");
remote_size = comm_info[0];
- MPIU_CHKLMEM_MALLOC(remote_gpids,MPID_Gpid*,remote_size*sizeof(MPID_Gpid), mpi_errno,"remote_gpids");
+ MPIU_CHKLMEM_MALLOC(remote_gpids,MPIR_Gpid*,remote_size*sizeof(MPIR_Gpid), mpi_errno,"remote_gpids");
MPIU_CHKLMEM_MALLOC(remote_lpids,int*,remote_size*sizeof(int), mpi_errno,"remote_lpids");
- mpi_errno = MPIR_Bcast_impl( remote_gpids, remote_size*sizeof(MPID_Gpid), MPI_BYTE, local_leader,
+ mpi_errno = MPIR_Bcast_impl( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader,
local_comm_ptr, &errflag );
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail");
@@ -302,7 +302,7 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader,
*/
#ifdef MPID_ICCREATE_REMOTECOMM_HOOK
MPID_ICCREATE_REMOTECOMM_HOOK( peer_comm_ptr, local_comm_ptr,
- remote_size, (const MPID_Gpid*)remote_gpids, local_leader );
+ remote_size, (const MPIR_Gpid*)remote_gpids, local_leader );
#endif
diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c
index 97345d0..3837c0c 100644
--- a/src/mpi/comm/intercomm_merge.c
+++ b/src/mpi/comm/intercomm_merge.c
@@ -101,19 +101,19 @@ int MPIR_Intercomm_merge_impl(MPID_Comm *comm_ptr, int high, MPID_Comm **new_int
we use the gpids of the rank 0 member of the local and remote
groups to choose an order in this case. */
if (local_high == remote_high) {
- MPID_Gpid ingpid, outgpid;
+ MPIR_Gpid ingpid, outgpid;
mpi_errno = MPID_GPID_Get( comm_ptr, 0, &ingpid );
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
- mpi_errno = MPIC_Sendrecv( &ingpid, sizeof(MPID_Gpid), MPI_BYTE, 0, 1,
- &outgpid, sizeof(MPID_Gpid), MPI_BYTE, 0, 1, comm_ptr,
+ mpi_errno = MPIC_Sendrecv( &ingpid, sizeof(MPIR_Gpid), MPI_BYTE, 0, 1,
+ &outgpid, sizeof(MPIR_Gpid), MPI_BYTE, 0, 1, comm_ptr,
MPI_STATUS_IGNORE, &errflag );
if (mpi_errno) MPIR_ERR_POP(mpi_errno);
/* Note that the gpids cannot be the same because we are
starting from a valid intercomm */
- int rc = memcmp(&ingpid,&outgpid,sizeof(MPID_Gpid));
+ int rc = memcmp(&ingpid,&outgpid,sizeof(MPIR_Gpid));
if(rc < 0)
local_high = 1;
else if(rc > 0)
diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h
index 0ce6cd9..5e97ecf 100644
--- a/src/mpid/ch3/include/mpidpost.h
+++ b/src/mpid/ch3/include/mpidpost.h
@@ -174,13 +174,13 @@ int MPIDI_CH3_Comm_connect(char * port_name, int root, MPID_Comm * comm_ptr,
/* Dynamic process support */
int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size,
- MPID_Gpid local_gpids[], int *singlePG );
-int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, MPID_Gpid *gpid );
-int MPID_GPID_ToLpidArray( int size, MPID_Gpid gpid[], int lpid[] );
+ MPIR_Gpid local_gpids[], int *singlePG );
+int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, MPIR_Gpid *gpid );
+int MPID_GPID_ToLpidArray( int size, MPIR_Gpid gpid[], int lpid[] );
int MPID_Create_intercomm_from_lpids( MPID_Comm *newcomm_ptr,
int size, const int lpids[] );
int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr,
- int nPGids, const MPID_Gpid gpids[],
+ int nPGids, const MPIR_Gpid gpids[],
int root );
/* PG_ForwardPGInfo is used as the implementation of the intercomm-create
hook that is needed with dynamic processes because of limitations
diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c
index 5f1dabc..a728a9b 100644
--- a/src/mpid/ch3/src/mpid_vc.c
+++ b/src/mpid/ch3/src/mpid_vc.c
@@ -328,7 +328,7 @@ int MPID_Comm_get_lpid(MPID_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL i
#undef FCNAME
#define FCNAME MPL_QUOTE(FUNCNAME)
int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size,
- MPID_Gpid local_gpids[], int *singlePG )
+ MPIR_Gpid local_gpids[], int *singlePG )
{
int mpi_errno = MPI_SUCCESS;
int i;
@@ -369,7 +369,7 @@ int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size,
#define FUNCNAME MPID_GPID_Get
#undef FCNAME
#define FCNAME MPL_QUOTE(FUNCNAME)
-int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, MPID_Gpid *in_gpid )
+int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, MPIR_Gpid *in_gpid )
{
int pgid;
MPIDI_VCR vc;
@@ -394,7 +394,7 @@ int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, MPID_Gpid *in_gpid )
#define FUNCNAME MPID_GPID_ToLpidArray
#undef FCNAME
#define FCNAME MPL_QUOTE(FUNCNAME)
-int MPID_GPID_ToLpidArray( int size, MPID_Gpid in_gpid[], int lpid[] )
+int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int lpid[] )
{
int i, mpi_errno = MPI_SUCCESS;
int pgid;
@@ -546,7 +546,7 @@ fn_fail:
#undef FCNAME
#define FCNAME MPL_QUOTE(FUNCNAME)
int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr,
- int nPGids, const MPID_Gpid in_gpids[],
+ int nPGids, const MPIR_Gpid in_gpids[],
int root )
{
int mpi_errno = MPI_SUCCESS;
-----------------------------------------------------------------------
Summary of changes:
src/include/mpiimpl.h | 4 ++--
src/mpi/comm/intercomm_create.c | 18 +++++++++---------
src/mpi/comm/intercomm_merge.c | 8 ++++----
src/mpid/ch3/include/mpidpost.h | 8 ++++----
src/mpid/ch3/src/mpid_vc.c | 8 ++++----
5 files changed, 23 insertions(+), 23 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list