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 e38618b0fd8cfb5453a7ad8149afc91d9fdd5e24 (commit) from 0a69a9d0154b86b457ac991c44de58964c0b83b5 (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/e38618b0fd8cfb5453a7ad8149afc91d9f... commit e38618b0fd8cfb5453a7ad8149afc91d9fdd5e24 Author: Paul Coffman <[email protected]> Date: Thu Nov 20 18:36:41 2014 -0600 Criteria for disabling pami optimized collectives invalid on BGQ At the end of MPIDI_Init_collsel_extension in the pami device init code mpid_init.c there is logic to disable the optimized collectives based on criteria that is invalid on BGQ but was nonetheless always evaluating to true and disabling the optimized collectives on BGQ. Compiler directives were placed around the logic to avoid this code for the BGQ platform. Signed-off-by: Paul Coffman <[email protected]> Signed-off-by: Rob Latham <[email protected]> diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 064f085..52f0b7c 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -636,9 +636,11 @@ void MPIDI_Init_collsel_extension() else MPIDI_Process.optimized.auto_select_colls = MPID_AUTO_SELECT_COLLS_NONE; +#ifndef __BGQ__ //If collective selection will be disabled, check on fca, if both not required, disable pami alltogether if(MPIDI_Process.optimized.auto_select_colls == MPID_AUTO_SELECT_COLLS_NONE && MPIDI_Process.optimized.collectives != MPID_COLL_FCA) MPIDI_Process.optimized.collectives = MPID_COLL_OFF; +#endif } void MPIDI_Collsel_table_generate() ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/mpid_init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository