From 87019a3570fcdfae991f8eccbf51b9d011c68cae Mon Sep 17 00:00:00 2001 From: Mikhail Brinskii Date: Sun, 15 Sep 2024 20:19:36 +0300 Subject: [PATCH] GTEST: Fix rebase comp error --- src/ucp/rndv/rndv.c | 1 - test/gtest/ucp/ucp_test.cc | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ucp/rndv/rndv.c b/src/ucp/rndv/rndv.c index 7550f8d7a42..90dba6f211e 100644 --- a/src/ucp/rndv/rndv.c +++ b/src/ucp/rndv/rndv.c @@ -32,7 +32,6 @@ ucp_rndv_frag_memtype(ucp_context_t *context) * first one from the map. Anyway for proto v1 UCX_RNDV_FRAG_MEM_TYPE is * supposed to be used. */ - return ucs_ffs64(context->config.ext.rndv_frag_mem_types); } diff --git a/test/gtest/ucp/ucp_test.cc b/test/gtest/ucp/ucp_test.cc index 8fd0c7e1316..f2e746df777 100644 --- a/test/gtest/ucp/ucp_test.cc +++ b/test/gtest/ucp/ucp_test.cc @@ -1184,8 +1184,11 @@ bool ucp_test_base::entity::has_lane_with_caps(uint64_t caps) const bool ucp_test_base::entity::is_rndv_put_ppln_supported() const { - const auto config = ucp_ep_config(ep()); - ucs_memory_type_t mem_type = ucph()->config.ext.rndv_frag_mem_type; + const auto config = ucp_ep_config(ep()); + ucs_memory_type_t mem_type; + + mem_type = (ucs_memory_type_t)ucs_ffs64( + ucph()->config.ext.rndv_frag_mem_types); for (auto i = 0; i < config->key.num_lanes; ++i) { const auto lane = config->key.rma_bw_lanes[i];