Skip to content

Commit ce333f1

Browse files
hppritchahppritcha
authored
Merge pull request #2216 from hjelmn/v2.x_opal_summary
Configure summary and enable CMA by default
2 parents 4a3e9a4 + ce2a8fd commit ce333f1

26 files changed

+1301
-977
lines changed

‎config/ompi_check_mxm.m4‎

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ dnl
33
dnl Copyright (c) 2001-2011 Mellanox Technologies Ltd. ALL RIGHTS RESERVED.
44
dnl Copyright (c) 2015 Research Organization for Information Science
55
dnl and Technology (RIST). All rights reserved.
6+
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
7+
dnl reserved.
8+
dnl Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
69
dnl $COPYRIGHT$
710
dnl
811
dnl Additional copyrights may follow
@@ -16,51 +19,50 @@ dnl
1619
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
1720
# support, otherwise executes action-if-not-found
1821
AC_DEFUN([OMPI_CHECK_MXM],[
19-
AC_ARG_WITH([mxm],
20-
[AC_HELP_STRING([--with-mxm(=DIR)],
21-
[Build Mellanox Messaging support, optionally adding
22-
DIR/include and DIR/lib or DIR/lib64 to the search path for headers and libraries])])
23-
AC_ARG_WITH([mxm-libdir],
24-
[AC_HELP_STRING([--with-mxm-libdir=DIR],
25-
[Search for Mellanox MXM libraries in DIR])])
26-
OPAL_CHECK_WITHDIR([mxm-libdir], [$with_mxm_libdir], [libmxm.*])
22+
if test -z "$ompi_check_mxm_happy" ; then
23+
AC_ARG_WITH([mxm],
24+
[AC_HELP_STRING([--with-mxm(=DIR)],
25+
[Build Mellanox Messaging support, optionally adding
26+
DIR/include and DIR/lib or DIR/lib64 to the search path for headers and libraries])])
27+
AC_ARG_WITH([mxm-libdir],
28+
[AC_HELP_STRING([--with-mxm-libdir=DIR],
29+
[Search for Mellanox MXM libraries in DIR])])
30+
OPAL_CHECK_WITHDIR([mxm-libdir], [$with_mxm_libdir], [libmxm.*])
2731

28-
ompi_check_mxm_$1_save_CPPFLAGS="$CPPFLAGS"
29-
ompi_check_mxm_$1_save_LDFLAGS="$LDFLAGS"
30-
ompi_check_mxm_$1_save_LIBS="$LIBS"
32+
ompi_check_mxm_$1_save_CPPFLAGS="$CPPFLAGS"
33+
ompi_check_mxm_$1_save_LDFLAGS="$LDFLAGS"
34+
ompi_check_mxm_$1_save_LIBS="$LIBS"
3135

32-
AS_IF([test "$with_mxm" != "no"],
33-
[AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "yes"],
34-
[
36+
AS_IF([test "$with_mxm" != "no"],
37+
[AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "yes"],
38+
[
3539
ompi_check_mxm_dir="$with_mxm"
36-
])
37-
AS_IF([test ! -z "$with_mxm_libdir" && test "$with_mxm_libdir" != "yes"],
38-
[ompi_check_mxm_libdir="$with_mxm_libdir"])
40+
])
41+
AS_IF([test ! -z "$with_mxm_libdir" && test "$with_mxm_libdir" != "yes"],
42+
[ompi_check_mxm_libdir="$with_mxm_libdir"])
3943

40-
OPAL_CHECK_PACKAGE([$1],
41-
[mxm/api/mxm_api.h],
42-
[mxm],
43-
[mxm_cleanup],
44-
[],
45-
[$ompi_check_mxm_dir],
46-
[$ompi_check_mxm_libdir],
47-
[ompi_check_mxm_happy="yes"],
48-
[ompi_check_mxm_happy="no"])],
49-
[ompi_check_mxm_happy="no"])
44+
OPAL_CHECK_PACKAGE([ompi_check_mxm],
45+
[mxm/api/mxm_api.h],
46+
[mxm],
47+
[mxm_cleanup],
48+
[],
49+
[$ompi_check_mxm_dir],
50+
[$ompi_check_mxm_libdir],
51+
[ompi_check_mxm_happy="yes"],
52+
[ompi_check_mxm_happy="no"])],
53+
[ompi_check_mxm_happy="no"])
5054

55+
CPPFLAGS="$ompi_check_mxm_$1_save_CPPFLAGS"
56+
LDFLAGS="$ompi_check_mxm_$1_save_LDFLAGS"
57+
LIBS="$ompi_check_mxm_$1_save_LIBS"
5158

