Merge branch 'master' into topic/amdclang-arch-param

openucx · Jun 13, 2024 · 71f07f4 · 71f07f4
2 parents 7db54d7 + d82f0f6
commit 71f07f4
Show file tree

Hide file tree

Showing 9 changed files with 999 additions and 113 deletions.
diff --git a/src/components/tl/ucp/Makefile.am b/src/components/tl/ucp/Makefile.am
@@ -113,6 +113,8 @@ sources = \
  tl_ucp_ep.c \
  tl_ucp_coll.c \
  tl_ucp_service_coll.c \
+ tl_ucp_dpu_offload.h \
+ tl_ucp_dpu_offload.c \
  $(allgather) \
  $(allgatherv) \
  $(alltoall) \

diff --git a/src/components/tl/ucp/allreduce/allreduce.c b/src/components/tl/ucp/allreduce/allreduce.c
@@ -55,13 +55,3 @@ ucc_status_t ucc_tl_ucp_allreduce_knomial_init(ucc_base_coll_args_t *coll_args,
 out:
  return status;
 }
-
-ucc_status_t
-ucc_tl_ucp_allreduce_sliding_window_init(ucc_base_coll_args_t __attribute__((unused)) *coll_args, //NOLINT
- ucc_base_team_t __attribute__((unused)) *team, //NOLINT
- ucc_coll_task_t __attribute__((unused)) **task_h) //NOLINT
-{
- ucc_coll_task_t *coll_task = NULL;
- ucc_tl_ucp_allreduce_sliding_window_progress(coll_task);
- return UCC_OK;
-}
diff --git a/src/components/tl/ucp/allreduce/allreduce.h b/src/components/tl/ucp/allreduce/allreduce.h
@@ -44,31 +44,18 @@ ucc_status_t ucc_tl_ucp_allreduce_knomial_init(ucc_base_coll_args_t *coll_args,
 
 ucc_status_t
 ucc_tl_ucp_allreduce_sliding_window_init(ucc_base_coll_args_t *coll_args,
- ucc_base_team_t * team,
- ucc_coll_task_t ** task_h);
+ ucc_base_team_t *team,
+ ucc_coll_task_t **task_h);
 
 ucc_status_t ucc_tl_ucp_allreduce_knomial_init_common(ucc_tl_ucp_task_t *task);
 
-ucc_status_t
-ucc_tl_ucp_allreduce_sliding_window_task_init(ucc_base_coll_args_t *coll_args,
- ucc_base_team_t * team,
- ucc_tl_ucp_task_t * task);
-
-ucc_status_t ucc_tl_ucp_allreduce_sliding_window_allgather_info_finalize(
- ucc_service_coll_req_t *scoll_req, ucc_tl_ucp_task_t *sw_task);
-
-ucc_status_t
-ucc_tl_ucp_allreduce_sliding_window_free_gwbi(ucc_coll_task_t *coll_task);
-
 ucc_status_t ucc_tl_ucp_allreduce_knomial_start(ucc_coll_task_t *task);
 
 void ucc_tl_ucp_allreduce_knomial_progress(ucc_coll_task_t *task);
 
 ucc_status_t
 ucc_tl_ucp_allreduce_sliding_window_start(ucc_coll_task_t *coll_task);
 
-void ucc_tl_ucp_allreduce_sliding_window_progress(ucc_coll_task_t *task);
-
 ucc_status_t
 ucc_tl_ucp_allreduce_sliding_window_finalize(ucc_coll_task_t *task);