Commit c7c7d608 authored by Sameh Sharkawi's avatar Sameh Sharkawi Committed by Michael Blocksome
Browse files

Fixes for Collective Selection enablement



(ibm) Disabling PAMI if Collective selection can't be enabled
(ibm) 19a99aa5b81cb5a99a0284830a7caa2bd9f0c923
Signed-off-by: default avatarMichael Blocksome <blocksom@us.ibm.com>
parent 8680bcf6
......@@ -554,6 +554,10 @@ void MPIDI_Init_collsel_extension()
}
else
MPIDI_Process.optimized.auto_select_colls = MPID_AUTO_SELECT_COLLS_NONE;
//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;
}
void MPIDI_Collsel_table_generate()
......
......@@ -867,7 +867,7 @@ MPIDI_Env_setup(int rank, int requested)
if(env != NULL)
{
if(strncasecmp(env, "N", 1) == 1)
MPIDI_Process.optimized.collectives = 0;
MPIDI_Process.optimized.collectives = MPID_COLL_OFF;
}
}
......@@ -894,13 +894,15 @@ MPIDI_Env_setup(int rank, int requested)
if(strncasecmp(env, "TUN", 3) == 0)
{
MPIDI_Process.optimized.auto_select_colls = MPID_AUTO_SELECT_COLLS_TUNE;
MPIDI_Process.optimized.collectives = 1;
if(MPIDI_Process.optimized.collectives != MPID_COLL_FCA)
MPIDI_Process.optimized.collectives = MPID_COLL_ON;
}
else if(strncasecmp(env, "YES", 3) == 0)
{
MPIDI_Process.optimized.auto_select_colls = MPID_AUTO_SELECT_COLLS_ALL; /* All collectives will be using auto coll sel.
We will check later on each individual coll. */
MPIDI_Process.optimized.collectives = 1;
if(MPIDI_Process.optimized.collectives != MPID_COLL_FCA)
MPIDI_Process.optimized.collectives = MPID_COLL_ON;
}
else
MPIDI_Process.optimized.auto_select_colls = MPID_AUTO_SELECT_COLLS_NONE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment