Merge pull request #11284 from shimmybalsam/ucc_team_destroy_nb

coll/ucc: updating team desroy as nonblocking

Author: janjust

ompi/mca/coll/ucc/coll_ucc_module.c

@@ -186,9 +186,9 @@ static int mca_coll_ucc_save_coll_handlers(mca_coll_ucc_module_t *ucc_module)
 */
 static int ucc_comm_attr_del_fn(MPI_Comm comm, int keyval, void *attr_val, void *extra)
 {
-
     mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*) attr_val;
-    ucc_team_destroy(ucc_module->ucc_team);
+    ucc_status_t status;
+    while(UCC_INPROGRESS == (status = ucc_team_destroy(ucc_module->ucc_team))) {}
     if (ucc_module->comm == &ompi_mpi_comm_world.comm) {
         if (mca_coll_ucc_component.libucc_initialized) {
             UCC_VERBOSE(1,"finalizing ucc library");
@@ -197,6 +197,10 @@ static int ucc_comm_attr_del_fn(MPI_Comm comm, int keyval, void *attr_val, void
             ucc_finalize(mca_coll_ucc_component.ucc_lib);
         }
     }
+    if (UCC_OK != status) {
+        UCC_ERROR("UCC team destroy failed");
+        return OMPI_ERROR;
+    }
     return OMPI_SUCCESS;
 }
 

oshmem/mca/scoll/ucc/scoll_ucc_module.c

@@ -50,8 +50,12 @@ int mca_scoll_ucc_progress(void)
 
 static void mca_scoll_ucc_module_destruct(mca_scoll_ucc_module_t *ucc_module)
 {
+    ucc_status_t status;
     if (ucc_module->ucc_team) {
-        ucc_team_destroy(ucc_module->ucc_team);
+        while(UCC_INPROGRESS == (status = ucc_team_destroy(ucc_module->ucc_team))) {}
+        if (status != UCC_OK) {
+            UCC_ERROR("UCC team destroy failed");
+        }
         MCA_MEMHEAP_CALL(private_free(ucc_module->pSync));
         --mca_scoll_ucc_component.nr_modules;
     }