Skip to content

Commit 1b37328

Browse files
committed
btl/uct: update for UCT_CB_FLAG_SYNC removal
Signed-off-by: Nathan Hjelm <hjelmn@me.com>
1 parent 6900249 commit 1b37328

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

opal/mca/btl/uct/btl_uct_tl.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
#include "opal/util/bit_ops.h"
1717
#include "opal/util/argv.h"
1818

19+
#if HAVE_DECL_UCT_CB_FLAG_SYNC
20+
#define MCA_BTL_UCT_CB_FLAG_SYNC UCT_CB_FLAG_SYNC
21+
#else
22+
#define MCA_BTL_UCT_CB_FLAG_SYNC 0
23+
#endif
24+
1925
/**
2026
* @brief Convert UCT capabilities to BTL flags
2127
*/
@@ -318,9 +324,9 @@ mca_btl_uct_device_context_t *mca_btl_uct_context_create (mca_btl_uct_module_t *
318324
}
319325

320326
if (context_id > 0 && tl == module->am_tl) {
321-
BTL_VERBOSE(("installing AM handler for tl %p context id %d", (void *) tl, context_id));
322-
uct_iface_set_am_handler (context->uct_iface, MCA_BTL_UCT_FRAG, mca_btl_uct_am_handler,
323-
context, UCT_CB_FLAG_SYNC);
327+
BTL_VERBOSE(("installing AM handler for tl %p context id %d", (void *) tl, context_id));
328+
uct_iface_set_am_handler (context->uct_iface, MCA_BTL_UCT_FRAG, mca_btl_uct_am_handler,
329+
context, MCA_BTL_UCT_CB_FLAG_SYNC);
324330
}
325331

326332
if (enable_progress) {

opal/mca/btl/uct/configure.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ AC_DEFUN([MCA_opal_btl_uct_CONFIG],[
3939
CPPFLAGS_save="$CPPFLAGS"
4040
CPPFLAGS="$CPPFLAGS $btl_uct_CPPFLAGS"
4141

42-
AC_CHECK_DECLS([UCT_PROGRESS_THREAD_SAFE], [], [], [[#include <uct/api/uct.h>]])
42+
AC_CHECK_DECLS([UCT_PROGRESS_THREAD_SAFE UCT_CB_FLAG_SYNC], [], [], [[#include <uct/api/uct.h>]])
4343

4444
CPPFLAGS="$CPPFLAGS_save"
4545
OPAL_VAR_SCOPE_POP

0 commit comments

Comments
 (0)