review feedback

openucx · Feb 12, 2025 · 8696d30 · 8696d30
1 parent f8c7d1b
commit 8696d30
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/components/cl/hier/allgatherv/allgatherv.c b/src/components/cl/hier/allgatherv/allgatherv.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  *
  * See file LICENSE for terms.
  */
@@ -98,6 +98,7 @@ UCC_CL_HIER_PROFILE_FUNC(ucc_status_t, ucc_cl_hier_allgatherv_init,
     ucc_rank_t              node_sbgp_size   = SBGP_SIZE(cl_team, NODE);
     ucc_rank_t              leader_sbgp_size = SBGP_SIZE(cl_team, NODE_LEADERS);
     ucc_rank_t              team_size        = UCC_CL_TEAM_SIZE(cl_team);
+    ucc_topo_t             *topo             = team->params.team->topo;
     ucc_aint_t             *node_disps       = NULL;
     ucc_count_t            *node_counts      = NULL;
     ucc_aint_t             *leader_disps     = NULL;
@@ -246,7 +247,7 @@ UCC_CL_HIER_PROFILE_FUNC(ucc_status_t, ucc_cl_hier_allgatherv_init,
             }
 
             args.args.coll_type                = UCC_COLL_TYPE_GATHERV;
-            args.args.root                     = 0;
+            args.args.root                     = topo->node_leader_rank_id;
             args.args.flags                   &= ~UCC_COLL_ARGS_FLAG_IN_PLACE;
             args.args.dst.info_v.displacements = node_disps;
             args.args.dst.info_v.counts        = node_counts;
@@ -279,7 +280,7 @@ UCC_CL_HIER_PROFILE_FUNC(ucc_status_t, ucc_cl_hier_allgatherv_init,
         args                        = args_old;
         args.args.coll_type         = UCC_COLL_TYPE_BCAST;
         args.args.flags            |= UCC_COLL_ARGS_FLAG_IN_PLACE;
-        args.args.root              = 0;
+        args.args.root              = topo->node_leader_rank_id;
         args.args.src.info.buffer   = buffer;
         args.args.src.info.count    = total_count;
         args.args.src.info.datatype = args_old.args.dst.info_v.datatype;

diff --git a/src/components/cl/hier/allgatherv/allgatherv.h b/src/components/cl/hier/allgatherv/allgatherv.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  *
  * See file LICENSE for terms.
  */

diff --git a/src/components/cl/hier/allgatherv/unpack.c b/src/components/cl/hier/allgatherv/unpack.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  *
  * See file LICENSE for terms.
  */
@@ -28,9 +28,10 @@ void ucc_cl_hier_allgatherv_unpack_progress(ucc_coll_task_t *task)
                                                 sizeof(ucc_rank_t));
     ucc_status_t             st          = UCC_OK;
     ucc_rank_t               i;
+    ucc_ee_executor_task_t  *etask;
 
     for (i = 0; i < *n_tasks; i++) {
-        ucc_ee_executor_task_t *etask = tasks[i];
+        etask = tasks[i];
         if (etask != NULL) {
             st = ucc_ee_executor_task_test(etask);
             if (st == UCC_OK) {
@@ -47,7 +48,6 @@ void ucc_cl_hier_allgatherv_unpack_progress(ucc_coll_task_t *task)
 
 out:
     schedule->super.status       = st;
-    schedule->super.super.status = st;
 }
 
 ucc_status_t ucc_cl_hier_allgatherv_unpack_start(ucc_coll_task_t *task)
@@ -71,7 +71,7 @@ ucc_status_t ucc_cl_hier_allgatherv_unpack_start(ucc_coll_task_t *task)
                                                 args->dst.info_v.datatype);
     ucc_ee_executor_t          *exec;
     ucc_status_t                status;
-    int                         i;
+    ucc_rank_t                  i;
     size_t                      src_rank_count;
     size_t                      dst_rank_count;
     size_t                      src_rank_disp;
@@ -111,7 +111,6 @@ ucc_status_t ucc_cl_hier_allgatherv_unpack_start(ucc_coll_task_t *task)
     }
 
     schedule->super.status       = UCC_INPROGRESS;
-    schedule->super.super.status = UCC_INPROGRESS;
 
     ucc_progress_queue_enqueue(cl_team->super.super.context->ucc_context->pq,
                                task);
@@ -159,4 +158,4 @@ ucc_status_t ucc_cl_hier_allgatherv_unpack_init(ucc_base_coll_args_t *coll_args,
 free_schedule:
     ucc_cl_hier_put_schedule(schedule);
     return status;
-}
+}
diff --git a/src/components/cl/hier/cl_hier_team.c b/src/components/cl/hier/cl_hier_team.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  *
  * See file LICENSE for terms.
  */
@@ -418,7 +418,6 @@ ucc_status_t ucc_cl_hier_team_get_scores(ucc_base_team_t   *cl_team,
     if (UCC_OK != status) {
         cl_error(lib, "failed to add range to score_t");
         return status;
-
     }
 
     for (i = 0; i < UCC_CL_HIER_N_DEFAULT_ALG_SELECT_STR; i++) {