Skip to content

Commit dc5f1b0

Browse files
committed
Revert "btl/ofi: add FI_REMOTE_COMM to required capabilities"
This reverts commit 3a09492. Related to open-mpi#12255 The previous change was based on a false assumption that intra-node communication will always be offload to btl/sm, and therefore we can safely request FI_REMOTE_COMM capability of the ofi provider. However, upon further testing we have discovered that this is not true. In osc/rdma, btl/sm is not selected in ompi_osc_rdma_query_accelerated_btls; Instead, btl/ofi is selected. In this case, requesting FI_REMOTE_COMM can cause regression for intra-node one-sided operations. For instance, the efa provider disables the shared memory offload functionality and redirects all traffic to the NIC. Here we first revert the previous change. We should address open-mpi#12255 before adding back FI_REMOTE_COMM. Signed-off-by: Wenduo Wang <[email protected]>
1 parent f0261cb commit dc5f1b0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

opal/mca/btl/ofi/btl_ofi_component.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
#include "btl_ofi_frag.h"
4242
#include "btl_ofi_rdma.h"
4343

44-
#define MCA_BTL_OFI_ONE_SIDED_REQUIRED_CAPS (FI_RMA | FI_ATOMIC | FI_REMOTE_COMM)
45-
#define MCA_BTL_OFI_TWO_SIDED_REQUIRED_CAPS (FI_MSG | FI_REMOTE_COMM)
44+
#define MCA_BTL_OFI_ONE_SIDED_REQUIRED_CAPS (FI_RMA | FI_ATOMIC)
45+
#define MCA_BTL_OFI_TWO_SIDED_REQUIRED_CAPS (FI_MSG)
4646

4747
#define MCA_BTL_OFI_REQUESTED_MR_MODE (FI_MR_ALLOCATED | FI_MR_PROV_KEY | FI_MR_VIRT_ADDR | FI_MR_ENDPOINT)
4848

0 commit comments

Comments
 (0)