ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

moving the hierarch collective component to the new parameter

Просмотр исходного кода 
registration interface.

This commit was SVN r7867.
Этот коммит содержится в:
Edgar Gabriel 2005-10-25 18:34:47 +00:00
родитель 3633605010
Коммит 00c04ab56a
7 изменённых файлов: 43 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

39
ompi/mca/coll/hierarch/coll_hierarch.c
Просмотреть файл

@ -37,19 +37,11 @@
/* Local functions and data */
/* #define HIER_MAXPROTOCOL 7
#define HIER_MAXPROTOCOL 7
static int mca_coll_hierarch_max_protocol=HIER_MAXPROTOCOL;
static char hier_prot[HIER_MAXPROTOCOL][7]={"0","tcp","gm","mx","mvapi","openib","sm"};
*/
#define HIER_MAXPROTOCOL 4
static int mca_coll_hierarch_max_protocol=HIER_MAXPROTOCOL;
static char hier_prot[HIER_MAXPROTOCOL][7]={"0","tcp","openib","sm"};
int mca_coll_hier_verbose=0;
static void mca_coll_hierarch_checkfor_component (struct ompi_communicator_t *comm,
int component_level,
char *component_name,
@ -148,10 +140,7 @@ mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority,
int ignore_sm=0;
/* Get the priority level attached to this module */
if (OMPI_SUCCESS != mca_base_param_lookup_int(mca_coll_hierarch_priority_param,
priority)) {
return NULL;
}
*priority = mca_coll_hierarch_priority_param;
/* This module only works for intra-communicators at the moment */
if ( OMPI_COMM_IS_INTER(comm) ) {
@ -160,15 +149,8 @@ mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority,
/* Check whether we should ignore sm. This might be necessary to take advantage
of the some ib or gm collectives. */
if (OMPI_SUCCESS != mca_base_param_lookup_int(mca_coll_hierarch_ignore_sm_param,
&ignore_sm)) {
return NULL;
}
if (OMPI_SUCCESS != mca_base_param_lookup_int(mca_coll_hierarch_verbose_param,
&mca_coll_hier_verbose)) {
return NULL;
}
ignore_sm = mca_coll_hierarch_ignore_sm_param;
size = ompi_comm_size(comm);
if ( size < 3 ) {
@ -218,7 +200,7 @@ mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority,
}
if ( 0 == maxncount ) {
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
printf("%s:%d: nobody talks with %s. Continuing to next level.\n",
comm->c_name, rank, hier_prot[level]);
}
@ -232,14 +214,14 @@ mca_coll_hierarch_comm_query(struct ompi_communicator_t *comm, int *priority,
* Its (size-1) because we do not count ourselves.
* maxncount[1] should be zero.
*/
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
printf("%s:%d: everybody talks with %s. No need to continue\n",
comm->c_name, rank, hier_prot[level]);
}
goto exit;
}
else {
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
printf("%s:%d: %d procs talk with %s. Use this protocol, key %d\n",
comm->c_name, rank, maxncount, hier_prot[level], color);
}
@ -338,7 +320,7 @@ mca_coll_hierarch_module_init(struct ompi_communicator_t *comm)
OBJ_CONSTRUCT(&(data->hier_llead), ompi_pointer_array_t);
ompi_pointer_array_add ( &(data->hier_llead), llead);
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
mca_coll_hierarch_dump_struct (data);
}
@ -654,10 +636,7 @@ mca_coll_hierarch_checkfor_component ( struct ompi_communicator_t *comm,
*key=MPI_UNDEFINED;
/* Shall we check the the rdma list instead of send-list in the endpoint-structure? */
if (OMPI_SUCCESS != mca_base_param_lookup_int(mca_coll_hierarch_use_rdma_param,
&use_rdma)) {
return;
}
use_rdma = mca_coll_hierarch_use_rdma_param;
size = ompi_comm_size ( comm );
rank = ompi_comm_rank ( comm );

1
ompi/mca/coll/hierarch/coll_hierarch.h
Просмотреть файл

@ -37,7 +37,6 @@ extern int mca_coll_hierarch_priority_param;
extern int mca_coll_hierarch_verbose_param;
extern int mca_coll_hierarch_use_rdma_param;
extern int mca_coll_hierarch_ignore_sm_param;
extern int mca_coll_hier_verbose;
#define HIER_DEFAULT_NUM_LLEAD 5

2
ompi/mca/coll/hierarch/coll_hierarch_allreduce.c
Просмотреть файл

@ -53,7 +53,7 @@ int mca_coll_hierarch_allreduce_intra(void *sbuf, void *rbuf, int count,
data = comm->c_coll_selected_data;
lcomm = data->hier_lcomm;
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
printf("%s:%d: executing hierarchical allreduce with cnt=%d \n",
comm->c_name, rank, count );
}

2
ompi/mca/coll/hierarch/coll_hierarch_barrier.c
Просмотреть файл

@ -45,7 +45,7 @@ int mca_coll_hierarch_barrier_intra(struct ompi_communicator_t *comm)
data = comm->c_coll_selected_data;
lcomm = data->hier_lcomm;
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
printf("%s:%d: executing hierarchical barrier\n", comm->c_name, rank );
}

2
ompi/mca/coll/hierarch/coll_hierarch_bcast.c
Просмотреть файл

@ -49,7 +49,7 @@ int mca_coll_hierarch_bcast_intra(void *buff,
data = comm->c_coll_selected_data;
lcomm = data->hier_lcomm;
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
printf("%s:%d: executing hierarchical bcast with cnt=%d and root=%d\n",
comm->c_name, rank, count, root );
}

43
ompi/mca/coll/hierarch/coll_hierarch_component.c
Просмотреть файл

@ -35,10 +35,10 @@ const char *mca_coll_hierarch_component_version_string =
/*
* Global variable
*/
int mca_coll_hierarch_priority_param = -1;
int mca_coll_hierarch_verbose_param = -1;
int mca_coll_hierarch_use_rdma_param=-1;
int mca_coll_hierarch_ignore_sm_param=-1;
int mca_coll_hierarch_priority_param = 0;
int mca_coll_hierarch_verbose_param = 0;
int mca_coll_hierarch_use_rdma_param=0;
int mca_coll_hierarch_ignore_sm_param=0;
/*
@ -91,16 +91,33 @@ const mca_coll_base_component_1_0_0_t mca_coll_hierarch_component = {
static int hierarch_open(void)
{
mca_base_component_t *c = &mca_coll_hierarch_component.collm_version;
/* Use a high priority, but allow other components to be higher */
mca_coll_hierarch_priority_param =
mca_base_param_register_int("coll", "hierarch", "priority", NULL, 50);
mca_coll_hierarch_verbose_param =
mca_base_param_register_int("coll", "hierarch", "verbose", NULL, 0);
mca_coll_hierarch_use_rdma_param =
mca_base_param_register_int("coll", "hierarch", "use_rdma", NULL, 0);
mca_coll_hierarch_ignore_sm_param =
mca_base_param_register_int("coll", "hierarch", "ignore_sm", NULL, 0);
mca_base_param_reg_int(c, "priority",
"Priority of the hierarchical coll component",
false, false, mca_coll_hierarch_priority_param,
&mca_coll_hierarch_priority_param);
mca_base_param_reg_int(c, "verbose",
"Turn verbose message of the hierarchical coll component on/off",
false, false, mca_coll_hierarch_verbose_param,
&mca_coll_hierarch_verbose_param);
mca_base_param_reg_int(c, "use_rdma",
"Switch from the send btl list used to detect hierarchies to "
"the rdma btl list",
false, false, mca_coll_hierarch_use_rdma_param,
&mca_coll_hierarch_use_rdma_param);
mca_base_param_reg_int(c, "ignore_sm",
"Ignore sm protocol when detecting hierarchies. "
"Required to enable the usage of protocol"
" specific collective operations",
false, false, mca_coll_hierarch_ignore_sm_param,
&mca_coll_hierarch_ignore_sm_param);
return OMPI_SUCCESS;
}

2
ompi/mca/coll/hierarch/coll_hierarch_reduce.c
Просмотреть файл

@ -52,7 +52,7 @@ int mca_coll_hierarch_reduce_intra(void *sbuf, void *rbuf, int count,
data = comm->c_coll_selected_data;
lcomm = data->hier_lcomm;
if ( mca_coll_hier_verbose ) {
if ( mca_coll_hierarch_verbose_param ) {
printf("%s:%d: executing hierarchical reduce with cnt=%d and root=%d\n",
comm->c_name, rank, count, root );
}