Skip to content

Commit e498938

Browse files
authored
Merge pull request #10827 from awlauria/prte_pmix_up
Update OpenPMIx and PRRTe submodules.
2 parents 43a95bd + 0b792c1 commit e498938

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.ci/mellanox/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
--ulimit memlock=-1 --security-opt seccomp=unconfined --cap-add=SYS_ADMIN --device=/dev/infiniband/
2626
steps:
2727
- checkout: self
28-
submodules: true
28+
submodules: recursive
2929
path: ompi
3030
clean: true
3131
- bash: |

3rd-party/openpmix

Submodule openpmix updated 55 files

3rd-party/prrte

Submodule prrte updated 455 files

ompi/instance/instance.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,13 @@ static int ompi_mpi_instance_init_common (int argc, char **argv)
434434
/* give it a name so we can distinguish it */
435435
PMIX_INFO_LOAD(&info[1], PMIX_EVENT_HDLR_NAME, "ULFM-Event-handler", PMIX_STRING);
436436
OPAL_PMIX_CONSTRUCT_LOCK(&mylock);
437-
pmix_status_t codes[2] = { PMIX_ERR_PROC_ABORTED, PMIX_ERR_LOST_CONNECTION };
438-
PMIx_Register_event_handler(codes, 1, info, 2, ompi_errhandler_callback, evhandler_reg_callbk, (void*)&mylock);
437+
pmix_status_t codes[4] = {
438+
PMIX_ERR_PROC_ABORTED,
439+
PMIX_ERR_EXIT_NONZERO_TERM,
440+
PMIX_ERR_PROC_ABORTED_BY_SIG,
441+
PMIX_ERR_LOST_CONNECTION
442+
};
443+
PMIx_Register_event_handler(codes, 3, info, 2, ompi_errhandler_callback, evhandler_reg_callbk, (void*)&mylock);
439444
OPAL_PMIX_WAIT_THREAD(&mylock);
440445
rc = mylock.status;
441446
ompi_ulfm_pmix_err_handler = mylock.errhandler_ref;

0 commit comments

Comments
 (0)