Skip to content

Commit 910e0c8

Browse files
committed
UCP/RNDV: adjust gtest to MAX_MEM
1 parent 48807d8 commit 910e0c8

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/ucp/rndv/rndv_mtype.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ ucp_proto_rndv_mtype_fc_max_frags(ucp_context_h context,
197197
size_t frags_in_chunk = context->config.ext.rndv_num_frags[frag_mem_type];
198198
size_t max_frags;
199199

200-
/* frag_size must be > 0 for mtype protocols - validated during proto init */
201200
ucs_assert(frag_size > 0);
202201

203202
/* Compute max fragments and round down to allocation chunk granularity */

test/gtest/ucp/test_ucp_am.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@ class test_ucp_am_nbx_rndv_mtype_fc : public test_ucp_am_nbx_rndv_ppln {
22352235

22362236
UCS_TEST_P(test_ucp_am_nbx_rndv_mtype_fc, fc_enabled_under_cap,
22372237
"RNDV_MTYPE_WORKER_FC_ENABLE=y",
2238-
"RNDV_MTYPE_WORKER_MAX_FRAGS=128",
2238+
"RNDV_MTYPE_WORKER_MAX_MEM=1g",
22392239
"RNDV_FRAG_MEM_TYPE=cuda")
22402240
{
22412241
if (!sender().is_rndv_put_ppln_supported()) {
@@ -2270,14 +2270,14 @@ UCS_TEST_P(test_ucp_am_nbx_rndv_mtype_fc, fc_enabled_under_cap,
22702270

22712271
UCS_TEST_P(test_ucp_am_nbx_rndv_mtype_fc, fc_enabled_cap_reached,
22722272
"RNDV_MTYPE_WORKER_FC_ENABLE=y",
2273-
"RNDV_MTYPE_WORKER_MAX_FRAGS=5",
2273+
"RNDV_MTYPE_WORKER_MAX_MEM=600mb",
22742274
"RNDV_FRAG_MEM_TYPE=cuda")
22752275
{
22762276
if (!sender().is_rndv_put_ppln_supported()) {
22772277
UCS_TEST_SKIP_R("RNDV is not supported");
22782278
}
22792279

2280-
send_message(20);
2280+
send_message(200);
22812281

22822282
/* Verify mtype protocols were used */
22832283
check_stats_ge(sender(), UCP_WORKER_STAT_RNDV_PUT_MTYPE_ZCOPY, 1);
@@ -2289,7 +2289,7 @@ UCS_TEST_P(test_ucp_am_nbx_rndv_mtype_fc, fc_enabled_cap_reached,
22892289
auto receiver_throttled = UCS_STATS_GET_COUNTER(receiver().worker()->stats,
22902290
UCP_WORKER_STAT_RNDV_MTYPE_FC_THROTTLED);
22912291
EXPECT_GT(sender_throttled + receiver_throttled, 0u)
2292-
<< "throttling should have occurred with MAX_FRAGS=5";
2292+
<< "throttling should have occurred with MAX_MEM=600mb";
22932293

22942294
verify_clean_fc_state();
22952295
}

0 commit comments

Comments
 (0)