Merge pull request open-mpi#9 from RainybIue/huawei

modify the format and add a note
shizhibao · Dec 9, 2020 · 9a64c16 · 9a64c16
2 parents 386000f + a8fca2d
commit 9a64c16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ompi/mca/coll/ucx/coll_ucx_component.c b/ompi/mca/coll/ucx/coll_ucx_component.c
@@ -357,14 +357,16 @@ int mca_coll_ucx_init(void)
 
     status = ucg_worker_create(mca_coll_ucx_component.ucg_context, &params, &mca_coll_ucx_component.ucg_worker);
     if (UCS_OK != status) {
-        COLL_UCX_WARN("Failed to create UCG worker");
+        COLL_UCX_WARN("Failed to create UCG worker, automatically select other available and highest "
+                      "priority collective component.");
         rc = OMPI_ERROR;
         goto err;
     }
 
     status = mca_coll_ucx_init_worker();
     if (UCS_OK != status) {
-        COLL_UCX_WARN("Failed to init UCG worker");
+        COLL_UCX_WARN("Failed to init UCG worker, automatically select other available and highest "
+                      "priority collective component.");
         rc = OMPI_ERROR;
         goto err_destroy_worker;
     }
@@ -377,7 +379,8 @@ int mca_coll_ucx_init(void)
 
     rc = opal_progress_register(mca_coll_ucx_progress);
     if (OPAL_SUCCESS != rc) {
-        COLL_UCX_ERROR("Failed to progress register");
+        COLL_UCX_ERROR("Failed to progress register, automatically select other available and highest "
+                       "priority collective component.");
         goto err_destroy_worker;
     }
 

diff --git a/ompi/mca/coll/ucx/coll_ucx_op.c b/ompi/mca/coll/ucx/coll_ucx_op.c
@@ -137,7 +137,7 @@ int mca_coll_ucx_allreduce(const void *sbuf, void *rbuf, int count,
     ucs_status_ptr_t req = COLL_UCX_REQ_ALLOCA(ucx_module);
 
     ret = ucg_coll_allreduce_init(sbuf, rbuf, count, (size_t)extent, dtype, ucx_module->ucg_group, 0,
-                                               op, 0, 0, &coll);
+                                  op, 0, 0, &coll);
     if (OPAL_UNLIKELY(ret != UCS_OK)) {
         COLL_UCX_ERROR("ucx allreduce init failed: %s", ucs_status_string(ret));
         goto exit;
@@ -465,7 +465,7 @@ int mca_coll_ucx_bcast(void *buff, int count, struct ompi_datatype_t *dtype, int
         return OMPI_ERROR;
     }
     ret = ucg_coll_bcast_init(buff, buff, count, (size_t)dtype_size, dtype, ucx_module->ucg_group, 0,
-                                           0, root, 0, &coll);
+                              0, root, 0, &coll);
     if (OPAL_UNLIKELY(UCS_STATUS_IS_ERR(ret))) {
         COLL_UCX_ERROR("ucx bcast init failed: %s", ucs_status_string(ret));
         return OMPI_ERROR;