[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-149-gb9ce079
Service Account
noreply at mpich.org
Fri Apr 11 17:06:00 CDT 2014
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 b9ce079a6621faed2a8ac560af2fd8e0ab09a242 (commit)
via fcdd7785beed5ea77c9641498784a6c543805b91 (commit)
via 8996387dd487b5c9fa6610c1c5f3fed1cd790c05 (commit)
via e824524f679bef5237c7336aa10f3681d5166149 (commit)
via 136e2e5ac70d018908e553f4d1f31c182247ccb6 (commit)
via 37e06c1cff6474c307ea037109d039d6dcf9a6f6 (commit)
via 46d51d517c3dd1e225acf7c09f8211f3775ca03f (commit)
from ba2493db4f8afd10507cce3a61c1a44764f0fcae (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/b9ce079a6621faed2a8ac560af2fd8e0ab09a242
commit b9ce079a6621faed2a8ac560af2fd8e0ab09a242
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Wed Mar 12 15:06:23 2014 -0500
Fix compiler warning about missing fncn prototype
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h
index a3a5c31..099e76d 100644
--- a/src/mpid/ch3/include/mpidimpl.h
+++ b/src/mpid/ch3/include/mpidimpl.h
@@ -1217,6 +1217,9 @@ int MPIDI_Win_sync(MPID_Win *win);
void *MPIDI_Alloc_mem(size_t size, MPID_Info *info_ptr);
int MPIDI_Free_mem(void *ptr);
+/* Pvars */
+void MPIDI_CH3_RMA_Init_Pvars(void);
+
/* internal */
int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr);
int MPIDI_CH3I_Try_acquire_win_lock(MPID_Win * win_ptr, int requested_lock);
diff --git a/src/mpid/ch3/src/ch3u_rma_acc_ops.c b/src/mpid/ch3/src/ch3u_rma_acc_ops.c
index eafa2ee..b0b5e54 100644
--- a/src/mpid/ch3/src/ch3u_rma_acc_ops.c
+++ b/src/mpid/ch3/src/ch3u_rma_acc_ops.c
@@ -8,7 +8,6 @@
MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_alloc);
MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_set);
-extern void MPIDI_CH3_RMA_Init_Pvars(void);
#undef FUNCNAME
#define FUNCNAME MPIDI_Get_accumulate
diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c
index e45fddd..f30c464 100644
--- a/src/mpid/ch3/src/ch3u_rma_ops.c
+++ b/src/mpid/ch3/src/ch3u_rma_ops.c
@@ -10,7 +10,6 @@ static int enableShortACC=1;
MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_alloc);
MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_set);
-extern void MPIDI_CH3_RMA_Init_Pvars(void);
#define MPIDI_PASSIVE_TARGET_DONE_TAG 348297
#define MPIDI_PASSIVE_TARGET_RMA_TAG 563924
diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c
index 8183a71..caaebe6 100644
--- a/src/mpid/ch3/src/mpid_rma.c
+++ b/src/mpid/ch3/src/mpid_rma.c
@@ -16,8 +16,6 @@ MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_winfree_complete);
MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_alloc);
MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_set);
-extern void MPIDI_CH3_RMA_Init_Pvars(void);
-
static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model,
MPID_Comm *comm_ptr, MPID_Win **win_ptr);
http://git.mpich.org/mpich.git/commitdiff/fcdd7785beed5ea77c9641498784a6c543805b91
commit fcdd7785beed5ea77c9641498784a6c543805b91
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Tue Jan 21 16:04:54 2014 -0600
Compiler complains about uninitialized variable
Fixes compiler warnings in ch3u_rma_ops.c and ch3u_rma_acc_ops.c. Complains
were about "orig_vc" and "target_vc" of potentially being unused. This is a
false positive, as the conditional statements were correct. Warning fixed by just
initializing the pointers to NULL. gcc 4.6.3 complained in stomp, whereas gcc
4.7.4 did not on my laptop.
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/mpid/ch3/src/ch3u_rma_acc_ops.c b/src/mpid/ch3/src/ch3u_rma_acc_ops.c
index cc5ec8f..eafa2ee 100644
--- a/src/mpid/ch3/src/ch3u_rma_acc_ops.c
+++ b/src/mpid/ch3/src/ch3u_rma_acc_ops.c
@@ -25,7 +25,7 @@ int MPIDI_Get_accumulate(const void *origin_addr, int origin_count,
int dt_contig ATTRIBUTE((unused));
MPI_Aint dt_true_lb ATTRIBUTE((unused));
MPID_Datatype *dtp;
- MPIDI_VC_t *orig_vc, *target_vc;
+ MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_GET_ACCUMULATE);
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_GET_ACCUMULATE);
@@ -140,7 +140,7 @@ int MPIDI_Compare_and_swap(const void *origin_addr, const void *compare_addr,
{
int mpi_errno = MPI_SUCCESS;
int rank;
- MPIDI_VC_t *orig_vc, *target_vc;
+ MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_COMPARE_AND_SWAP);
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_COMPARE_AND_SWAP);
@@ -233,7 +233,7 @@ int MPIDI_Fetch_and_op(const void *origin_addr, void *result_addr,
{
int mpi_errno = MPI_SUCCESS;
int rank;
- MPIDI_VC_t *orig_vc, *target_vc;
+ MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_FETCH_AND_OP);
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_FETCH_AND_OP);
diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c
index eda8201..e45fddd 100644
--- a/src/mpid/ch3/src/ch3u_rma_ops.c
+++ b/src/mpid/ch3/src/ch3u_rma_ops.c
@@ -122,7 +122,7 @@ int MPIDI_Put(const void *origin_addr, int origin_count, MPI_Datatype
MPID_Datatype *dtp;
MPI_Aint dt_true_lb ATTRIBUTE((unused));
MPIDI_msg_sz_t data_sz;
- MPIDI_VC_t *orig_vc, *target_vc;
+ MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_PUT);
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_PUT);
@@ -234,7 +234,7 @@ int MPIDI_Get(void *origin_addr, int origin_count, MPI_Datatype
int dt_contig ATTRIBUTE((unused)), rank;
MPI_Aint dt_true_lb ATTRIBUTE((unused));
MPID_Datatype *dtp;
- MPIDI_VC_t *orig_vc, *target_vc;
+ MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_GET);
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_GET);
@@ -344,7 +344,7 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype
int dt_contig ATTRIBUTE((unused)), rank;
MPI_Aint dt_true_lb ATTRIBUTE((unused));
MPID_Datatype *dtp;
- MPIDI_VC_t *orig_vc, *target_vc;
+ MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_ACCUMULATE);
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_ACCUMULATE);
http://git.mpich.org/mpich.git/commitdiff/8996387dd487b5c9fa6610c1c5f3fed1cd790c05
commit 8996387dd487b5c9fa6610c1c5f3fed1cd790c05
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Tue Jan 21 15:26:58 2014 -0600
Fix Intel compiler warnings in fdebug.c
Those were related to pragma weak alias without previous external definitions.
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/binding/fortran/mpif_h/fdebug.c b/src/binding/fortran/mpif_h/fdebug.c
index 8171eb1..811d893 100644
--- a/src/binding/fortran/mpif_h/fdebug.c
+++ b/src/binding/fortran/mpif_h/fdebug.c
@@ -19,6 +19,28 @@ void mpir_is_statuses_ignore_( void *a, int *ierr );
void mpir_is_errcodes_ignore_( void *a, int *ierr );
void mpir_is_argvs_null_( void *a, int *ierr );
+extern void MPIR_IS_BOTTOM( void *a, int *ierr );
+extern void mpir_is_bottom( void *a, int *ierr );
+extern void mpir_is_bottom__( void *a, int *ierr );
+extern void MPIR_IS_IN_PLACE( void *a, int *ierr );
+extern void mpir_is_in_place( void *a, int *ierr );
+extern void mpir_is_in_place__( void *a, int *ierr );
+extern void MPIR_IS_UNWEIGHTED( void *a, int *ierr );
+extern void mpir_is_unweighted( void *a, int *ierr );
+extern void mpir_is_unweighted__( void *a, int *ierr );
+extern void MPIR_IS_STATUS_IGNORE( void *a, int *ierr );
+extern void mpir_is_status_ignore( void *a, int *ierr );
+extern void mpir_is_status_ignore__( void *a, int *ierr );
+extern void MPIR_IS_STATUSES_IGNORE( void *a, int *ierr );
+extern void mpir_is_statuses_ignore( void *a, int *ierr );
+extern void mpir_is_statuses_ignore__( void *a, int *ierr );
+extern void MPIR_IS_ERRCODES_IGNORE( void *a, int *ierr );
+extern void mpir_is_errcodes_ignore( void *a, int *ierr );
+extern void mpir_is_errcodes_ignore__( void *a, int *ierr );
+extern void MPIR_IS_ARGVS_NULL( void *a, int *ierr );
+extern void mpir_is_argvs_null( void *a, int *ierr );
+extern void mpir_is_argvs_null__( void *a, int *ierr );
+
#pragma weak MPIR_IS_BOTTOM = mpir_is_bottom_
#pragma weak mpir_is_bottom = mpir_is_bottom_
#pragma weak mpir_is_bottom__ = mpir_is_bottom_
http://git.mpich.org/mpich.git/commitdiff/e824524f679bef5237c7336aa10f3681d5166149
commit e824524f679bef5237c7336aa10f3681d5166149
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Tue Jan 21 14:34:52 2014 -0600
Fix incorrect declaration of string pointer
Fixes complain by icc
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c
index 526399e..d4cb084 100644
--- a/src/mpi/debugger/dll_mpich.c
+++ b/src/mpi/debugger/dll_mpich.c
@@ -956,7 +956,7 @@ static int rebuild_communicator_list (mqs_process *proc)
int send_ctx = fetch_int16 (proc, comm_base+i_info->comm_context_id_offs, p_info);
communicator_t *old = find_communicator (p_info, comm_base, recv_ctx);
- char *name = (char *)"--unnamed--";
+ const char *name = "--unnamed--";
char namebuffer[64];
/* In MPICH, the name is preallocated and of size MPI_MAX_OBJECT_NAME */
if (dbgr_fetch_data( proc, comm_base+i_info->comm_name_offs,64,
http://git.mpich.org/mpich.git/commitdiff/136e2e5ac70d018908e553f4d1f31c182247ccb6
commit 136e2e5ac70d018908e553f4d1f31c182247ccb6
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Tue Jan 21 14:29:06 2014 -0600
Fixed obsolete string format conversion
Complained by icc
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/common/ad_read_coll.c b/src/mpi/romio/adio/common/ad_read_coll.c
index 0eb8d90..35090a4 100644
--- a/src/mpi/romio/adio/common/ad_read_coll.c
+++ b/src/mpi/romio/adio/common/ad_read_coll.c
@@ -361,7 +361,7 @@ void ADIOI_Calc_my_off_len(ADIO_File fd, int bufcount, MPI_Datatype
int ii;
DBG_FPRINTF(stderr, "flattened %3lld : ", flat_file->count );
for (ii=0; ii<flat_file->count; ii++) {
- DBG_FPRINTF(stderr, "%16qd:%-16qd", flat_file->indices[ii], flat_file->blocklens[ii] );
+ DBG_FPRINTF(stderr, "%16lld:%-16lld", flat_file->indices[ii], flat_file->blocklens[ii] );
}
DBG_FPRINTF(stderr, "\n" );
}
http://git.mpich.org/mpich.git/commitdiff/37e06c1cff6474c307ea037109d039d6dcf9a6f6
commit 37e06c1cff6474c307ea037109d039d6dcf9a6f6
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Mon Jan 20 17:19:47 2014 -0600
Linker warning multiple common of 'HYD_pmcd_pmip'
The variable is declared as external in pmip.h, but defined in three
different files. The linker warns that it's actually merging them. If we
want to use an only variable declared as 'extern', it should be only
defined in one place. This commit removes two out of the three
declarations. See #1966.
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/pm/hydra/pm/pmiserv/pmip_cb.c b/src/pm/hydra/pm/pmiserv/pmip_cb.c
index 6880df8..906fdcd 100644
--- a/src/pm/hydra/pm/pmiserv/pmip_cb.c
+++ b/src/pm/hydra/pm/pmiserv/pmip_cb.c
@@ -12,7 +12,6 @@
#include "topo.h"
#include "hydt_ftb.h"
-struct HYD_pmcd_pmip HYD_pmcd_pmip;
struct HYD_pmcd_pmip_pmi_handle *HYD_pmcd_pmip_pmi_handle = { 0 };
static int pmi_storage_len = 0;
diff --git a/src/pm/hydra/pm/pmiserv/pmip_utils.c b/src/pm/hydra/pm/pmiserv/pmip_utils.c
index bfac58f..e1fa33a 100644
--- a/src/pm/hydra/pm/pmiserv/pmip_utils.c
+++ b/src/pm/hydra/pm/pmiserv/pmip_utils.c
@@ -11,7 +11,6 @@
#include "demux.h"
#include "hydra.h"
-struct HYD_pmcd_pmip HYD_pmcd_pmip;
void HYD_pmcd_pmip_send_signal(int sig)
{
http://git.mpich.org/mpich.git/commitdiff/46d51d517c3dd1e225acf7c09f8211f3775ca03f
commit 46d51d517c3dd1e225acf7c09f8211f3775ca03f
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Mon Jan 20 16:12:44 2014 -0600
Fix compilation warning in bcast.c
Fixes the following warning when --enable-fast is enabled:
src/mpi/coll/bcast.c:1012:23: warning: suggest braces around empty body
in an 'if' statement [-Wempty-body]
See #1966.
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c
index ce3be85..59e0396 100644
--- a/src/mpi/coll/bcast.c
+++ b/src/mpi/coll/bcast.c
@@ -1008,8 +1008,9 @@ static int MPIR_SMP_Bcast(
MPI_Status status;
int recvd_size;
- if (!MPIR_CVAR_ENABLE_SMP_COLLECTIVES || !MPIR_CVAR_ENABLE_SMP_BCAST)
+ if (!MPIR_CVAR_ENABLE_SMP_COLLECTIVES || !MPIR_CVAR_ENABLE_SMP_BCAST) {
MPIU_Assert(0);
+ }
MPIU_Assert(MPIR_Comm_is_node_aware(comm_ptr));
is_homogeneous = 1;
-----------------------------------------------------------------------
Summary of changes:
src/binding/fortran/mpif_h/fdebug.c | 22 ++++++++++++++++++++++
src/mpi/coll/bcast.c | 3 ++-
src/mpi/debugger/dll_mpich.c | 2 +-
src/mpi/romio/adio/common/ad_read_coll.c | 2 +-
src/mpid/ch3/include/mpidimpl.h | 3 +++
src/mpid/ch3/src/ch3u_rma_acc_ops.c | 7 +++----
src/mpid/ch3/src/ch3u_rma_ops.c | 7 +++----
src/mpid/ch3/src/mpid_rma.c | 2 --
src/pm/hydra/pm/pmiserv/pmip_cb.c | 1 -
src/pm/hydra/pm/pmiserv/pmip_utils.c | 1 -
10 files changed, 35 insertions(+), 15 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list