[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-67-g4b2433e
Service Account
noreply at mpich.org
Mon Mar 24 14:34:24 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 4b2433e9a1b27aa595f8f52c6d4c5c265d10714f (commit)
via 11e961e66c0dfa362847dffef012293dbd27c412 (commit)
via 8a87ad775770ee5c49d523f02309fd109318b730 (commit)
via d4472888894365a1785805d43bdbde0e14cd4692 (commit)
from f4a63c1bb1f90b122264cf37af08e13e3271dcde (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/4b2433e9a1b27aa595f8f52c6d4c5c265d10714f
commit 4b2433e9a1b27aa595f8f52c6d4c5c265d10714f
Author: Rob Latham <robl at mcs.anl.gov>
Date: Fri Mar 14 08:42:04 2014 -0500
warning cleanup: non-void function explicit return
Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>
diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c
index a9350c2..b3e5516 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c
@@ -77,7 +77,7 @@ MPID_Rput(const void *origin_addr,
target_disp, target_count,
target_datatype, win);
MPID_assert(mpi_errno == MPI_SUCCESS);
-
+ return (mpi_errno);
}
@@ -135,6 +135,7 @@ MPID_Rget(void *origin_addr,
target_disp, target_count,
target_datatype, win);
MPID_assert(mpi_errno == MPI_SUCCESS);
+ return(mpi_errno);
}
/**
@@ -201,7 +202,7 @@ MPID_Raccumulate(const void *origin_addr,
target_disp, target_count,
target_datatype, op, win);
MPID_assert(mpi_errno == MPI_SUCCESS);
-
+ return(mpi_errno);
}
@@ -274,5 +275,6 @@ MPID_Rget_accumulate(const void *origin_addr,
target_count, target_datatype,
op, win);
MPID_assert(mpi_errno == MPI_SUCCESS);
+ return (mpi_errno);
}
http://git.mpich.org/mpich.git/commitdiff/11e961e66c0dfa362847dffef012293dbd27c412
commit 11e961e66c0dfa362847dffef012293dbd27c412
Author: Rob Latham <robl at mcs.anl.gov>
Date: Fri Mar 14 08:41:39 2014 -0500
warning fixup: clean up casting
Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>
diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
index 993d1a2..4ce53d9 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
@@ -285,7 +285,7 @@ MPID_getSharedSegment(MPI_Aint size,
MPIU_ERR_CHKANDJUMP((shm_id == -1), mpi_errno, MPI_ERR_RMA_SHARED, "**rmashared");
win->mpid.shm->base_addr = (void *) shmat(shm_id,0,0);
MPIU_ERR_CHKANDJUMP((win->mpid.shm->base_addr == NULL), mpi_errno,MPI_ERR_BUFFER, "**bufnull");
- GetPageSize((void *) win->mpid.shm->base_addr, &pageSize2);
+ GetPageSize((void *) win->mpid.shm->base_addr, (ulong*)&pageSize2);
MPID_assert(pageSize == pageSize2);
/* set mutex_lock address and initialize it */
win->mpid.shm->mutex_lock = (pthread_mutex_t *) win->mpid.shm->base_addr;
@@ -399,7 +399,7 @@ MPID_Win_allocate_shared(MPI_Aint size,
win->mpid.shm = MPIU_Malloc(sizeof(MPIDI_Win_shm_t));
win->mpid.shm->allocated=0;
MPID_assert(win->mpid.shm != NULL);
- MPID_getSharedSegment(size, disp_unit,comm_ptr,baseP, win_ptr,(ulong *)&pageSize,(int *)&noncontig);
+ MPID_getSharedSegment(size, disp_unit,comm_ptr,baseP, win_ptr,&pageSize,&noncontig);
winfo = &win->mpid.info[rank];
winfo->win = win;
http://git.mpich.org/mpich.git/commitdiff/8a87ad775770ee5c49d523f02309fd109318b730
commit 8a87ad775770ee5c49d523f02309fd109318b730
Author: Rob Latham <robl at mcs.anl.gov>
Date: Thu Mar 13 21:57:21 2014 -0500
warning cleanup: clarify = and == in conditional
Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>
diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
index d7dbc27..993d1a2 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
@@ -72,7 +72,7 @@ int CheckSpaceType(MPID_Win **win_ptr, MPID_Info *info,int *noncontig) {
char alloc_shared_nctg_value[MPI_MAX_INFO_VAL+1];
MPIR_Info_get_impl(info, "alloc_shared_noncontig", MPI_MAX_INFO_VAL,
alloc_shared_nctg_value, &alloc_shared_nctg_flag);
- if ((alloc_shared_nctg_flag == 1)) {
+ if (alloc_shared_nctg_flag == 1) {
if (!strncmp(alloc_shared_nctg_value, "true", strlen("true")))
(*win_ptr)->mpid.info_args.alloc_shared_noncontig = 1;
if (!strncmp(alloc_shared_nctg_value, "false", strlen("false")))
diff --git a/src/mpid/pamid/src/onesided/mpid_win_lock_all.c b/src/mpid/pamid/src/onesided/mpid_win_lock_all.c
index 5fdf67f..fcd5be0 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_lock_all.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_lock_all.c
@@ -100,7 +100,7 @@ MPID_Win_lock_all(int assert,
size = (MPIR_Comm_size(win->comm_ptr));
win->mpid.max_ctrlsends = MAX_NUM_CTRLSEND;
nMask= win->mpid.max_ctrlsends - 1;
- if (cp=getenv("MP_MAX_NUM_CTRLSEND")) {
+ if ( (cp=getenv("MP_MAX_NUM_CTRLSEND")) ) {
win->mpid.max_ctrlsends = atoi(cp);
}
nMask=(win->mpid.max_ctrlsends - 1);
http://git.mpich.org/mpich.git/commitdiff/d4472888894365a1785805d43bdbde0e14cd4692
commit d4472888894365a1785805d43bdbde0e14cd4692
Author: Rob Latham <robl at mcs.anl.gov>
Date: Thu Mar 13 21:37:09 2014 -0500
introduce missing function prototypes
Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>
diff --git a/src/mpid/pamid/include/mpidimpl.h b/src/mpid/pamid/include/mpidimpl.h
index c9c9f14..7f9e9ad 100644
--- a/src/mpid/pamid/include/mpidimpl.h
+++ b/src/mpid/pamid/include/mpidimpl.h
@@ -178,5 +178,7 @@ static inline pami_endpoint_t MPIDI_Task_to_endpoint(pami_task_t task, size_t of
return ep;
}
-
+int
+MPIDI_Win_set_info(MPID_Win *win,
+ MPID_Info *info);
#endif
diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c
index f95dc0e..51a8d57 100644
--- a/src/mpid/pamid/src/mpid_init.c
+++ b/src/mpid/pamid/src/mpid_init.c
@@ -27,6 +27,8 @@
#include "mpidi_platform.h"
#include "onesided/mpidi_onesided.h"
+#include "mpidi_util.h"
+
#ifdef DYNAMIC_TASKING
#define PAMIX_CLIENT_DYNAMIC_TASKING 1032
#define PAMIX_CLIENT_WORLD_TASKS 1033
diff --git a/src/mpid/pamid/src/mpidi_env.c b/src/mpid/pamid/src/mpidi_env.c
index 873e926..eb72939 100644
--- a/src/mpid/pamid/src/mpidi_env.c
+++ b/src/mpid/pamid/src/mpidi_env.c
@@ -22,6 +22,8 @@
#include <mpidimpl.h>
+#include "mpidi_util.h"
+
/** \page env_vars Environment Variables
***************************************************************************
* Pt2Pt Options *
diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c
index e328d30..4789b8b 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c
@@ -20,6 +20,7 @@
* \brief ???
*/
#include "mpidi_onesided.h"
+#include "mpidi_util.h"
void
diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c
index ab341f7..f731e48 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_get.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_get.c
@@ -20,6 +20,7 @@
* \brief ???
*/
#include "mpidi_onesided.h"
+#include "mpidi_util.h"
static inline int
diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_info.c b/src/mpid/pamid/src/onesided/mpid_win_get_info.c
index 88d083b..9d0abf9 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_get_info.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_get_info.c
@@ -21,6 +21,7 @@
* associated with win.
*/
#include "mpidi_onesided.h"
+#include "mpiinfo.h"
/**
* \brief MPI-PAMI glue for MPI_WIN_GET_INFO function
diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c
index b98a99d..5c4a1ff 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_put.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_put.c
@@ -20,6 +20,7 @@
* \brief ???
*/
#include "mpidi_onesided.h"
+#include "mpidi_util.h"
static inline int
diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h
index 85804b1..09af8b7 100644
--- a/src/mpid/pamid/src/onesided/mpidi_onesided.h
+++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h
@@ -350,4 +350,20 @@ void
MPIDI_WinLockReq_proc(pami_context_t context,
const MPIDI_Win_control_t * info,
unsigned peer);
+
+int
+MPIDI_Datatype_is_pami_rmw_supported(MPI_Datatype datatype,
+ pami_type_t *pami_type,
+ MPI_Op op,
+ pami_atomic_t *pami_op);
+
+int
+MPIDI_valid_group_rank(int lpid,
+ MPID_Group *grp);
+void
+MPIDI_WinLockAllAck_post(pami_context_t context,
+ unsigned peer,
+ MPID_Win * win);
+
+
#endif
-----------------------------------------------------------------------
Summary of changes:
src/mpid/pamid/include/mpidimpl.h | 4 +++-
src/mpid/pamid/src/mpid_init.c | 2 ++
src/mpid/pamid/src/mpidi_env.c | 2 ++
src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 1 +
.../pamid/src/onesided/mpid_win_allocate_shared.c | 6 +++---
src/mpid/pamid/src/onesided/mpid_win_get.c | 1 +
src/mpid/pamid/src/onesided/mpid_win_get_info.c | 1 +
src/mpid/pamid/src/onesided/mpid_win_lock_all.c | 2 +-
src/mpid/pamid/src/onesided/mpid_win_put.c | 1 +
src/mpid/pamid/src/onesided/mpid_win_reqops.c | 6 ++++--
src/mpid/pamid/src/onesided/mpidi_onesided.h | 16 ++++++++++++++++
11 files changed, 35 insertions(+), 7 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list