GTEST: Fix rebase comp error

openucx · Sep 15, 2024 · 87019a3 · 87019a3
1 parent e4ca90e
commit 87019a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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];