Skip to content

Commit a6a7ce5

Browse files
committed
REVIEW: address feedback
1 parent bbc14fd commit a6a7ce5

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

src/components/tl/ucp/alltoall/alltoall.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,12 @@ ucc_status_t ucc_tl_ucp_alltoall_onesided_init(ucc_base_coll_args_t *coll_args,
7575
ucc_base_team_t *team,
7676
ucc_coll_task_t **task_h)
7777
{
78-
ucc_tl_ucp_team_t *tl_team = ucc_derived_of(team, ucc_tl_ucp_team_t);
79-
ucc_status_t status = UCC_OK;
80-
ucc_tl_ucp_task_t *task;
78+
ucc_tl_ucp_team_t *tl_team = ucc_derived_of(team, ucc_tl_ucp_team_t);
79+
ucc_tl_ucp_task_t *task;
80+
ucc_status_t status;
8181

8282
ALLTOALL_TASK_CHECK(coll_args->args, tl_team);
8383

84-
/* memory handles do not support work buffers, so check here */
8584
if (!(coll_args->args.mask & UCC_COLL_ARGS_FIELD_GLOBAL_WORK_BUFFER)) {
8685
tl_error(UCC_TL_TEAM_LIB(tl_team),
8786
"global work buffer not provided nor associated with team");
@@ -115,4 +114,4 @@ ucc_status_t ucc_tl_ucp_alltoall_onesided_init(ucc_base_coll_args_t *coll_args,
115114
}
116115
out:
117116
return status;
118-
}
117+
}

src/components/tl/ucp/tl_ucp_coll.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ enum ucc_tl_ucp_task_flags {
8989
UCC_TL_UCP_TASK_FLAG_SUBSET = UCC_BIT(0),
9090
/* indicates usage of dynamic segments */
9191
UCC_TL_UCP_TASK_FLAG_USE_DYN_SEG = UCC_BIT(1),
92-
/* indicates onesided operations have been started */
93-
UCC_TL_UCP_TASK_FLAG_OPS_STARTED = UCC_BIT(2),
9492
};
9593

9694
typedef struct ucc_tl_ucp_allreduce_sw_pipeline

src/components/tl/ucp/tl_ucp_sendrecv.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,7 @@ static inline ucc_status_t ucc_tl_ucp_put_nb(void *buffer, void *target,
597597
}
598598

599599
ucp_status = ucp_put_nbx(ep, buffer, msglen, rva, rkey, &req_param);
600+
600601
task->onesided.put_posted++;
601602
if (UCS_OK != ucp_status) {
602603
if (UCS_PTR_IS_ERR(ucp_status)) {
@@ -653,6 +654,7 @@ static inline ucc_status_t ucc_tl_ucp_get_nb(void *buffer, void *target,
653654
}
654655

655656
ucp_status = ucp_get_nbx(ep, buffer, msglen, rva, rkey, &req_param);
657+
656658
task->onesided.get_posted++;
657659
if (UCS_OK != ucp_status) {
658660
if (UCS_PTR_IS_ERR(ucp_status)) {
@@ -670,11 +672,11 @@ static inline ucc_status_t ucc_tl_ucp_atomic_inc(void * target,
670672
ucc_mem_map_mem_h *dest_memh,
671673
ucc_tl_ucp_team_t *team)
672674
{
673-
ucp_request_param_t req_param = {0};
674-
int segment = 0;
675-
uint64_t one = 1;
676-
ucp_rkey_h rkey = NULL;
677-
uint64_t rva = 0;
675+
ucp_request_param_t req_param = {0};
676+
int segment = 0;
677+
uint64_t one = 1;
678+
ucp_rkey_h rkey = NULL;
679+
uint64_t rva = 0;
678680
ucs_status_ptr_t ucp_status;
679681
ucc_status_t status;
680682
ucp_ep_h ep;

src/ucc/api/ucc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,8 @@ typedef ucc_oob_coll_t ucc_team_oob_coll_t;
902902
* @ingroup UCC_CONTEXT_DT
903903
*/
904904
typedef struct ucc_mem_map {
905-
void *address; /*!< the address of a buffer to be attached to a UCC context */
906-
size_t len; /*!< the length of the buffer */
905+
void * address; /*!< the address of a buffer to be attached to a UCC context */
906+
size_t len; /*!< the length of the buffer */
907907
} ucc_mem_map_t;
908908

909909
/**
@@ -1710,7 +1710,7 @@ typedef enum {
17101710
Note, the status is not guaranteed
17111711
to be global on all the processes
17121712
participating in the collective.*/
1713-
UCC_COLL_ARGS_FLAG_MEM_MAPPED_BUFFERS = UCC_BIT(7), /*!< If set, both src
1713+
UCC_COLL_ARGS_FLAG_MEM_MAPPED_BUFFERS = UCC_BIT(7), /*!< If set, both src
17141714
and dst buffers
17151715
reside in a memory
17161716
mapped region.
@@ -1720,7 +1720,7 @@ typedef enum {
17201720
the src_memh memory
17211721
handle is an array of
17221722
global handles. */
1723-
UCC_COLL_ARGS_FLAG_DST_MEMH_GLOBAL = UCC_BIT(9) /*!< If set, indicates
1723+
UCC_COLL_ARGS_FLAG_DST_MEMH_GLOBAL = UCC_BIT(9), /*!< If set, indicates
17241724
the dst_memh memory
17251725
handle is an array of
17261726
global handles. */

test/mpi/test_alltoallv.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ TestAlltoallv::TestAlltoallv(ucc_test_team_t &_team, TestCaseParams &params) :
5555

5656
MPI_Comm_rank(team.comm, &rank);
5757
MPI_Comm_size(team.comm, &nprocs);
58-
//MPI_Barrier(team.comm);
5958

6059
if (TEST_SKIP_NONE != skip_reduce(test_max_size < (msgsize * nprocs),
6160
TEST_SKIP_MEM_LIMIT, team.comm)) {

0 commit comments

Comments
 (0)