[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-97-gf544cbf
Service Account
noreply at mpich.org
Thu Jan 8 12:30:01 CST 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 f544cbf9921e1536490129e37294253c2f47a989 (commit)
from 96f78a9866a9494a0e9e8d433f3968c5c9f2f917 (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/f544cbf9921e1536490129e37294253c2f47a989
commit f544cbf9921e1536490129e37294253c2f47a989
Author: Su Huang <suhuang at us.ibm.com>
Date: Thu Jan 8 12:14:22 2015 -0500
PAMID: misc chnages in pamid to support MPICH 3.2
Signed-off-by: Sameh Sharkawi <sssharka at us.ibm.com>
diff --git a/src/mpid/pamid/include/mpidimpl.h b/src/mpid/pamid/include/mpidimpl.h
index ffd1cf7..5135c49 100644
--- a/src/mpid/pamid/include/mpidimpl.h
+++ b/src/mpid/pamid/include/mpidimpl.h
@@ -182,13 +182,6 @@ int
MPIDI_Win_set_info(MPID_Win *win,
MPID_Info *info);
-static inline MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp)
-{
- return MPI_VOID_PTR_CAST_TO_MPI_AINT ((char*)MPI_AINT_CAST_TO_VOID_PTR(base) + disp);
-}
-
-static inline MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2)
-{
- return MPI_PTR_DISP_CAST_TO_MPI_AINT ((char*)MPI_AINT_CAST_TO_VOID_PTR(addr1) - (char*)MPI_AINT_CAST_TO_VOID_PTR(addr2));
-}
+MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp);
+MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2);
#endif
diff --git a/src/mpid/pamid/src/Makefile.mk b/src/mpid/pamid/src/Makefile.mk
index 0ec7698..a8d98e1 100644
--- a/src/mpid/pamid/src/Makefile.mk
+++ b/src/mpid/pamid/src/Makefile.mk
@@ -58,6 +58,7 @@ mpi_core_sources += \
src/mpid/pamid/src/mpid_mprobe.c \
src/mpid/pamid/src/mpid_imrecv.c \
src/mpid/pamid/src/mpid_improbe.c \
+ src/mpid/pamid/src/mpid_aint.c \
src/mpid/pamid/src/mpidi_nbc_sched.c
if QUEUE_BINARY_SEARCH_SUPPORT
diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c
index 0bd954b..41abeee 100644
--- a/src/mpid/pamid/src/misc/mpid_unimpl.c
+++ b/src/mpid/pamid/src/misc/mpid_unimpl.c
@@ -84,7 +84,7 @@ int MPID_Comm_failure_get_acked(MPID_Comm *comm_ptr, MPID_Group **failed_group_p
return 0;
}
-int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, int new_fail)
+int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, mpir_errflag_t new_fail)
{
MPID_abort();
return 0;
diff --git a/src/mpid/pamid/src/mpid_aint.c b/src/mpid/pamid/src/mpid_aint.c
new file mode 100644
index 0000000..ca4c00b
--- /dev/null
+++ b/src/mpid/pamid/src/mpid_aint.c
@@ -0,0 +1,61 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
+/*
+ * (C) 2014 by Argonne National Laboratory.
+ * See COPYRIGHT in top-level directory.
+ */
+
+#include "mpidimpl.h"
+
+/*
+ Input Parameters:
++ base - base address (integer)
+- disp - displacement (integer)
+
+ Return value:
+ A new MPI_Aint value that is equivalent to the sum of the base and disp
+ arguments, where base represents a base address returned by a call
+ to MPI_GET_ADDRESS and disp represents a signed integer displacement.
+*/
+#undef FUNCNAME
+#define FUNCNAME MPID_Aint_add
+#undef FCNAME
+#define FCNAME MPIDI_QUOTE(FUNCNAME)
+MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp)
+{
+ MPI_Aint result;
+
+ MPIDI_STATE_DECL(MPID_STATE_MPID_AINT_ADD);
+ MPIDI_FUNC_ENTER(MPID_STATE_MPID_AINT_ADD);
+
+ result = MPI_VOID_PTR_CAST_TO_MPI_AINT ((char*)MPI_AINT_CAST_TO_VOID_PTR(base) + disp);
+
+ MPIDI_FUNC_EXIT(MPID_STATE_MPID_AINT_ADD);
+ return result;
+}
+
+/*
+ Input Parameters:
++ addr1 - minuend address (integer)
+- addr2 - subtrahend address (integer)
+
+ Return value:
+ A new MPI_Aint value that is equivalent to the difference between addr1 and
+ addr2 arguments, where addr1 and addr2 represent addresses returned by calls
+ to MPI_GET_ADDRESS.
+*/
+#undef FUNCNAME
+#define FUNCNAME MPID_Aint_diff
+#undef FCNAME
+#define FCNAME MPIDI_QUOTE(FUNCNAME)
+MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2)
+{
+ MPI_Aint result;
+
+ MPIDI_STATE_DECL(MPID_STATE_MPID_AINT_DIFF);
+ MPIDI_FUNC_ENTER(MPID_STATE_MPID_AINT_DIFF);
+
+ result = MPI_PTR_DISP_CAST_TO_MPI_AINT ((char*)MPI_AINT_CAST_TO_VOID_PTR(addr1) - (char*)MPI_AINT_CAST_TO_VOID_PTR(addr2));
+
+ MPIDI_FUNC_EXIT(MPID_STATE_MPID_AINT_DIFF);
+ return result;
+}
diff --git a/src/mpid/pamid/src/mpid_finalize.c b/src/mpid/pamid/src/mpid_finalize.c
index 10d8dce..104dc1b 100644
--- a/src/mpid/pamid/src/mpid_finalize.c
+++ b/src/mpid/pamid/src/mpid_finalize.c
@@ -63,7 +63,8 @@ int MPID_Finalize()
{
pami_result_t rc;
int mpierrno = MPI_SUCCESS;
- MPIR_Barrier_impl(MPIR_Process.comm_world, &mpierrno);
+ mpir_errflag_t errflag=MPIR_ERR_NONE;
+ MPIR_Barrier_impl(MPIR_Process.comm_world, &errflag);
#ifdef MPIDI_STATISTICS
if (MPIDI_Process.mp_statistics) {
diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate.c b/src/mpid/pamid/src/onesided/mpid_win_allocate.c
index f9ff368..7471fa7 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_allocate.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_allocate.c
@@ -55,6 +55,7 @@ MPID_Win_allocate(MPI_Aint size,
{
int mpi_errno = MPI_SUCCESS;
int rc = MPI_SUCCESS;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
void *baseP;
static char FCNAME[] = "MPID_Win_allocate";
MPIDI_Win_info *winfo;
@@ -90,7 +91,7 @@ MPID_Win_allocate(MPI_Aint size,
if (rc != MPI_SUCCESS)
return rc;
*(void**) base_ptr = (void *) win->base;
- mpi_errno = MPIR_Barrier_impl(comm_ptr, &mpi_errno);
+ mpi_errno = MPIR_Barrier_impl(comm_ptr, &errflag);
fn_fail:
return mpi_errno;
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 ecce9ce..447f2ce 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
@@ -484,6 +484,7 @@ MPID_Win_allocate_shared(MPI_Aint size,
MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int onNode = 0;
MPID_Win *win = NULL;
int rank, prev_size;
@@ -545,7 +546,7 @@ MPID_Win_allocate_shared(MPI_Aint size,
*(void**) base_ptr = (void *) win->mpid.info[rank].base_addr;
- mpi_errno = MPIR_Barrier_impl(comm_ptr, &mpi_errno);
+ mpi_errno = MPIR_Barrier_impl(comm_ptr, &errflag);
fn_exit:
return mpi_errno;
/* --BEGIN ERROR HANDLING-- */
diff --git a/src/mpid/pamid/src/onesided/mpid_win_create.c b/src/mpid/pamid/src/onesided/mpid_win_create.c
index 6c1b9cc..8adb91b 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_create.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_create.c
@@ -105,6 +105,7 @@ int
MPIDI_Win_allgather( MPI_Aint size, MPID_Win **win_ptr )
{
int mpi_errno = MPI_SUCCESS;
+ mpir_errflag_t errflag=MPIR_ERR_NONE;
MPID_Win *win;
int rank;
MPID_Comm *comm_ptr;
@@ -148,7 +149,7 @@ MPIDI_Win_allgather( MPI_Aint size, MPID_Win **win_ptr )
sizeof(struct MPIDI_Win_info),
MPI_BYTE,
comm_ptr,
- &mpi_errno);
+ &errflag);
fn_fail:
return mpi_errno;
@@ -186,6 +187,7 @@ MPID_Win_create(void * base,
MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int rc = MPI_SUCCESS;
MPID_Win *win;
size_t rank;
@@ -205,7 +207,7 @@ MPID_Win_create(void * base,
return rc;
- mpi_errno = MPIR_Barrier_impl(comm_ptr, &mpi_errno);
+ mpi_errno = MPIR_Barrier_impl(comm_ptr, (mpir_errflag_t *) &errflag);
return mpi_errno;
}
diff --git a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c
index 633a8c5..9134e69 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c
@@ -43,6 +43,7 @@ MPID_Win_create_dynamic( MPID_Info * info,
MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int rc = MPI_SUCCESS;
MPIDI_Win_info *winfo;
MPID_Win *win;
@@ -83,7 +84,7 @@ MPID_Win_create_dynamic( MPID_Info * info,
if (rc != MPI_SUCCESS)
return rc;
- mpi_errno = MPIR_Barrier_impl(comm_ptr, &mpi_errno);
+ mpi_errno = MPIR_Barrier_impl(comm_ptr, (mpir_errflag_t *) &errflag);
return mpi_errno;
}
diff --git a/src/mpid/pamid/src/onesided/mpid_win_fence.c b/src/mpid/pamid/src/onesided/mpid_win_fence.c
index 17bb022..bc84ff0 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_fence.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_fence.c
@@ -27,6 +27,7 @@ MPID_Win_fence(int assert,
MPID_Win *win)
{
int mpi_errno = MPI_SUCCESS;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
static char FCNAME[] = "MPID_Win_fence";
if(win->mpid.sync.origin_epoch_type != win->mpid.sync.target_epoch_type){
@@ -63,7 +64,7 @@ MPID_Win_fence(int assert,
if (!(assert & MPI_MODE_NOPRECEDE))
{
- mpi_errno = MPIR_Barrier_impl(win->comm_ptr, &mpi_errno);
+ mpi_errno = MPIR_Barrier_impl(win->comm_ptr, &errflag);
}
return mpi_errno;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_set_info.c b/src/mpid/pamid/src/onesided/mpid_win_set_info.c
index 1566910..f55676d 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_set_info.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_set_info.c
@@ -93,9 +93,10 @@ int
MPID_Win_set_info(MPID_Win *win, MPID_Info *info)
{
int mpi_errno = MPI_SUCCESS;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
mpi_errno = MPIDI_Win_set_info(win, info);
MPID_assert(mpi_errno == MPI_SUCCESS);
- mpi_errno = MPIR_Barrier_impl(win->comm_ptr, &mpi_errno);
+ mpi_errno = MPIR_Barrier_impl(win->comm_ptr, &errflag);
return mpi_errno;
}
-----------------------------------------------------------------------
Summary of changes:
src/mpid/pamid/include/mpidimpl.h | 11 ++---------
src/mpid/pamid/src/Makefile.mk | 1 +
src/mpid/pamid/src/misc/mpid_unimpl.c | 2 +-
src/mpid/{ch3 => pamid}/src/mpid_aint.c | 0
src/mpid/pamid/src/mpid_finalize.c | 3 ++-
src/mpid/pamid/src/onesided/mpid_win_allocate.c | 3 ++-
.../pamid/src/onesided/mpid_win_allocate_shared.c | 3 ++-
src/mpid/pamid/src/onesided/mpid_win_create.c | 6 ++++--
.../pamid/src/onesided/mpid_win_create_dynamic.c | 3 ++-
src/mpid/pamid/src/onesided/mpid_win_fence.c | 3 ++-
src/mpid/pamid/src/onesided/mpid_win_set_info.c | 3 ++-
11 files changed, 20 insertions(+), 18 deletions(-)
copy src/mpid/{ch3 => pamid}/src/mpid_aint.c (100%)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list