TL/UCP: Call algs linear xgvmi

openucx · Jun 26, 2024 · 8e17a30 · 8e17a30
1 parent 53b6b3c
commit 8e17a30
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/src/components/tl/ucp/allgather/allgather.c b/src/components/tl/ucp/allgather/allgather.c
@@ -31,8 +31,8 @@ ucc_base_coll_alg_info_t
             {.id   = UCC_TL_UCP_ALLGATHER_ALG_SPARBIT,
              .name = "sparbit",
              .desc = "O(log(N)) SPARBIT algorithm"},
-        [UCC_TL_UCP_ALLGATHER_ALG_XGVMI] =
-            {.id   = UCC_TL_UCP_ALLGATHER_ALG_XGVMI,
+        [UCC_TL_UCP_ALLGATHER_ALG_LINEAR_XGVMI] =
+            {.id   = UCC_TL_UCP_ALLGATHER_ALG_LINEAR_XGVMI,
              .name = "xgvmi",
              .desc = "Offloaded xgvmi algorithm"},
         [UCC_TL_UCP_ALLGATHER_ALG_LAST] = {

diff --git a/src/components/tl/ucp/allgather/allgather.h b/src/components/tl/ucp/allgather/allgather.h
@@ -14,7 +14,7 @@ enum {
     UCC_TL_UCP_ALLGATHER_ALG_NEIGHBOR,
     UCC_TL_UCP_ALLGATHER_ALG_BRUCK,
     UCC_TL_UCP_ALLGATHER_ALG_SPARBIT,
-    UCC_TL_UCP_ALLGATHER_ALG_XGVMI,
+    UCC_TL_UCP_ALLGATHER_ALG_LINEAR_XGVMI,
     UCC_TL_UCP_ALLGATHER_ALG_LAST
 };
 

diff --git a/src/components/tl/ucp/allgather/allgather_xgvmi.c b/src/components/tl/ucp/allgather/allgather_xgvmi.c
@@ -14,8 +14,8 @@ void ucc_tl_ucp_dpu_xgvmi_rdma_progress_allgather(ucc_coll_task_t *coll_task)
     ucc_rank_t            size           = (ucc_rank_t)task->subset.map.ep_num;
     ucc_datatype_t        dtype          = TASK_ARGS(task).src.info.datatype;
     size_t                dt_size        = ucc_dt_size(dtype);
-    uint32_t              count          = coll_task->bargs.args.src.info.count;
-    uint32_t              host_team_size = size;
+    ucc_count_t           count          = coll_task->bargs.args.src.info.count;
+    ucc_rank_t            host_team_size = size;
     ucc_base_team_t      *base_team      = coll_task->team;
     ucc_tl_ucp_team_t    *tl_team        = ucc_derived_of(base_team, ucc_tl_ucp_team_t);
     ucc_coll_task_t      *allgather_task = task->dpu_xgvmi.allgather_task;

diff --git a/src/components/tl/ucp/alltoall/alltoall.c b/src/components/tl/ucp/alltoall/alltoall.c
@@ -43,10 +43,10 @@ ucc_base_coll_alg_info_t
             {.id   = UCC_TL_UCP_ALLTOALL_ALG_ONESIDED,
              .name = "onesided",
              .desc = "naive, linear one-sided implementation"},
-        [UCC_TL_UCP_ALLTOALL_ALG_XGVMI] =
-            {.id   = UCC_TL_UCP_ALLTOALL_ALG_XGVMI,
-             .name = "xgvmi",
-             .desc = "xgvmi-based implementation"},
+        [UCC_TL_UCP_ALLTOALL_ALG_LINEAR_XGVMI] =
+            {.id   = UCC_TL_UCP_ALLTOALL_ALG_LINEAR_XGVMI,
+             .name = "linear",
+             .desc = "linear xgvmi-based implementation"},
         [UCC_TL_UCP_ALLTOALL_ALG_LAST] = {.id = 0, .name = NULL, .desc = NULL}};
 
 ucc_status_t ucc_tl_ucp_alltoall_init(ucc_tl_ucp_task_t *task)

diff --git a/src/components/tl/ucp/alltoall/alltoall.h b/src/components/tl/ucp/alltoall/alltoall.h
@@ -14,7 +14,7 @@ enum {
     UCC_TL_UCP_ALLTOALL_ALG_PAIRWISE,
     UCC_TL_UCP_ALLTOALL_ALG_BRUCK,
     UCC_TL_UCP_ALLTOALL_ALG_ONESIDED,
-    UCC_TL_UCP_ALLTOALL_ALG_XGVMI,
+    UCC_TL_UCP_ALLTOALL_ALG_LINEAR_XGVMI,
     UCC_TL_UCP_ALLTOALL_ALG_LAST
 };
 

diff --git a/src/components/tl/ucp/alltoall/alltoall_xgvmi.c b/src/components/tl/ucp/alltoall/alltoall_xgvmi.c
@@ -14,8 +14,8 @@ void ucc_tl_ucp_dpu_xgvmi_rdma_progress_alltoall(ucc_coll_task_t *coll_task)
     ucc_rank_t            size           = (ucc_rank_t)task->subset.map.ep_num;
     ucc_datatype_t        dtype          = TASK_ARGS(task).src.info.datatype;
     size_t                dt_size        = ucc_dt_size(dtype);
-    uint32_t              count          = coll_task->bargs.args.src.info.count;
-    uint32_t              host_team_size = size;
+    ucc_count_t           count          = coll_task->bargs.args.src.info.count;
+    ucc_rank_t            host_team_size = size;
     ucc_base_team_t      *base_team      = coll_task->team;
     ucc_tl_ucp_team_t    *tl_team        = ucc_derived_of(base_team, ucc_tl_ucp_team_t);
     ucc_coll_task_t      *allgather_task = task->dpu_xgvmi.allgather_task;

diff --git a/src/components/tl/ucp/tl_ucp_coll.c b/src/components/tl/ucp/tl_ucp_coll.c
@@ -269,7 +269,7 @@ ucc_status_t ucc_tl_ucp_alg_id_to_init(int alg_id, const char *alg_id_str,
         case UCC_TL_UCP_ALLGATHER_ALG_SPARBIT:
             *init = ucc_tl_ucp_allgather_sparbit_init;
             break;
-        case UCC_TL_UCP_ALLGATHER_ALG_XGVMI:
+        case UCC_TL_UCP_ALLGATHER_ALG_LINEAR_XGVMI:
             *init = ucc_tl_ucp_dpu_xgvmi_init;
             break;
         default:
@@ -323,7 +323,7 @@ ucc_status_t ucc_tl_ucp_alg_id_to_init(int alg_id, const char *alg_id_str,
         case UCC_TL_UCP_ALLTOALL_ALG_ONESIDED:
             *init = ucc_tl_ucp_alltoall_onesided_init;
             break;
-        case UCC_TL_UCP_ALLTOALL_ALG_XGVMI:
+        case UCC_TL_UCP_ALLTOALL_ALG_LINEAR_XGVMI:
             *init = ucc_tl_ucp_dpu_xgvmi_init;
             break;
         default: