We no longer pass the RML URI for procs launched via mpirun as the daemon has no need for that info.
Этот коммит содержится в:
родитель
a0487e014c
Коммит
d7d8ae46ed
@ -101,7 +101,6 @@ const opal_pmix_base_module_t opal_pmix_native_module = {
|
|||||||
// local variables
|
// local variables
|
||||||
static int init_cntr = 0;
|
static int init_cntr = 0;
|
||||||
opal_process_name_t native_pname;
|
opal_process_name_t native_pname;
|
||||||
static char *local_uri = NULL;
|
|
||||||
static uint32_t sm_flag;
|
static uint32_t sm_flag;
|
||||||
|
|
||||||
static void unpack_segment_info(opal_buffer_t *buf, opal_process_name_t *id, char** seg_info)
|
static void unpack_segment_info(opal_buffer_t *buf, opal_process_name_t *id, char** seg_info)
|
||||||
@ -437,12 +436,6 @@ static int native_put(opal_pmix_scope_t scope,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if this is our uri, save it as we need to send it to our server
|
|
||||||
* as a special, separate item */
|
|
||||||
if (0 == strcmp(OPAL_DSTORE_URI, kv->key)) {
|
|
||||||
local_uri = strdup(kv->data.string);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* have to save a copy locally as some of our components will
|
/* have to save a copy locally as some of our components will
|
||||||
* look for it */
|
* look for it */
|
||||||
(void)opal_dstore.store(opal_dstore_internal, &OPAL_PROC_MY_NAME, kv);
|
(void)opal_dstore.store(opal_dstore_internal, &OPAL_PROC_MY_NAME, kv);
|
||||||
@ -493,17 +486,6 @@ static int native_fence(opal_process_name_t *procs, size_t nprocs)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* provide our URI */
|
|
||||||
if (OPAL_SUCCESS != (rc = opal_dss.pack(msg, &local_uri, 1, OPAL_STRING))) {
|
|
||||||
OPAL_ERROR_LOG(rc);
|
|
||||||
OBJ_RELEASE(msg);
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
/* only do it once */
|
|
||||||
if (NULL != local_uri) {
|
|
||||||
free(local_uri);
|
|
||||||
local_uri = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* pack 1 if we have sm dstore enabled, 0 otherwise */
|
/* pack 1 if we have sm dstore enabled, 0 otherwise */
|
||||||
if (OPAL_SUCCESS != (rc = opal_dss.pack(msg, &sm_flag, 1, OPAL_UINT32))) {
|
if (OPAL_SUCCESS != (rc = opal_dss.pack(msg, &sm_flag, 1, OPAL_UINT32))) {
|
||||||
@ -757,17 +739,6 @@ static int native_fence_nb(opal_process_name_t *procs, size_t nprocs,
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* provide our URI */
|
|
||||||
if (OPAL_SUCCESS != (rc = opal_dss.pack(msg, &local_uri, 1, OPAL_STRING))) {
|
|
||||||
OPAL_ERROR_LOG(rc);
|
|
||||||
OBJ_RELEASE(msg);
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
/* only do it once */
|
|
||||||
if (NULL != local_uri) {
|
|
||||||
free(local_uri);
|
|
||||||
local_uri = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* pack 1 if we have sm dstore enabled, 0 otherwise */
|
/* pack 1 if we have sm dstore enabled, 0 otherwise */
|
||||||
if (OPAL_SUCCESS != (rc = opal_dss.pack(msg, &sm_flag, 1, OPAL_UINT32))) {
|
if (OPAL_SUCCESS != (rc = opal_dss.pack(msg, &sm_flag, 1, OPAL_UINT32))) {
|
||||||
|
@ -100,7 +100,6 @@ void pmix_server_process_message(pmix_server_peer_t *peer)
|
|||||||
pmix_server_dmx_req_t *req, *nextreq;
|
pmix_server_dmx_req_t *req, *nextreq;
|
||||||
bool found;
|
bool found;
|
||||||
orte_grpcomm_signature_t *sig;
|
orte_grpcomm_signature_t *sig;
|
||||||
char *local_uri;
|
|
||||||
uint32_t sm_flag;
|
uint32_t sm_flag;
|
||||||
|
|
||||||
/* xfer the message to a buffer for unpacking */
|
/* xfer the message to a buffer for unpacking */
|
||||||
@ -207,19 +206,6 @@ void pmix_server_process_message(pmix_server_peer_t *peer)
|
|||||||
(PMIX_FENCENB_CMD == cmd) ? "FENCE_NB" : "FENCE", tmp);
|
(PMIX_FENCENB_CMD == cmd) ? "FENCE_NB" : "FENCE", tmp);
|
||||||
free(tmp);
|
free(tmp);
|
||||||
}
|
}
|
||||||
/* get the URI for this process */
|
|
||||||
cnt = 1;
|
|
||||||
if (OPAL_SUCCESS != (rc = opal_dss.unpack(&xfer, &local_uri, &cnt, OPAL_STRING))) {
|
|
||||||
ORTE_ERROR_LOG(rc);
|
|
||||||
OBJ_RELEASE(sig);
|
|
||||||
goto reply_fence;
|
|
||||||
}
|
|
||||||
/* if not NULL, then update our connection info as we might need
|
|
||||||
* to send this proc a message at some point */
|
|
||||||
if (NULL != local_uri) {
|
|
||||||
orte_rml.set_contact_info(local_uri);
|
|
||||||
free(local_uri);
|
|
||||||
}
|
|
||||||
/* unpack flag if sm dstore is supported by the client */
|
/* unpack flag if sm dstore is supported by the client */
|
||||||
cnt = 1;
|
cnt = 1;
|
||||||
if (OPAL_SUCCESS != (rc = opal_dss.unpack(&xfer, &sm_flag, &cnt, OPAL_UINT32))) {
|
if (OPAL_SUCCESS != (rc = opal_dss.unpack(&xfer, &sm_flag, &cnt, OPAL_UINT32))) {
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user