Skip to content

Commit 1223b05

Browse files
author
Sergey Oblomov
committed
MCA/COMMON/UCX: fixed build scripts
- updated evaluation of UCX lib - used call from UCX v1.3 - updated makefile compilation flags Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>
1 parent 4c23068 commit 1223b05

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

config/ompi_check_ucx.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ AC_DEFUN([OMPI_CHECK_UCX],[
4545
[OPAL_CHECK_PACKAGE([ompi_check_ucx],
4646
[ucp/api/ucp.h],
4747
[ucp],
48-
[ucp_cleanup],
48+
[ucp_ep_flush_nb],
4949
[],
5050
[],
5151
[],
@@ -77,7 +77,7 @@ AC_DEFUN([OMPI_CHECK_UCX],[
7777
OPAL_CHECK_PACKAGE([ompi_check_ucx],
7878
[ucp/api/ucp.h],
7979
[ucp],
80-
[ucp_cleanup],
80+
[ucp_ep_flush_nb],
8181
[],
8282
[$ompi_check_ucx_dir],
8383
[$ompi_check_ucx_libdir],

opal/mca/common/ucx/Makefile.am

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ endif
5050

5151
lib@OPAL_LIB_PREFIX@mca_common_ucx_la_SOURCES = \
5252
$(headers) $(sources)
53+
lib@OPAL_LIB_PREFIX@mca_common_ucx_la_CFLAGS = \
54+
$(common_ucx_CFLAGS)
55+
lib@OPAL_LIB_PREFIX@mca_common_ucx_la_CPPFLAGS = \
56+
$(common_ucx_CPPFLAGS)
5357
lib@OPAL_LIB_PREFIX@mca_common_ucx_la_LDFLAGS = \
5458
-version-info $(libmca_opal_common_ucx_so_version) \
5559
$(common_ucx_LDFLAGS)
@@ -58,6 +62,10 @@ lib@OPAL_LIB_PREFIX@mca_common_ucx_la_LIBADD = \
5862
$(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
5963
lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_SOURCES = \
6064
$(headers) $(sources)
65+
lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_CFLAGS = \
66+
$(common_ucx_CFLAGS)
67+
lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_CPPFLAGS = \
68+
$(common_ucx_CPPFLAGS)
6169
lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_LDFLAGS = \
6270
$(common_ucx_LDFLAGS)
6371
lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_LIBADD = \

opal/mca/common/ucx/configure.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ AC_DEFUN([MCA_opal_common_ucx_CONFIG],[
2323
[$2])
2424

2525

26-
# substitute in the things needed to build openib
26+
# substitute in the things needed to build common_ucx
2727
AC_SUBST([common_ucx_CFLAGS])
2828
AC_SUBST([common_ucx_CPPFLAGS])
2929
AC_SUBST([common_ucx_LDFLAGS])

0 commit comments

Comments
 (0)