[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-421-g1c63de8

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 1c63de860856b416864625ef7be4b379e729d99a (commit) via 4159d8a7fd6d0d5e1efbea8cf1eb825222266fae (commit) from 072a6bf7da26b0fcc7ccbc91cea611eb1ca42a9a (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/1c63de860856b416864625ef7be4b379e7... commit 1c63de860856b416864625ef7be4b379e729d99a Author: Ken Raffenetti <[email protected]> Date: Tue Aug 30 10:26:34 2016 -0500 pm/util: Add configure check for time function We should not assume that time is checked for elsewhere in configure. Fixes a build issue with CH4 and alternative process managers like gforker. Signed-off-by: Lena Oden <[email protected]> diff --git a/src/pm/util/subconfigure.m4 b/src/pm/util/subconfigure.m4 index ef985c3..16b308f 100644 --- a/src/pm/util/subconfigure.m4 +++ b/src/pm/util/subconfigure.m4 @@ -245,6 +245,7 @@ if test "$ac_cv_func_thread_policy_set" = yes ; then fi AC_CHECK_HEADERS([string.h sys/time.h time.h stdlib.h sys/socket.h wait.h errno.h]) +AC_CHECK_FUNCS(time) # Check for socklen_t . # (note the conditional inclusion of sys/socket.h) AC_CACHE_CHECK([whether socklen_t is defined (in sys/socket.h if present)], http://git.mpich.org/mpich.git/commitdiff/4159d8a7fd6d0d5e1efbea8cf1eb825222... commit 4159d8a7fd6d0d5e1efbea8cf1eb825222266fae Author: Ken Raffenetti <[email protected]> Date: Mon Aug 29 17:02:38 2016 -0500 CH4/nm: Remove datatype dup hook The dup hook was removed in [b752654a5e44]. Signed-off-by: Lena Oden <[email protected]> diff --git a/src/mpid/ch4/netmod/include/netmod.h b/src/mpid/ch4/netmod/include/netmod.h index 6e3457d..e9d4e58 100644 --- a/src/mpid/ch4/netmod/include/netmod.h +++ b/src/mpid/ch4/netmod/include/netmod.h @@ -335,8 +335,6 @@ typedef int (*MPIDI_NM_iscatterv_t) (const void *sendbuf, const int *sendcounts, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, MPI_Request * req); -typedef void (*MPIDI_NM_type_dup_hook_t) (MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p); typedef int (*MPIDI_NM_type_create_hook_t) (MPIR_Datatype * datatype_p); typedef int (*MPIDI_NM_type_free_hook_t) (MPIR_Datatype * datatype_p); typedef int (*MPIDI_NM_op_create_hook_t) (MPIR_Op * op_p); @@ -476,7 +474,6 @@ typedef struct MPIDI_NM_native_funcs { MPIDI_NM_iscatterv_t iscatterv; /* Datatype hooks */ MPIDI_NM_type_create_hook_t type_create_hook; - MPIDI_NM_type_dup_hook_t type_dup_hook; MPIDI_NM_type_free_hook_t type_free_hook; /* Op hooks */ MPIDI_NM_op_create_hook_t op_create_hook; @@ -965,9 +962,6 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatterv(const void *sendbuf, const int * MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * - new_datatype_p) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_free_hook(MPIR_Datatype * diff --git a/src/mpid/ch4/netmod/include/netmod_impl.h b/src/mpid/ch4/netmod/include/netmod_impl.h index 781da99..4ba34a1 100644 --- a/src/mpid/ch4/netmod/include/netmod_impl.h +++ b/src/mpid/ch4/netmod/include/netmod_impl.h @@ -963,12 +963,6 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatterv(const void *sendbuf, const int * recvcount, recvtype, root, comm_ptr, req); }; -MPL_STATIC_INLINE_PREFIX void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return MPIDI_NM_native_func->type_dup_hook(old_datatype_p, new_datatype_p); -}; - MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) { return MPIDI_NM_native_func->type_create_hook(datatype_p); diff --git a/src/mpid/ch4/netmod/ofi/func_table.c b/src/mpid/ch4/netmod/ofi/func_table.c index bed0f63..f1586d4 100644 --- a/src/mpid/ch4/netmod/ofi/func_table.c +++ b/src/mpid/ch4/netmod/ofi/func_table.c @@ -142,7 +142,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_ofi_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook, diff --git a/src/mpid/ch4/netmod/ofi/ofi_datatype.h b/src/mpid/ch4/netmod/ofi/ofi_datatype.h index 8e110ca..7a12b23 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_datatype.h +++ b/src/mpid/ch4/netmod/ofi/ofi_datatype.h @@ -23,9 +23,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return; -} #endif diff --git a/src/mpid/ch4/netmod/portals4/func_table.c b/src/mpid/ch4/netmod/portals4/func_table.c index 8d39e10..59cfe2b 100644 --- a/src/mpid/ch4/netmod/portals4/func_table.c +++ b/src/mpid/ch4/netmod/portals4/func_table.c @@ -142,7 +142,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_portals4_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook diff --git a/src/mpid/ch4/netmod/portals4/ptl_datatype.h b/src/mpid/ch4/netmod/portals4/ptl_datatype.h index 95f346a..8f1cc2e 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_datatype.h +++ b/src/mpid/ch4/netmod/portals4/ptl_datatype.h @@ -19,10 +19,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return; -} - #endif /* NETMOD_PTL_DATATYPE_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/stubnm/globals.c b/src/mpid/ch4/netmod/stubnm/globals.c index 9dc545b..190d561 100644 --- a/src/mpid/ch4/netmod/stubnm/globals.c +++ b/src/mpid/ch4/netmod/stubnm/globals.c @@ -142,7 +142,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_stubnm_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook, diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h b/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h index 323aa6d..cac199f 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h @@ -25,11 +25,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - MPIR_Assert(0); - return; -} - #endif diff --git a/src/mpid/ch4/netmod/ucx/func_table.c b/src/mpid/ch4/netmod/ucx/func_table.c index e4801eb..01c9ec5 100644 --- a/src/mpid/ch4/netmod/ucx/func_table.c +++ b/src/mpid/ch4/netmod/ucx/func_table.c @@ -140,7 +140,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_ucx_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook diff --git a/src/mpid/ch4/netmod/ucx/ucx_datatype.h b/src/mpid/ch4/netmod/ucx/ucx_datatype.h index eb115f0..ce4f933 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_datatype.h +++ b/src/mpid/ch4/netmod/ucx/ucx_datatype.h @@ -141,10 +141,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return; -} - #endif /* NETMOD_UCX_DATATYPE_H_INCLUDED */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/include/netmod.h | 6 ------ src/mpid/ch4/netmod/include/netmod_impl.h | 6 ------ src/mpid/ch4/netmod/ofi/func_table.c | 1 - src/mpid/ch4/netmod/ofi/ofi_datatype.h | 5 ----- src/mpid/ch4/netmod/portals4/func_table.c | 1 - src/mpid/ch4/netmod/portals4/ptl_datatype.h | 6 ------ src/mpid/ch4/netmod/stubnm/globals.c | 1 - src/mpid/ch4/netmod/stubnm/stubnm_datatype.h | 7 ------- src/mpid/ch4/netmod/ucx/func_table.c | 1 - src/mpid/ch4/netmod/ucx/ucx_datatype.h | 6 ------ src/pm/util/subconfigure.m4 | 1 + 11 files changed, 1 insertions(+), 40 deletions(-) hooks/post-receive -- MPICH primary repository