52-
53-
CPPFLAGS="$ompi_check_mxm_$1_save_CPPFLAGS"
54-
LDFLAGS="$ompi_check_mxm_$1_save_LDFLAGS"
55-
LIBS="$ompi_check_mxm_$1_save_LIBS"
56-
57-
AC_MSG_CHECKING(for MXM version compatibility)
58-
AC_REQUIRE_CPP
59-
old_CFLAGS="$CFLAGS"
60-
CFLAGS="$CFLAGS -I$ompi_check_mxm_dir/include"
61-
AC_COMPILE_IFELSE(
59+
AC_MSG_CHECKING(for MXM version compatibility)
60+
AC_REQUIRE_CPP
61+
old_CFLAGS="$CFLAGS"
62+
CFLAGS="$CFLAGS -I$ompi_check_mxm_dir/include"
63+
AC_COMPILE_IFELSE(
6264
[AC_LANG_PROGRAM([[#include <mxm/api/mxm_version.h>]],
63-
[[
65+
[[
6466
#ifndef MXM_VERSION
6567
#error "MXM Version is less than 2.1, please upgrade"
6668
#endif
@@ -72,13 +74,19 @@ AC_DEFUN([OMPI_CHECK_MXM],[
7274
[ompi_mxm_version_ok="yes"],
7375
[ompi_mxm_version_ok="no"])
7476

75-
AC_MSG_RESULT([$ompi_mxm_version_ok])
76-
CFLAGS=$old_CFLAGS
77+
AC_MSG_RESULT([$ompi_mxm_version_ok])
78+
CFLAGS=$old_CFLAGS
79+
80+
AS_IF([test "$ompi_mxm_version_ok" = "no"], [ompi_check_mxm_happy="no"])
7781

78-
AS_IF([test "$ompi_mxm_version_ok" = "no"], [ompi_check_mxm_happy="no"])
82+
OPAL_SUMMARY_ADD([[Transports]],[[Mellanox MXM]],[$1],[$ompi_check_mxm_happy])
83+
fi
7984

8085
AS_IF([test "$ompi_check_mxm_happy" = "yes"],
81-
[$2],
86+
[$1_LDFLAGS="[$]$_LDFLAGS $ompi_check_mxm_LDFLAGS"
87+
$1_LIBS="[$]$1_LIBS $ompi_check_mxm_LIBS"
88+
$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_mxm_CPPFLAGS"
89+
$2],
8290
[AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "no"],
8391
[AC_MSG_ERROR([MXM support requested but not found. Aborting])])
8492
$3])

‎config/ompi_check_psm.m4‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2006 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2006 QLogic Corp. All rights reserved.
14-
dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
14+
dnl Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
1515
dnl Copyright (c) 2015 Research Organization for Information Science
1616
dnl and Technology (RIST). All rights reserved.
17+
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
18+
dnl reserved.
1719
dnl Copyright (c) 2016 Intel Corporation. All rights reserved.
1820
dnl
1921
dnl $COPYRIGHT$
@@ -29,53 +31,60 @@ dnl
2931
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
3032
# support, otherwise executes action-if-not-found
3133
AC_DEFUN([OMPI_CHECK_PSM],[
32-
AC_ARG_WITH([psm],
33-
[AC_HELP_STRING([--with-psm(=DIR)],
34-
[Build PSM (Qlogic InfiniPath) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
35-
OPAL_CHECK_WITHDIR([psm], [$with_psm], [include/psm.h])
36-
AC_ARG_WITH([psm-libdir],
37-
[AC_HELP_STRING([--with-psm-libdir=DIR],
38-
[Search for PSM (QLogic InfiniPath PSM) libraries in DIR])])
39-
OPAL_CHECK_WITHDIR([psm-libdir], [$with_psm_libdir], [libpsm_infinipath.*])
34+
if test -z "$ompi_check_psm_happy" ; then
35+
AC_ARG_WITH([psm],
36+
[AC_HELP_STRING([--with-psm(=DIR)],
37+
[Build PSM (Qlogic InfiniPath) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
38+
OPAL_CHECK_WITHDIR([psm], [$with_psm], [include/psm.h])
39+
AC_ARG_WITH([psm-libdir],
40+
[AC_HELP_STRING([--with-psm-libdir=DIR],
41+
[Search for PSM (QLogic InfiniPath PSM) libraries in DIR])])
42+
OPAL_CHECK_WITHDIR([psm-libdir], [$with_psm_libdir], [libpsm_infinipath.*])
4043

41-
ompi_check_psm_$1_save_CPPFLAGS="$CPPFLAGS"
42-
ompi_check_psm_$1_save_LDFLAGS="$LDFLAGS"
43-
ompi_check_psm_$1_save_LIBS="$LIBS"
44+
ompi_check_psm_$1_save_CPPFLAGS="$CPPFLAGS"
45+
ompi_check_psm_$1_save_LDFLAGS="$LDFLAGS"
46+
ompi_check_psm_$1_save_LIBS="$LIBS"
4447

45-
AS_IF([test "$with_psm" != "no"],
46-
[AS_IF([test ! -z "$with_psm" && test "$with_psm" != "yes"],
47-
[ompi_check_psm_dir="$with_psm"])
48-
AS_IF([test ! -z "$with_psm_libdir" && test "$with_psm_libdir" != "yes"],
49-
[ompi_check_psm_libdir="$with_psm_libdir"])
48+
AS_IF([test "$with_psm" != "no"],
49+
[AS_IF([test ! -z "$with_psm" && test "$with_psm" != "yes"],
50+
[ompi_check_psm_dir="$with_psm"])
51+
AS_IF([test ! -z "$with_psm_libdir" && test "$with_psm_libdir" != "yes"],
52+
[ompi_check_psm_libdir="$with_psm_libdir"])
5053

51-
OPAL_CHECK_PACKAGE([$1],
52-
[psm.h],
53-
[psm_infinipath],
54-
[psm_finalize],
55-
[],
56-
[$ompi_check_psm_dir],
57-
[$ompi_check_psm_libdir],
58-
[ompi_check_psm_happy="yes"],
59-
[ompi_check_psm_happy="no"])],
60-
[ompi_check_psm_happy="no"])
54+
OPAL_CHECK_PACKAGE([ompi_check_psm],
55+
[psm.h],
56+
[psm_infinipath],
57+
[psm_finalize],
58+
[],
59+
[$ompi_check_psm_dir],
60+
[$ompi_check_psm_libdir],
61+
[ompi_check_psm_happy="yes"],
62+
[ompi_check_psm_happy="no"])],
63+
[ompi_check_psm_happy="no"])
6164

62-
CPPFLAGS="$ompi_check_psm_$1_save_CPPFLAGS"
63-
LDFLAGS="$ompi_check_psm_$1_save_LDFLAGS"
64-
LIBS="$ompi_check_psm_$1_save_LIBS"
65+
CPPFLAGS="$ompi_check_psm_$1_save_CPPFLAGS"
66+
LDFLAGS="$ompi_check_psm_$1_save_LDFLAGS"
67+
LIBS="$ompi_check_psm_$1_save_LIBS"
6568

66-
AS_IF([test "$ompi_check_psm_happy" = "yes" && test "$enable_progress_threads" = "yes"],
67-
[AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.])
68-
ompi_check_psm_happy="no"])
69+
AS_IF([test "$ompi_check_psm_happy" = "yes" && test "$enable_progress_threads" = "yes"],
70+
[AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.])
71+
ompi_check_psm_happy="no"])
6972

70-
AS_IF([test "$ompi_check_psm_happy" = "yes"],
71-
[AC_CHECK_HEADERS(
73+
AS_IF([test "$ompi_check_psm_happy" = "yes"],
74+
[AC_CHECK_HEADERS(
7275
glob.h,
7376
[],
7477
[AC_MSG_WARN([glob.h not found. Can not build component.])
7578
ompi_check_psm_happy="no"])])
7679

80+
OPAL_SUMMARY_ADD([[Transports]],[[Intel TrueScale (PSM)]],[$1],[$ompi_check_psm_happy])
81+
fi
82+
7783
AS_IF([test "$ompi_check_psm_happy" = "yes"],
78-
[$2],
84+
[$1_LDFLAGS="[$]$1_LDFLAGS $ompi_check_psm_LDFLAGS"
85+
$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_psm_CPPFLAGS"
86+
$1_LIBS="[$]$1_LIBS $ompi_check_psm_LIBS"
87+
$2],
7988
[AS_IF([test ! -z "$with_psm" && test "$with_psm" != "no"],
8089
[AC_MSG_ERROR([PSM support requested but not found. Aborting])])
8190
$3])

‎config/ompi_check_psm2.m4‎

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
# Copyright (c) 2004-2006 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2006 QLogic Corp. All rights reserved.
14-
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
14+
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
1515
# Copyright (c) 2014 Intel Corporation. All rights reserved.
1616
# Copyright (c) 2015 Research Organization for Information Science
1717
# and Technology (RIST). All rights reserved.
18+
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
19+
# reserved.
1820
# $COPYRIGHT$
1921
#
2022
# Additional copyrights may follow
@@ -28,54 +30,60 @@
2830
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
2931
# support, otherwise executes action-if-not-found
3032
AC_DEFUN([OMPI_CHECK_PSM2],[
31-
AC_ARG_WITH([psm2],
32-
[AC_HELP_STRING([--with-psm2(=DIR)],
33-
[Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
34-
OPAL_CHECK_WITHDIR([psm2], [$with_psm2], [include/psm2.h])
35-
AC_ARG_WITH([psm2-libdir],
36-
[AC_HELP_STRING([--with-psm2-libdir=DIR],
37-
[Search for PSM (Intel PSM2) libraries in DIR])])
38-
OPAL_CHECK_WITHDIR([psm2-libdir], [$with_psm2_libdir], [libpsm2.*])
33+
if test -z "$ompi_check_psm2_happy" ; then
34+
AC_ARG_WITH([psm2],
35+
[AC_HELP_STRING([--with-psm2(=DIR)],
36+
[Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
37+
OPAL_CHECK_WITHDIR([psm2], [$with_psm2], [include/psm2.h])
38+
AC_ARG_WITH([psm2-libdir],
39+
[AC_HELP_STRING([--with-psm2-libdir=DIR],
40+
[Search for PSM (Intel PSM2) libraries in DIR])])
41+
OPAL_CHECK_WITHDIR([psm2-libdir], [$with_psm2_libdir], [libpsm2.*])
3942

40-
ompi_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"
41-
ompi_check_psm2_$1_save_LDFLAGS="$LDFLAGS"
42-
ompi_check_psm2_$1_save_LIBS="$LIBS"
43+
ompi_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"
44+
ompi_check_psm2_$1_save_LDFLAGS="$LDFLAGS"
45+
ompi_check_psm2_$1_save_LIBS="$LIBS"
4346

44-
AS_IF([test "$with_psm2" != "no"],
45-
[AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "yes"],
46-
[ompi_check_psm2_dir="$with_psm2"])
47-
AS_IF([test ! -z "$with_psm2_libdir" && test "$with_psm2_libdir" != "yes"],
48-
[ompi_check_psm2_libdir="$with_psm2_libdir"])
47+
AS_IF([test "$with_psm2" != "no"],
48+
[AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "yes"],
49+
[ompi_check_psm2_dir="$with_psm2"])
50+
AS_IF([test ! -z "$with_psm2_libdir" && test "$with_psm2_libdir" != "yes"],
51+
[ompi_check_psm2_libdir="$with_psm2_libdir"])
4952

50-
OPAL_CHECK_PACKAGE([$1],
51-
[psm2.h],
52-
[psm2],
53-
[psm2_mq_irecv2],
54-
[],
55-
[$ompi_check_psm2_dir],
56-
[$ompi_check_psm2_libdir],
57-
[ompi_check_psm2_happy="yes"],
58-
[ompi_check_psm2_happy="no"])],
59-
[ompi_check_psm2_happy="no"])
53+
OPAL_CHECK_PACKAGE([ompi_check_psm2],
54+
[psm2.h],
55+
[psm2],
56+
[psm2_mq_irecv2],
57+
[],
58+
[$ompi_check_psm2_dir],
59+
[$ompi_check_psm2_libdir],
60+
[ompi_check_psm2_happy="yes"],
61+
[ompi_check_psm2_happy="no"])],
62+
[ompi_check_psm2_happy="no"])
6063

61-
CPPFLAGS="$ompi_check_psm2_$1_save_CPPFLAGS"
62-
LDFLAGS="$ompi_check_psm2_$1_save_LDFLAGS"
63-
LIBS="$ompi_check_psm2_$1_save_LIBS"
64+
CPPFLAGS="$ompi_check_psm2_$1_save_CPPFLAGS"
65+
LDFLAGS="$ompi_check_psm2_$1_save_LDFLAGS"
66+
LIBS="$ompi_check_psm2_$1_save_LIBS"
6467

65-
AS_IF([test "$ompi_check_psm2_happy" = "yes" && test "$enable_progress_threads" = "yes"],
66-
[AC_MSG_WARN([PSM2 driver does not currently support progress threads. Disabling MTL.])
67-
ompi_check_psm2_happy="no"])
68+
AS_IF([test "$ompi_check_psm2_happy" = "yes" && test "$enable_progress_threads" = "yes"],
69+
[AC_MSG_WARN([PSM2 driver does not currently support progress threads. Disabling MTL.])
70+
ompi_check_psm2_happy="no"])
6871

69-
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
70-
[AC_CHECK_HEADERS(
72+
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
73+
[AC_CHECK_HEADERS(
7174
glob.h,
7275
[],
7376
[AC_MSG_WARN([glob.h not found. Can not build component.])
7477
ompi_check_psm2_happy="no"])])
7578

76-
79+
OPAL_SUMMARY_ADD([[Transports]],[[Intel Omnipath (PSM2)]],[$1],[$ompi_check_psm2_happy])
80+
fi
81+
7782
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
78-
[$2],
83+
[$1_LDFLAGS="[$]$1_LDFLAGS $ompi_check_psm2_LDFLAGS"
84+
$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_psm2_CPPFLAGS"
85+
$1_LIBS="[$]$1_LIBS $ompi_check_psm2_LIBS"
86+
$2],
7987
[AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "no"],
8088
[AC_MSG_ERROR([PSM2 support requested but not found. Aborting])])
8189
$3])

0 commit comments

Comments
 (0)