Fix the s1 component so direct launch is supported for SLURM
Этот коммит содержится в:
родитель
3430f154fc
Коммит
a2a15cea8a
@ -126,7 +126,7 @@ static int kvs_get(const char key[], char value [], int maxvalue)
|
|||||||
int rc;
|
int rc;
|
||||||
rc = PMI_KVS_Get(pmix_kvs_name, key, value, maxvalue);
|
rc = PMI_KVS_Get(pmix_kvs_name, key, value, maxvalue);
|
||||||
if( PMI_SUCCESS != rc ){
|
if( PMI_SUCCESS != rc ){
|
||||||
OPAL_PMI_ERROR(rc, "PMI_KVS_Get");
|
/* silently return an error - might be okay */
|
||||||
return OPAL_ERROR;
|
return OPAL_ERROR;
|
||||||
}
|
}
|
||||||
return OPAL_SUCCESS;
|
return OPAL_SUCCESS;
|
||||||
@ -206,6 +206,7 @@ static int s1_init(void)
|
|||||||
ret = PMI_Get_rank(&rank);
|
ret = PMI_Get_rank(&rank);
|
||||||
if( PMI_SUCCESS != ret ) {
|
if( PMI_SUCCESS != ret ) {
|
||||||
OPAL_PMI_ERROR(ret, "PMI_Get_rank");
|
OPAL_PMI_ERROR(ret, "PMI_Get_rank");
|
||||||
|
free(pmix_id);
|
||||||
goto err_exit;
|
goto err_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -219,7 +220,6 @@ static int s1_init(void)
|
|||||||
ui32 = strtoul(str, NULL, 10);
|
ui32 = strtoul(str, NULL, 10);
|
||||||
s1_pname.jobid |= (ui32 & 0x0000ffff);
|
s1_pname.jobid |= (ui32 & 0x0000ffff);
|
||||||
}
|
}
|
||||||
free(pmix_id);
|
|
||||||
ldr.jobid = s1_pname.jobid;
|
ldr.jobid = s1_pname.jobid;
|
||||||
s1_pname.vpid = rank;
|
s1_pname.vpid = rank;
|
||||||
/* store our name in the opal_proc_t so that
|
/* store our name in the opal_proc_t so that
|
||||||
|
@ -157,9 +157,6 @@ static int kvs_get(const char key[], char value [], int maxvalue)
|
|||||||
* case
|
* case
|
||||||
*/
|
*/
|
||||||
if (PMI_SUCCESS != rc) {
|
if (PMI_SUCCESS != rc) {
|
||||||
if (PMI_ERR_INVALID_KEY != rc) {
|
|
||||||
OPAL_PMI_ERROR(rc, "PMI_KVS_Get");
|
|
||||||
}
|
|
||||||
return OPAL_ERROR;
|
return OPAL_ERROR;
|
||||||
}
|
}
|
||||||
return OPAL_SUCCESS;
|
return OPAL_SUCCESS;
|
||||||
@ -614,7 +611,6 @@ static int s2_get(const opal_process_name_t *id,
|
|||||||
opal_value_t **kv)
|
opal_value_t **kv)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
opal_output(0, "CALLED GET FOR %s", key);
|
|
||||||
rc = opal_pmix_base_cache_keys_locally(id, key, kv, pmix_kvs_name, pmix_vallen_max, kvs_get);
|
rc = opal_pmix_base_cache_keys_locally(id, key, kv, pmix_kvs_name, pmix_vallen_max, kvs_get);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user