From 4e61412001d5095791b21262d5b45063539695d2 Mon Sep 17 00:00:00 2001 From: Nicholas Sarkauskas Date: Tue, 9 Jul 2024 23:35:17 +0300 Subject: [PATCH] Undo unnecessary changes --- src/core/ucc_coll.c | 5 +---- src/utils/ucc_coll_utils.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/ucc_coll.c b/src/core/ucc_coll.c index cf64ab1cc3..2b58b375c7 100644 --- a/src/core/ucc_coll.c +++ b/src/core/ucc_coll.c @@ -178,8 +178,6 @@ UCC_CORE_PROFILE_FUNC(ucc_status_t, ucc_collective_init, ucc_ee_type_t coll_ee_type; size_t coll_size; - printf("nick in ucc_collective_init: dst buffer=%p\n", coll_args->dst.info.buffer); - if (ucc_unlikely(team->state != UCC_TEAM_ACTIVE)) { ucc_error("team %p is used before team create is completed", team); return UCC_ERR_INVALID_PARAM; @@ -250,11 +248,10 @@ UCC_CORE_PROFILE_FUNC(ucc_status_t, ucc_collective_init, goto free_scratch; } - coll_mem_type = ucc_coll_args_mem_type(&op_args.args, team->rank); - task->flags |= UCC_COLL_TASK_FLAG_TOP_LEVEL; if (task->flags & UCC_COLL_TASK_FLAG_EXECUTOR) { task->flags |= UCC_COLL_TASK_FLAG_EXECUTOR_STOP; + coll_mem_type = ucc_coll_args_mem_type(&op_args.args, team->rank); switch(coll_mem_type) { case UCC_MEMORY_TYPE_CUDA: case UCC_MEMORY_TYPE_CUDA_MANAGED: diff --git a/src/utils/ucc_coll_utils.c b/src/utils/ucc_coll_utils.c index 139df127ac..14da4ff8d8 100644 --- a/src/utils/ucc_coll_utils.c +++ b/src/utils/ucc_coll_utils.c @@ -290,8 +290,8 @@ ucc_memory_type_t ucc_coll_args_mem_type(const ucc_coll_args_t *args, return UCC_MEMORY_TYPE_NOT_APPLY; case UCC_COLL_TYPE_BCAST: return args->src.info.mem_type; - case UCC_COLL_TYPE_ALLREDUCE: case UCC_COLL_TYPE_ALLTOALL: + case UCC_COLL_TYPE_ALLREDUCE: case UCC_COLL_TYPE_ALLGATHER: case UCC_COLL_TYPE_REDUCE_SCATTER: return args->dst.info.mem_type;