From 8f8fcd66b1e294a5d1cf6db05e8663364b7bc4e4 Mon Sep 17 00:00:00 2001 From: Nick Sarkauskas Date: Tue, 23 Jan 2024 09:12:01 -0800 Subject: [PATCH] Revert formatting changes to non sliding window code --- src/components/tl/ucp/tl_ucp.c | 8 +++++--- src/components/tl/ucp/tl_ucp_coll.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/tl/ucp/tl_ucp.c b/src/components/tl/ucp/tl_ucp.c index 3089b5b870..83fa7dceeb 100644 --- a/src/components/tl/ucp/tl_ucp.c +++ b/src/components/tl/ucp/tl_ucp.c @@ -48,7 +48,7 @@ ucc_config_field_t ucc_tl_ucp_lib_config_table[] = { ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_pairwise_num_posts), UCC_CONFIG_TYPE_UINT}, - /* TODO: add radix to config once it's fully supported by the algorithm +/* TODO: add radix to config once it's fully supported by the algorithm {"ALLTOALLV_HYBRID_RADIX", "2", "Radix of the Hybrid Alltoallv algorithm", ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_radix), @@ -196,8 +196,10 @@ ucc_config_field_t ucc_tl_ucp_lib_config_table[] = { ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_scatterv_ring_bidirectional), UCC_CONFIG_TYPE_BOOL}, - {"USE_TOPO", "try", "Allow usage of tl ucp topo", - ucc_offsetof(ucc_tl_ucp_lib_config_t, use_topo), UCC_CONFIG_TYPE_TERNARY}, + {"USE_TOPO", "try", + "Allow usage of tl ucp topo", + ucc_offsetof(ucc_tl_ucp_lib_config_t, use_topo), + UCC_CONFIG_TYPE_TERNARY}, {"RANKS_REORDERING", "y", "Use topology information in TL UCP to reorder ranks. Requires topo info", diff --git a/src/components/tl/ucp/tl_ucp_coll.h b/src/components/tl/ucp/tl_ucp_coll.h index ecf95d1207..324883fa3d 100644 --- a/src/components/tl/ucp/tl_ucp_coll.h +++ b/src/components/tl/ucp/tl_ucp_coll.h @@ -279,7 +279,7 @@ static inline void ucc_tl_ucp_task_reset(ucc_tl_ucp_task_t *task, static inline ucc_tl_ucp_task_t *ucc_tl_ucp_get_task(ucc_tl_ucp_team_t *team) { ucc_tl_ucp_context_t *ctx = UCC_TL_UCP_TEAM_CTX(team); - ucc_tl_ucp_task_t *task = (ucc_tl_ucp_task_t *)ucc_mpool_get(&ctx->req_mp); + ucc_tl_ucp_task_t *task = ucc_mpool_get(&ctx->req_mp);; UCC_TL_UCP_PROFILE_REQUEST_NEW(task, "tl_ucp_task", 0); task->super.flags = 0; @@ -306,7 +306,7 @@ ucc_tl_ucp_get_schedule(ucc_tl_ucp_team_t *team, { ucc_tl_ucp_context_t *ctx = UCC_TL_UCP_TEAM_CTX(team); - *schedule = (ucc_tl_ucp_schedule_t *)ucc_mpool_get(&ctx->req_mp); + *schedule = ucc_mpool_get(&ctx->req_mp); if (ucc_unlikely(!(*schedule))) { return UCC_ERR_NO_MEMORY;