Skip to content

Commit

Permalink
Merge pull request openucx#8 from shizhibao/huawei
Browse files Browse the repository at this point in the history
fix ucg_builtin_step_select_callbacks
  • Loading branch information
nsosnsos authored Nov 20, 2020
2 parents 4d4bfe2 + 8ead739 commit dccae87
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions test/gtest/ucg/test_cb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -570,11 +570,11 @@ TEST_F(ucg_cb_test, test_step_callback_select_termonal) {
int nonzero_length = 0;
int flags = 0;

ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);

flags |= UCG_BUILTIN_OP_STEP_FLAG_SINGLE_ENDPOINT;
ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);
}
}
Expand All @@ -590,15 +590,15 @@ TEST_F(ucg_cb_test, test_step_callback_select_waypoint_fanout) {
int nonzero_length = 0;
int flags = 0;

ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);

nonzero_length = 1;
ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);

flags |= UCG_BUILTIN_OP_STEP_FLAG_FRAGMENTED;
ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);
}
}
Expand All @@ -614,11 +614,11 @@ TEST_F(ucg_cb_test, test_step_callback_select_reduce) {

for (int nonzero_length = 0; nonzero_length < 2; nonzero_length++) {
int flags = 0;
ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);

flags |= UCG_BUILTIN_OP_STEP_FLAG_SINGLE_ENDPOINT;
ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);
}
}
Expand All @@ -635,7 +635,7 @@ TEST_F(ucg_cb_test, test_step_callback_select_nonzero) {

for (int nonzero_length = 0; nonzero_length < 2; nonzero_length++) {
int flags = 0;
ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);
}
}
Expand All @@ -647,11 +647,11 @@ TEST_F(ucg_cb_test, test_step_callback_select_barrier) {
int nonzero_length = 0;
int flags = UCG_BUILTIN_OP_STEP_FLAG_LAST_STEP;

ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ucs_status_t ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);

flags |= UCG_BUILTIN_OP_STEP_FLAG_SINGLE_ENDPOINT;
ret = ucg_builtin_step_select_callbacks(phase, recv_cb, nonzero_length, flags);
ret = ucg_builtin_step_select_callbacks(phase, 1, recv_cb, nonzero_length, flags);
ASSERT_EQ(UCS_OK, ret);
}

Expand Down

0 comments on commit dccae87

Please sign in to comment.