From 419a12890ab6737a45df6b15c1e782d43e27a197 Mon Sep 17 00:00:00 2001 From: Nick Sarkauskas Date: Wed, 26 Jun 2024 10:10:27 -0700 Subject: [PATCH] TL/UCP: Call algs linear xgvmi --- src/components/tl/ucp/allgather/allgather.c | 4 ++-- src/components/tl/ucp/allgather/allgather.h | 2 +- src/components/tl/ucp/allgather/allgather_xgvmi.c | 4 ++-- src/components/tl/ucp/alltoall/alltoall.c | 8 ++++---- src/components/tl/ucp/alltoall/alltoall.h | 2 +- src/components/tl/ucp/alltoall/alltoall_xgvmi.c | 4 ++-- src/components/tl/ucp/tl_ucp_coll.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/tl/ucp/allgather/allgather.c b/src/components/tl/ucp/allgather/allgather.c index 88e4704339..15b208a39b 100644 --- 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 index 7dea71d139..9a710e717a 100644 --- 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 index d7b90eb792..de0da5ad76 100644 --- 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 index c65f75e031..357cb72116 100644 --- 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 index be1ccf2b1d..e7c9cc3dd9 100644 --- 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 index 26b24aa7ab..77dc957cdf 100644 --- 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 index acb066908a..392ba11352 100644 --- 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: