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 6ab817f8ef69c02509cf423ae53121ea64c55685 (commit) via da684aa7e335c4b4d084ff3a1cc5a0cf4d5d6705 (commit) from ac4e1f9ab27cb31b61fd66fb9d5138e7d08f864b (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/6ab817f8ef69c02509cf423ae53121ea64... commit 6ab817f8ef69c02509cf423ae53121ea64c55685 Author: Hajime Fujita <[email protected]> Date: Thu Sep 22 10:12:51 2016 -0500 CH4/OFI: RMA: Remove redundant casts Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/mpid/ch4/netmod/ofi/ofi_rma.h b/src/mpid/ch4/netmod/ofi/ofi_rma.h index 05e462b..0ba5ffb 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_rma.h +++ b/src/mpid/ch4/netmod/ofi/ofi_rma.h @@ -343,7 +343,7 @@ static inline int MPIDI_OFI_do_put(const void *origin_addr, MPIDI_OFI_WIN(win).syncQ = req; MPIDI_OFI_init_iovec_state(&req->noncontig->iovs, (uintptr_t) origin_addr, - (uintptr_t) MPIDI_OFI_winfo_base(win, req->target_rank) + offset, + MPIDI_OFI_winfo_base(win, req->target_rank) + offset, req->noncontig->origin_dt.num_contig, req->noncontig->target_dt.num_contig, INT64_MAX, @@ -489,7 +489,7 @@ static inline int MPIDI_OFI_do_get(void *origin_addr, MPIDI_OFI_WIN(win).syncQ = req; MPIDI_OFI_init_iovec_state(&req->noncontig->iovs, (uintptr_t) origin_addr, - (uintptr_t) MPIDI_OFI_winfo_base(win, req->target_rank) + offset, + MPIDI_OFI_winfo_base(win, req->target_rank) + offset, req->noncontig->origin_dt.num_contig, req->noncontig->target_dt.num_contig, INT64_MAX, @@ -846,7 +846,7 @@ static inline int MPIDI_OFI_do_accumulate(const void *origin_addr, MPIDI_OFI_init_iovec_state(&req->noncontig->iovs, (uintptr_t) origin_addr, - (uintptr_t) MPIDI_OFI_winfo_base(win, req->target_rank) + offset, + MPIDI_OFI_winfo_base(win, req->target_rank) + offset, req->noncontig->origin_dt.num_contig, req->noncontig->target_dt.num_contig, max_size, @@ -1026,8 +1026,7 @@ static inline int MPIDI_OFI_do_get_accumulate(const void *origin_addr, MPIDI_OFI_init_iovec_state2(&req->noncontig->iovs, (uintptr_t) origin_addr, (uintptr_t) result_addr, - (uintptr_t) MPIDI_OFI_winfo_base(win, - req->target_rank) + offset, + MPIDI_OFI_winfo_base(win, req->target_rank) + offset, req->noncontig->origin_dt.num_contig, req->noncontig->result_dt.num_contig, req->noncontig->target_dt.num_contig, max_size, @@ -1036,7 +1035,7 @@ static inline int MPIDI_OFI_do_get_accumulate(const void *origin_addr, else MPIDI_OFI_init_iovec_state(&req->noncontig->iovs, (uintptr_t) result_addr, - (uintptr_t) MPIDI_OFI_winfo_base(win, req->target_rank) + offset, + MPIDI_OFI_winfo_base(win, req->target_rank) + offset, req->noncontig->result_dt.num_contig, req->noncontig->target_dt.num_contig, max_size, http://git.mpich.org/mpich.git/commitdiff/da684aa7e335c4b4d084ff3a1cc5a0cf4d... commit da684aa7e335c4b4d084ff3a1cc5a0cf4d5d6705 Author: Hajime Fujita <[email protected]> Date: Tue Sep 20 14:22:59 2016 -0500 CH4/OFI: RMA: Fix casts to supress warnings This patch addresses warning messages regarding casts in the OFI RMA code, which appear when --enable-strict is specified. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/mpid/ch4/netmod/ofi/ofi_rma.h b/src/mpid/ch4/netmod/ofi/ofi_rma.h index 7d1b87a..05e462b 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_rma.h +++ b/src/mpid/ch4/netmod/ofi/ofi_rma.h @@ -426,8 +426,7 @@ static inline int MPIDI_NM_mpi_put(const void *origin_addr, (char *) origin_addr + origin_true_lb, target_bytes, MPIDI_OFI_comm_to_phys(win->comm_ptr, target_rank, MPIDI_OFI_API_CTR), - (uint64_t) (char *) MPIDI_OFI_winfo_base(win, - target_rank) + (uint64_t) MPIDI_OFI_winfo_base(win, target_rank) + target_disp * MPIDI_OFI_winfo_disp_unit(win, target_rank) + target_true_lb, MPIDI_OFI_winfo_mr_key(win, @@ -586,7 +585,7 @@ static inline int MPIDI_NM_mpi_get(void *origin_addr, iov.iov_base = (char *) origin_addr + origin_dt.true_lb; iov.iov_len = target_dt.size; riov.addr = - (uint64_t) ((char *) MPIDI_OFI_winfo_base(win, target_rank) + offset + + (uint64_t) (MPIDI_OFI_winfo_base(win, target_rank) + offset + target_dt.true_lb); riov.len = target_dt.size; riov.key = MPIDI_OFI_winfo_mr_key(win, target_rank); @@ -700,7 +699,7 @@ static inline int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, buffer = (char *) origin_addr + origin_dt.true_lb; rbuffer = (char *) result_addr + result_dt.true_lb; - tbuffer = (char *) MPIDI_OFI_winfo_base(win, target_rank) + offset; + tbuffer = (void *) (MPIDI_OFI_winfo_base(win, target_rank) + offset); MPIDI_CH4U_EPOCH_START_CHECK(win, mpi_errno, goto fn_fail); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/ofi/ofi_rma.h | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository