1
1

Update the grpcomm direct component's priority so it sits at the bottom of the list, as it should now that the other components are active. Cleanup up the signature print function a touch to make it more readable. Remove the unneeded xcast functions in brks and rcd components as we will just fall thru to using the "direct" one

Этот коммит содержится в:
Ralph Castain 2014-11-03 14:43:17 -08:00
родитель 8c3fb41eb7
Коммит 6fbc68c830
7 изменённых файлов: 9 добавлений и 32 удалений

Просмотреть файл

@ -242,7 +242,7 @@ orte_grpcomm_coll_t* orte_grpcomm_base_get_tracker(orte_grpcomm_signature_t *sig
if (1 < opal_output_get_verbosity(orte_grpcomm_base_framework.framework_output)) {
char *tmp=NULL;
(void)opal_dss.print(&tmp, NULL, coll->sig, ORTE_SIGNATURE);
opal_output(0, "%s grpcomm:base: creating new coll for procs %s",
opal_output(0, "%s grpcomm:base: creating new coll for%s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), tmp);
free(tmp);
}

Просмотреть файл

@ -36,9 +36,6 @@
/* Static API's */
static int init(void);
static void finalize(void);
static int xcast(orte_vpid_t *vpids,
size_t nprocs,
opal_buffer_t *msg);
static int allgather(orte_grpcomm_coll_t *coll,
opal_buffer_t *buf);
static void brks_allgather_process_data(orte_grpcomm_coll_t *coll, uint32_t distance);
@ -52,7 +49,7 @@ static int brks_finalize_coll(orte_grpcomm_coll_t *coll, int ret);
orte_grpcomm_base_module_t orte_grpcomm_brks_module = {
init,
finalize,
xcast,
NULL,
allgather
};
@ -80,13 +77,6 @@ static void finalize(void)
return;
}
static int xcast(orte_vpid_t *vpids,
size_t nprocs,
opal_buffer_t *msg)
{
return ORTE_ERR_NOT_IMPLEMENTED;
}
static int allgather(orte_grpcomm_coll_t *coll,
opal_buffer_t *sendbuf)
{

Просмотреть файл

@ -79,7 +79,6 @@ static int brks_close(void)
static int brks_query(mca_base_module_t **module, int *priority)
{
/* not implemented yet */
*priority = my_priority;
*module = (mca_base_module_t *)&orte_grpcomm_brks_module;
return ORTE_SUCCESS;

Просмотреть файл

@ -54,10 +54,9 @@ static int direct_register(void)
mca_base_component_t *c = &mca_grpcomm_direct_component.base_version;
/* make the priority adjustable so users can select
* direct for use by apps without affecting daemons - set
* it to be first for now until the others are fixed
* direct for use by apps without affecting daemons
*/
my_priority = 1000;
my_priority = 1;
(void) mca_base_component_var_register(c, "priority",
"Priority of the grpcomm direct component",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,

Просмотреть файл

@ -37,9 +37,6 @@
/* Static API's */
static int init(void);
static void finalize(void);
static int xcast(orte_vpid_t *vpids,
size_t nprocs,
opal_buffer_t *msg);
static int allgather(orte_grpcomm_coll_t *coll,
opal_buffer_t *buf);
static void rcd_allgather_process_data(orte_grpcomm_coll_t *coll, uint32_t distance);
@ -53,7 +50,7 @@ static int rcd_finalize_coll(orte_grpcomm_coll_t *coll, int ret);
orte_grpcomm_base_module_t orte_grpcomm_rcd_module = {
init,
finalize,
xcast,
NULL,
allgather
};
@ -80,13 +77,6 @@ static void finalize(void)
return;
}
static int xcast(orte_vpid_t *vpids,
size_t nprocs,
opal_buffer_t *msg)
{
return ORTE_ERR_NOT_IMPLEMENTED;
}
static int allgather(orte_grpcomm_coll_t *coll,
opal_buffer_t *sendbuf)
{

Просмотреть файл

@ -79,7 +79,6 @@ static int rcd_close(void)
static int rcd_query(mca_base_module_t **module, int *priority)
{
/* not implemented yet */
*priority = my_priority;
*module = (mca_base_module_t *)&orte_grpcomm_rcd_module;
return ORTE_SUCCESS;

Просмотреть файл

@ -905,19 +905,19 @@ int orte_dt_print_sig(char **output, char *prefix, orte_grpcomm_signature_t *src
/* if src is NULL, just print data type and return */
if (NULL == src) {
asprintf(output, "%sData type: ORTE_SIG\tValue: NULL pointer", prefx);
asprintf(output, "%sData type: ORTE_SIG", prefx);
free(prefx);
return OPAL_SUCCESS;
}
if (NULL == src->signature) {
asprintf(output, "%sORTE_SIG\tValue: NULL", prefx);
asprintf(output, "%sORTE_SIG SeqNumber:%d Procs: NULL", prefx, src->seq_num);
free(prefx);
return ORTE_SUCCESS;
}
/* there must be at least one */
asprintf(&tmp, "%sORTE_SIG\tSeqNumber:%d\tValue: ", prefx, src->seq_num);
/* there must be at least one proc in the signature */
asprintf(&tmp, "%sORTE_SIG SeqNumber:%d Procs: ", prefx, src->seq_num);
for (i=0; i < src->sz; i++) {
asprintf(&tmp2, "%s%s", tmp, ORTE_NAME_PRINT(&src->signature[i]));