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

Update the other grpcomm modules to new API

Просмотр исходного кода 
This commit was SVN r26601.
Этот коммит содержится в:
Ralph Castain 2012-06-14 03:28:48 +00:00
родитель 5ba4deff07
Коммит 0e3094c318
3 изменённых файлов: 42 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
orte/mca/grpcomm/cnos/grpcomm_cnos_module.c
Просмотреть файл

@ -55,11 +55,15 @@ static int orte_grpcomm_cnos_barrier(orte_grpcomm_collective_t *coll);
static int allgather(orte_grpcomm_collective_t *coll); static int allgather(orte_grpcomm_collective_t *coll);
static int set_proc_attr(const char *attr_name, static int set_proc_attr(const char* project,
const char* framework,
const char *attr_name,
const void *data, const void *data,
size_t size); size_t size);
static int get_proc_attr(const orte_process_name_t proc, static int get_proc_attr(const orte_process_name_t proc,
const char* project,
const char* framework,
const char * attribute_name, void **val, const char * attribute_name, void **val,
size_t *size); size_t *size);
@ -146,7 +150,9 @@ static int allgather(orte_grpcomm_collective_t *coll)
static int purge_proc_attrs(void); static int purge_proc_attrs(void);
static int set_proc_attr(const char *attr_name, static int set_proc_attr(const char* project,
const char* framework,
const char *attr_name,
const void *data, const void *data,
size_t size) size_t size)
{ {
@ -154,6 +160,8 @@ static int set_proc_attr(const char *attr_name,
} }
static int get_proc_attr(const orte_process_name_t proc, static int get_proc_attr(const orte_process_name_t proc,
const char* project,
const char* framework,
const char * attribute_name, void **val, const char * attribute_name, void **val,
size_t *size) size_t *size)
{ {

36
orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
Просмотреть файл

@ -42,9 +42,13 @@ static int xcast(orte_jobid_t job,
orte_rml_tag_t tag); orte_rml_tag_t tag);
static int pmi_allgather(orte_grpcomm_collective_t *coll); static int pmi_allgather(orte_grpcomm_collective_t *coll);
static int pmi_barrier(orte_grpcomm_collective_t *coll); static int pmi_barrier(orte_grpcomm_collective_t *coll);
static int pmi_set_proc_attr(const char* attr_name, static int pmi_set_proc_attr(const char* project,
const char* framework,
const char* attr_name,
const void *buffer, size_t size); const void *buffer, size_t size);
static int pmi_get_proc_attr(const orte_process_name_t name, static int pmi_get_proc_attr(const orte_process_name_t name,
const char* project,
const char* framework,
const char* attr_name, const char* attr_name,
void **buffer, size_t *size); void **buffer, size_t *size);
static int modex(orte_grpcomm_collective_t *coll); static int modex(orte_grpcomm_collective_t *coll);
@ -249,7 +253,9 @@ static int pmi_put_last_key (void) {
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
static int pmi_set_proc_attr(const char *attr_name, static int pmi_set_proc_attr(const char* project,
const char* framework,
const char *attr_name,
const void *buffer, size_t size) const void *buffer, size_t size)
{ {
int rc; int rc;
@ -276,6 +282,8 @@ static int pmi_set_proc_attr(const char *attr_name,
} }
static int pmi_get_proc_attr(const orte_process_name_t name, static int pmi_get_proc_attr(const orte_process_name_t name,
const char* project,
const char* framework,
const char* attr_name, const char* attr_name,
void **buffer, size_t *size) void **buffer, size_t *size)
{ {
@ -366,7 +374,7 @@ static int modex(orte_grpcomm_collective_t *coll)
} }
rc = pmi_set_proc_attr ("HOSTNAME", orte_process_info.nodename, strlen(orte_process_info.nodename)); rc = pmi_set_proc_attr ("orte", "grpcomm", "HOSTNAME", orte_process_info.nodename, strlen(orte_process_info.nodename));
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
@ -375,19 +383,19 @@ static int modex(orte_grpcomm_collective_t *coll)
* can be supported * can be supported
*/ */
rml_uri = orte_rml.get_contact_info(); rml_uri = orte_rml.get_contact_info();
rc = pmi_set_proc_attr ("RMLURI", rml_uri, strlen (rml_uri)); rc = pmi_set_proc_attr ("orte", "grpcomm", "RMLURI", rml_uri, strlen (rml_uri));
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
free(rml_uri); free(rml_uri);
#if OPAL_HAVE_HWLOC #if OPAL_HAVE_HWLOC
rc = pmi_set_proc_attr ("BIND_LEVEL", &orte_process_info.bind_level, sizeof (orte_process_info.bind_level)); rc = pmi_set_proc_attr ("orte", "grpcomm", "BIND_LEVEL", &orte_process_info.bind_level, sizeof (orte_process_info.bind_level));
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
rc = pmi_set_proc_attr ("BIND_IDX", &orte_process_info.bind_idx, sizeof (orte_process_info.bind_idx)); rc = pmi_set_proc_attr ("orte", "grpcomm", "BIND_IDX", &orte_process_info.bind_idx, sizeof (orte_process_info.bind_idx));
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
@ -398,11 +406,11 @@ static int modex(orte_grpcomm_collective_t *coll)
/* get my pidmap entry */ /* get my pidmap entry */
pmap = (orte_pmap_t*)opal_pointer_array_get_item(&jmap->pmap, ORTE_PROC_MY_NAME->vpid); pmap = (orte_pmap_t*)opal_pointer_array_get_item(&jmap->pmap, ORTE_PROC_MY_NAME->vpid);
rc = pmi_set_proc_attr ("LOCALRANK", &pmap->local_rank, sizeof (pmap->local_rank)); rc = pmi_set_proc_attr ("orte", "grpcomm", "LOCALRANK", &pmap->local_rank, sizeof (pmap->local_rank));
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
rc = pmi_set_proc_attr ("NODERANK", &pmap->node_rank, sizeof (pmap->node_rank)); rc = pmi_set_proc_attr ("orte", "grpcomm", "NODERANK", &pmap->node_rank, sizeof (pmap->node_rank));
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
@ -431,7 +439,7 @@ static int modex(orte_grpcomm_collective_t *coll)
name.vpid = v; name.vpid = v;
rc = pmi_get_proc_attr (name, "RMLURI", (void **) &rml_uri, &len); rc = pmi_get_proc_attr (name, "orte", "grpcomm", "RMLURI", (void **) &rml_uri, &len);
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
@ -447,7 +455,7 @@ static int modex(orte_grpcomm_collective_t *coll)
} }
free(rml_uri); free(rml_uri);
rc = pmi_get_proc_attr (name, "HOSTNAME", &tmp_val, &len); rc = pmi_get_proc_attr (name, "orte", "grpcomm", "HOSTNAME", &tmp_val, &len);
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
@ -496,14 +504,14 @@ static int modex(orte_grpcomm_collective_t *coll)
unsigned int bind_idx; unsigned int bind_idx;
/* get the proc's locality info, if available */ /* get the proc's locality info, if available */
pmi_get_proc_attr (name, "BIND_LEVEL", &tmp_val, &len); pmi_get_proc_attr (name, "orte", "grpcomm", "BIND_LEVEL", &tmp_val, &len);
if (ORTE_SUCCESS == rc && 0 < len) { if (ORTE_SUCCESS == rc && 0 < len) {
assert (len == sizeof (bind_level)); assert (len == sizeof (bind_level));
memmove (&bind_level, tmp_val, len); memmove (&bind_level, tmp_val, len);
free (tmp_val); free (tmp_val);
} }
rc = pmi_get_proc_attr (name, "BIND_IDX", &tmp_val, &len); rc = pmi_get_proc_attr (name, "orte", "grpcomm", "BIND_IDX", &tmp_val, &len);
if (ORTE_SUCCESS == rc && 0 < len) { if (ORTE_SUCCESS == rc && 0 < len) {
assert (len == sizeof (bind_idx)); assert (len == sizeof (bind_idx));
memmove (&bind_idx, tmp_val, len); memmove (&bind_idx, tmp_val, len);
@ -537,7 +545,7 @@ static int modex(orte_grpcomm_collective_t *coll)
} }
#endif #endif
/* get the proc's local/node rank info */ /* get the proc's local/node rank info */
rc = pmi_get_proc_attr (name, "LOCALRANK", &tmp_val, &len); rc = pmi_get_proc_attr (name, "orte", "grpcomm", "LOCALRANK", &tmp_val, &len);
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }
@ -545,7 +553,7 @@ static int modex(orte_grpcomm_collective_t *coll)
memmove (&pmap->local_rank, tmp_val, len); memmove (&pmap->local_rank, tmp_val, len);
free (tmp_val); free (tmp_val);
rc = pmi_get_proc_attr (name, "NODERANK", &tmp_val, &len); rc = pmi_get_proc_attr (name, "orte", "grpcomm", "NODERANK", &tmp_val, &len);
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
return rc; return rc;
} }

