Skip to content

Commit 19e16d5

Browse files
committed
opal: Disable memory patcher component on MacOS
Open MPI doesn't support any transports on MacOS which require memory manager hooks. The memory patcher component uses the syscall interface, which has been deprecated in recent versions of MacOS. Since we don't need it and it emits warnings about deprecation, disable the memory patcher component on MacOS. Fixes open-mpi#5671 Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent fcc1d30 commit 19e16d5

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

opal/mca/memory/patcher/configure.m4

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,27 @@ AC_DEFUN([MCA_opal_memory_patcher_COMPILE_MODE], [
3434
# [action-if-cant-compile])
3535
# ------------------------------------------------
3636
AC_DEFUN([MCA_opal_memory_patcher_CONFIG],[
37-
AC_CONFIG_FILES([opal/mca/memory/patcher/Makefile])
38-
39-
AC_CHECK_FUNCS([__curbrk])
40-
41-
AC_CHECK_HEADERS([linux/mman.h sys/syscall.h])
42-
43-
AC_CHECK_DECLS([__mmap], [], [], [#include <sys/mman.h>])
37+
# disable on MacOS/Darwin where it isn't used and the deprecated
38+
# syscall interface causes compiler warnings.
39+
AC_MSG_CHECKING([if memory patcher supports $host_os])
40+
case $host_os in
41+
darwin*)
42+
opal_memory_patcher_happy=no
43+
;;
44+
*)
45+
opal_memory_patcher_happy=yes
46+
;;
47+
esac
48+
AC_MSG_RESULT([$opal_memory_patcher_happy])
49+
50+
AS_IF([test "$opal_memory_patcher_happy" == "yes"], [
51+
AC_CHECK_FUNCS([__curbrk])
52+
AC_CHECK_HEADERS([linux/mman.h sys/syscall.h])
53+
AC_CHECK_DECLS([__mmap], [], [], [#include <sys/mman.h>])
54+
AC_CHECK_FUNCS([__mmap])
55+
AC_CHECK_DECLS([__syscall], [], [], [#include <sys/syscall.h>])
56+
AC_CHECK_FUNCS([__syscall])
57+
$1], [$2])
4458

45-
AC_CHECK_FUNCS([__mmap])
46-
47-
AC_CHECK_DECLS([__syscall], [], [], [#include <sys/syscall.h>])
48-
49-
AC_CHECK_FUNCS([__syscall])
50-
51-
[$1]
59+
AC_CONFIG_FILES([opal/mca/memory/patcher/Makefile])
5260
])

0 commit comments

Comments
 (0)