coll/han: remove references to experimental solo and shared collective components
Also make coll/tuned the default for shared memory communication as coll/sm has shown performance issues that need investigation. Signed-off-by: Joseph Schuchart <schuchart@icl.utk.edu>
Этот коммит содержится в:
родитель
09c2f4af94
Коммит
971d58c524
@ -39,7 +39,6 @@ ompi_coll_han_components available_components[COMPONENTS_COUNT] = {
|
|||||||
{ LIBNBC, "libnbc", NULL },
|
{ LIBNBC, "libnbc", NULL },
|
||||||
{ TUNED, "tuned", NULL },
|
{ TUNED, "tuned", NULL },
|
||||||
{ SM, "sm", NULL },
|
{ SM, "sm", NULL },
|
||||||
{ SHARED, "shared", NULL },
|
|
||||||
{ ADAPT, "adapt", NULL },
|
{ ADAPT, "adapt", NULL },
|
||||||
{ HAN, "han", NULL }
|
{ HAN, "han", NULL }
|
||||||
};
|
};
|
||||||
@ -179,7 +178,7 @@ static int han_register(void)
|
|||||||
|
|
||||||
cs->han_bcast_low_module = 0;
|
cs->han_bcast_low_module = 0;
|
||||||
(void) mca_base_component_var_register(c, "bcast_low_module",
|
(void) mca_base_component_var_register(c, "bcast_low_module",
|
||||||
"low level module for bcast, 0 sm, 1 solo",
|
"low level module for bcast, 0 tuned, 1 sm",
|
||||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||||
OPAL_INFO_LVL_9,
|
OPAL_INFO_LVL_9,
|
||||||
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_bcast_low_module);
|
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_bcast_low_module);
|
||||||
@ -200,7 +199,7 @@ static int han_register(void)
|
|||||||
|
|
||||||
cs->han_reduce_low_module = 0;
|
cs->han_reduce_low_module = 0;
|
||||||
(void) mca_base_component_var_register(c, "reduce_low_module",
|
(void) mca_base_component_var_register(c, "reduce_low_module",
|
||||||
"low level module for allreduce, 0 sm, 1 shared",
|
"low level module for allreduce, 0 tuned, 1 sm",
|
||||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||||
OPAL_INFO_LVL_9,
|
OPAL_INFO_LVL_9,
|
||||||
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_reduce_low_module);
|
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_reduce_low_module);
|
||||||
@ -220,7 +219,7 @@ static int han_register(void)
|
|||||||
|
|
||||||
cs->han_allreduce_low_module = 0;
|
cs->han_allreduce_low_module = 0;
|
||||||
(void) mca_base_component_var_register(c, "allreduce_low_module",
|
(void) mca_base_component_var_register(c, "allreduce_low_module",
|
||||||
"low level module for allreduce, 0 sm, 1 shared",
|
"low level module for allreduce, 0 tuned, 1 sm",
|
||||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||||
OPAL_INFO_LVL_9,
|
OPAL_INFO_LVL_9,
|
||||||
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_allreduce_low_module);
|
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_allreduce_low_module);
|
||||||
@ -234,7 +233,7 @@ static int han_register(void)
|
|||||||
|
|
||||||
cs->han_allgather_low_module = 0;
|
cs->han_allgather_low_module = 0;
|
||||||
(void) mca_base_component_var_register(c, "allgather_low_module",
|
(void) mca_base_component_var_register(c, "allgather_low_module",
|
||||||
"low level module for allgather, 0 sm, 1 shared",
|
"low level module for allgather, 0 tuned, 1 sm",
|
||||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||||
OPAL_INFO_LVL_9,
|
OPAL_INFO_LVL_9,
|
||||||
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_allgather_low_module);
|
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_allgather_low_module);
|
||||||
@ -248,7 +247,7 @@ static int han_register(void)
|
|||||||
|
|
||||||
cs->han_gather_low_module = 0;
|
cs->han_gather_low_module = 0;
|
||||||
(void) mca_base_component_var_register(c, "gather_low_module",
|
(void) mca_base_component_var_register(c, "gather_low_module",
|
||||||
"low level module for gather, 0 sm, 1 shared",
|
"low level module for gather, 0 tuned, 1 sm",
|
||||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||||
OPAL_INFO_LVL_9,
|
OPAL_INFO_LVL_9,
|
||||||
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_gather_low_module);
|
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_gather_low_module);
|
||||||
@ -262,7 +261,7 @@ static int han_register(void)
|
|||||||
|
|
||||||
cs->han_scatter_low_module = 0;
|
cs->han_scatter_low_module = 0;
|
||||||
(void) mca_base_component_var_register(c, "scatter_low_module",
|
(void) mca_base_component_var_register(c, "scatter_low_module",
|
||||||
"low level module for scatter, 0 sm, 1 shared",
|
"low level module for scatter, 0 tuned, 1 sm",
|
||||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||||
OPAL_INFO_LVL_9,
|
OPAL_INFO_LVL_9,
|
||||||
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_scatter_low_module);
|
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_scatter_low_module);
|
||||||
|
@ -102,7 +102,6 @@ typedef enum COMPONENTS {
|
|||||||
LIBNBC,
|
LIBNBC,
|
||||||
TUNED,
|
TUNED,
|
||||||
SM,
|
SM,
|
||||||
SHARED,
|
|
||||||
ADAPT,
|
ADAPT,
|
||||||
HAN,
|
HAN,
|
||||||
COMPONENTS_COUNT
|
COMPONENTS_COUNT
|
||||||
|
@ -258,7 +258,7 @@ int mca_coll_han_comm_create(struct ompi_communicator_t *comm,
|
|||||||
* Upgrade sm module priority to set up low_comms[0] with sm module
|
* Upgrade sm module priority to set up low_comms[0] with sm module
|
||||||
* This sub-communicator contains the ranks that share my node.
|
* This sub-communicator contains the ranks that share my node.
|
||||||
*/
|
*/
|
||||||
opal_info_set(&comm_info, "ompi_comm_coll_preference", "sm,^han");
|
opal_info_set(&comm_info, "ompi_comm_coll_preference", "tuned,^han");
|
||||||
ompi_comm_split_type(comm, MPI_COMM_TYPE_SHARED, 0,
|
ompi_comm_split_type(comm, MPI_COMM_TYPE_SHARED, 0,
|
||||||
&comm_info, &(low_comms[0]));
|
&comm_info, &(low_comms[0]));
|
||||||
|
|
||||||
@ -272,7 +272,7 @@ int mca_coll_han_comm_create(struct ompi_communicator_t *comm,
|
|||||||
* Upgrade shared module priority to set up low_comms[1] with shared module
|
* Upgrade shared module priority to set up low_comms[1] with shared module
|
||||||
* This sub-communicator contains the ranks that share my node.
|
* This sub-communicator contains the ranks that share my node.
|
||||||
*/
|
*/
|
||||||
opal_info_set(&comm_info, "ompi_comm_coll_preference", "shared,^han");
|
opal_info_set(&comm_info, "ompi_comm_coll_preference", "sm,^han");
|
||||||
ompi_comm_split_type(comm, MPI_COMM_TYPE_SHARED, 0,
|
ompi_comm_split_type(comm, MPI_COMM_TYPE_SHARED, 0,
|
||||||
&comm_info, &(low_comms[1]));
|
&comm_info, &(low_comms[1]));
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user