Merge pull request #11263 from MamziB/mamzi/pmix-finalize-v5

janjust · web-flow · commit 9643281ce8fa · 2023-01-10T08:13:20.000-06:00
v5.0.x: pml/ucx: move pmix finalize to the end of ompi_rte_finalize()
diff --git a/ompi/runtime/ompi_rte.c b/ompi/runtime/ompi_rte.c
@@ -967,8 +967,6 @@ static bool check_file(const char *root, const char *path)
 
 int ompi_rte_finalize(void)
 {
-    /* shutdown pmix */
-    PMIx_Finalize(NULL, 0);
 
     /* cleanup the session directory we created */
     if (NULL != opal_process_info.job_session_dir) {
@@ -1028,6 +1026,9 @@ int ompi_rte_finalize(void)
 
     opal_finalize ();
 
+    /* shutdown pmix */
+    PMIx_Finalize(NULL, 0);
+
     return OMPI_SUCCESS;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -967,8 +967,6 @@ static bool check_file(const char root, const char path)`
`967`	`967`
`968`	`968`	`int ompi_rte_finalize(void)`
`969`	`969`	`{`
`970`		`- /* shutdown pmix */`
`971`		`- PMIx_Finalize(NULL, 0);`
`972`	`970`
`973`	`971`	`/* cleanup the session directory we created */`
`974`	`972`	`if (NULL != opal_process_info.job_session_dir) {`
`@@ -1028,6 +1026,9 @@ int ompi_rte_finalize(void)`
`1028`	`1026`
`1029`	`1027`	`opal_finalize ();`
`1030`	`1028`
	`1029`	`+ /* shutdown pmix */`
	`1030`	`+ PMIx_Finalize(NULL, 0);`
	`1031`	`+`
`1031`	`1032`	`return OMPI_SUCCESS;`
`1032`	`1033`	`}`
`1033`	`1034`