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 d45513d4ee4ad34cc8860943f21650718ddbdaa8 (commit) via 0671ef921c44fa25da2f8dff14b6b64c6678f31a (commit) via 497920f65c9f10539bd0d158825ed5936bf6bae3 (commit) from 524aeedc0918261477c46b736fa2ce72085d5115 (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/d45513d4ee4ad34cc8860943f21650718d... commit d45513d4ee4ad34cc8860943f21650718ddbdaa8 Author: Ken Raffenetti <[email protected]> Date: Wed Aug 24 16:05:22 2016 -0500 binding/mpif_h: Remove unused defines Signed-off-by: Rob Latham <[email protected]> diff --git a/src/binding/fortran/mpif_h/mpi_fortimpl.h b/src/binding/fortran/mpif_h/mpi_fortimpl.h index e8dcb8e..fbaea21 100644 --- a/src/binding/fortran/mpif_h/mpi_fortimpl.h +++ b/src/binding/fortran/mpif_h/mpi_fortimpl.h @@ -202,17 +202,6 @@ typedef char *MPID_FCHAR_T; #include <stdlib.h> #endif -/* Temporary patch for the space routines. Eventually, this should use - (FIXME) *just* the memory definitions currently in mpiimpl.h */ -/* style: allow:malloc:1 sig:0 */ -/* style: allow:free:1 sig:0 */ -/* style: allow:calloc:1 sig:0 */ -#ifndef MPL_malloc -#define MPL_malloc(a) malloc((unsigned)(a)) -#define MPL_calloc(a,b) calloc((unsigned)(a),(unsigned)(b)) -#define MPL_free(a) free((void *)(a)) -#endif - /* To avoid constant allocation/deallocation of temporary arrays, define a small default, predefined array size. */ #ifndef MPIR_USE_LOCAL_ARRAY http://git.mpich.org/mpich.git/commitdiff/0671ef921c44fa25da2f8dff14b6b64c66... commit 0671ef921c44fa25da2f8dff14b6b64c6678f31a Author: Ken Raffenetti <[email protected]> Date: Tue Sep 6 13:47:31 2016 -0500 CH4: Fix incorrect type accumulate_ordering is defined as an int. Fix type used to temporarily store the value. Signed-off-by: Rob Latham <[email protected]> diff --git a/src/mpid/ch4/src/ch4r_win.h b/src/mpid/ch4/src/ch4r_win.h index 035e125..064fa89 100644 --- a/src/mpid/ch4/src/ch4r_win.h +++ b/src/mpid/ch4/src/ch4r_win.h @@ -33,7 +33,7 @@ static inline int MPIDI_CH4R_win_set_info(MPIR_Win * win, MPIR_Info * info) MPIR_Info *curr_ptr; char *value, *token, *savePtr; - uint save_ordering; + int save_ordering; curr_ptr = info->next; @@ -45,7 +45,7 @@ static inline int MPIDI_CH4R_win_set_info(MPIR_Win * win, MPIR_Info * info) MPIDI_CH4U_WIN(win, info_args).no_locks = 0; } else if (!strcmp(curr_ptr->key, "accumulate_ordering")) { - save_ordering = (uint) MPIDI_CH4U_WIN(win, info_args).accumulate_ordering; + save_ordering = MPIDI_CH4U_WIN(win, info_args).accumulate_ordering; MPIDI_CH4U_WIN(win, info_args).accumulate_ordering = 0; value = curr_ptr->value; token = (char *) strtok_r(value, ",", &savePtr); http://git.mpich.org/mpich.git/commitdiff/497920f65c9f10539bd0d158825ed5936b... commit 497920f65c9f10539bd0d158825ed5936bf6bae3 Author: Ken Raffenetti <[email protected]> Date: Tue Sep 6 13:44:15 2016 -0500 CH4: Remove unused variable Signed-off-by: Rob Latham <[email protected]> diff --git a/src/mpid/ch4/src/ch4i_comm.h b/src/mpid/ch4/src/ch4i_comm.h index d837115..305770a 100644 --- a/src/mpid/ch4/src/ch4i_comm.h +++ b/src/mpid/ch4/src/ch4i_comm.h @@ -893,13 +893,10 @@ static inline int MPIDII_set_map(MPIDII_rank_map_t * src_rmap, int src_comm_size, int total_mapper_size, int mapper_offset) { int mpi_errno = MPI_SUCCESS; - MPIDII_rank_map_mode src_mode; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDII_SET_MAP); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDII_SET_MAP); - src_mode = src_rmap->mode; - /* Simplest case: MAP_DUP, exact duplication of src_comm */ if (mapper->type == MPIR_COMM_MAP_TYPE__DUP && src_comm_size == total_mapper_size) { MPIDII_direct_of_src_rmap(src_rmap, dest_rmap, mapper); @@ -931,7 +928,7 @@ static inline int MPIDII_set_map(MPIDII_rank_map_t * src_rmap, MPIDII_src_mlut_to_mlut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset); } - else { /* src_mode != MPIDII_RANK_MAP_MLUT */ + else { MPIDII_src_map_to_lut(src_rmap, dest_rmap, mapper, mapper->src_mapping_size, mapper_offset); } ----------------------------------------------------------------------- Summary of changes: src/binding/fortran/mpif_h/mpi_fortimpl.h | 11 ----------- src/mpid/ch4/src/ch4i_comm.h | 5 +---- src/mpid/ch4/src/ch4r_win.h | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) hooks/post-receive -- MPICH primary repository