Merge pull request #11228 from MamziB/mamzi/pmix-finalize

janjust · web-flow · commit bb150ac67e9a · 2023-01-04T13:40:36.000-06:00
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
@@ -972,8 +972,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) {
@@ -1033,6 +1031,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
`@@ -972,8 +972,6 @@ static bool check_file(const char root, const char path)`
`972`	`972`
`973`	`973`	`int ompi_rte_finalize(void)`
`974`	`974`	`{`
`975`		`- /* shutdown pmix */`
`976`		`- PMIx_Finalize(NULL, 0);`
`977`	`975`
`978`	`976`	`/* cleanup the session directory we created */`
`979`	`977`	`if (NULL != opal_process_info.job_session_dir) {`
`@@ -1033,6 +1031,9 @@ int ompi_rte_finalize(void)`
`1033`	`1031`
`1034`	`1032`	`opal_finalize ();`
`1035`	`1033`
	`1034`	`+ /* shutdown pmix */`
	`1035`	`+ PMIx_Finalize(NULL, 0);`
	`1036`	`+`
`1036`	`1037`	`return OMPI_SUCCESS;`
`1037`	`1038`	`}`
`1038`	`1039`