Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 928ee36

Browse files
committed
btl/openib: remove OFED version runtime check when XRC is used
this test seems broken : - some false positive were reported - it fails to detect some OFED version mismatch this commit simply removes this test, which means the application will likely fail if XRC is used ad OFED version is different between compile time and runtime (cherry picked from commit open-mpi/ompi@d02ccd6)
1 parent 37fc38f commit 928ee36

File tree

3 files changed

+0
-29
lines changed

3 files changed

+0
-29
lines changed

opal/mca/btl/openib/btl_openib_component.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,10 +1011,6 @@ static void device_destruct(mca_btl_openib_device_t *device)
10111011

10121012
#if HAVE_XRC
10131013

1014-
if (!mca_btl_openib_xrc_check_api()) {
1015-
return;
1016-
}
1017-
10181014
if (MCA_BTL_XRC_ENABLED) {
10191015
if (OPAL_SUCCESS != mca_btl_openib_close_xrc_domain(device)) {
10201016
BTL_VERBOSE(("XRC Internal error. Failed to close xrc domain"));

opal/mca/btl/openib/btl_openib_xrc.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,6 @@ OBJ_CLASS_INSTANCE(ib_address_t,
3939
ib_address_constructor,
4040
ib_address_destructor);
4141

42-
/* run-time check for which libibverbs XRC API we really have underneath */
43-
bool mca_btl_openib_xrc_check_api()
44-
{
45-
void *lib = dlopen(NULL, RTLD_NOW); /* current program */
46-
if (!lib) {
47-
BTL_ERROR(("XRC error: could not find XRC API version"));
48-
return false;
49-
}
50-
51-
#if OPAL_HAVE_CONNECTX_XRC_DOMAINS
52-
if (NULL != dlsym(lib, "ibv_open_xrcd")) {
53-
BTL_ERROR(("XRC error: bad XRC API (require XRC from OFED 3.12+)"));
54-
return false;
55-
}
56-
#else
57-
if (NULL != dlsym(lib, "ibv_create_xrc_rcv_qp")) {
58-
BTL_ERROR(("XRC error: bad XRC API (require XRC from OFED pre 3.12)."));
59-
return false;
60-
}
61-
#endif
62-
return true;
63-
}
64-
6542
/* This func. opens XRC domain */
6643
int mca_btl_openib_open_xrc_domain(struct mca_btl_openib_device_t *device)
6744
{

opal/mca/btl/openib/btl_openib_xrc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,4 @@ int mca_btl_openib_close_xrc_domain(struct mca_btl_openib_device_t *device);
5151
int mca_btl_openib_ib_address_add_new (uint16_t lid, uint64_t s_id,
5252
opal_jobid_t ep_jobid, mca_btl_openib_endpoint_t *ep);
5353

54-
bool mca_btl_openib_xrc_check_api(void);
55-
5654
#endif

0 commit comments

Comments
 (0)