12
orte/mca/grpcomm/portals4_shmem/grpcomm_portals4_shmem_module.c
Просмотреть файл

@ -52,11 +52,15 @@ static int orte_grpcomm_portals4_shmem_barrier(orte_grpcomm_collective_t *coll);
static int allgather(orte_grpcomm_collective_t *coll); static int allgather(orte_grpcomm_collective_t *coll);
static int set_proc_attr(const char *attr_name, static int set_proc_attr(const char* project,
const char* framework,
const char *attr_name,
const void *data, const void *data,
size_t size); size_t size);
static int get_proc_attr(const orte_process_name_t proc, static int get_proc_attr(const orte_process_name_t proc,
const char* project,
const char* framework,
const char * attribute_name, void **val, const char * attribute_name, void **val,
size_t *size); size_t *size);
@ -141,7 +145,9 @@ static int allgather(orte_grpcomm_collective_t *coll)
static int purge_proc_attrs(void); static int purge_proc_attrs(void);
static int set_proc_attr(const char *attr_name, static int set_proc_attr(const char* project,
const char* framework,
const char *attr_name,
const void *data, const void *data,
size_t size) size_t size)
{ {
@ -156,6 +162,8 @@ static int set_proc_attr(const char *attr_name,
} }
static int get_proc_attr(const orte_process_name_t proc, static int get_proc_attr(const orte_process_name_t proc,
const char* project,
const char* framework,
const char * attribute_name, void **val, const char * attribute_name, void **val,
size_t *size) size_t *size)
{ {