Skip to content

Commit f8469de

Browse files
hjelmnhjelmn
committed
Merge pull request #1415 from hjelmn/configure_summary
configure: add a summary section at the end of configure output
2 parents fdebebc + d2f5fca commit f8469de

22 files changed

+1164
-941
lines changed

‎config/ompi_check_mxm.m4‎

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ 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.
68
dnl $COPYRIGHT$
79
dnl
810
dnl Additional copyrights may follow
@@ -16,51 +18,50 @@ dnl
1618
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
1719
# support, otherwise executes action-if-not-found
1820
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.*])
21+
if test -z "$ompi_check_mxm_happy" ; then
22+
AC_ARG_WITH([mxm],
23+
[AC_HELP_STRING([--with-mxm(=DIR)],
24+
[Build Mellanox Messaging support, optionally adding
25+
DIR/include and DIR/lib or DIR/lib64 to the search path for headers and libraries])])
26+
AC_ARG_WITH([mxm-libdir],
27+
[AC_HELP_STRING([--with-mxm-libdir=DIR],
28+
[Search for Mellanox MXM libraries in DIR])])
29+
OPAL_CHECK_WITHDIR([mxm-libdir], [$with_mxm_libdir], [libmxm.*])
2730

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

32-
AS_IF([test "$with_mxm" != "no"],
33-
[AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "yes"],
34-
[
35+
AS_IF([test "$with_mxm" != "no"],
36+
[AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "yes"],
37+
[
3538
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"])
39+
])
40+
AS_IF([test ! -z "$with_mxm_libdir" && test "$with_mxm_libdir" != "yes"],
41+
[ompi_check_mxm_libdir="$with_mxm_libdir"])
3942

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"])
43+
OPAL_CHECK_PACKAGE([ompi_check_mxm],
44+
[mxm/api/mxm_api.h],
45+
[mxm],
46+
[mxm_cleanup],
47+
[],
48+
[$ompi_check_mxm_dir],
49+
[$ompi_check_mxm_libdir],
50+
[ompi_check_mxm_happy="yes"],
51+
[ompi_check_mxm_happy="no"])],
52+
[ompi_check_mxm_happy="no"])
5053

54+
CPPFLAGS="$ompi_check_mxm_$1_save_CPPFLAGS"
55+
LDFLAGS="$ompi_check_mxm_$1_save_LDFLAGS"
56+
LIBS="$ompi_check_mxm_$1_save_LIBS"
5157

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(
58+
AC_MSG_CHECKING(for MXM version compatibility)
59+
AC_REQUIRE_CPP
60+
old_CFLAGS="$CFLAGS"
61+
CFLAGS="$CFLAGS -I$ompi_check_mxm_dir/include"
62+
AC_COMPILE_IFELSE(
6263
[AC_LANG_PROGRAM([[#include <mxm/api/mxm_version.h>]],
63-
[[
64+
[[
6465
#ifndef MXM_VERSION
6566
#error "MXM Version is less than 2.1, please upgrade"
6667
#endif
@@ -72,13 +73,19 @@ AC_DEFUN([OMPI_CHECK_MXM],[
7273
[ompi_mxm_version_ok="yes"],
7374
[ompi_mxm_version_ok="no"])
7475

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

78-
AS_IF([test "$ompi_mxm_version_ok" = "no"], [ompi_check_mxm_happy="no"])
81+
OMPI_SUMMARY_ADD([[Transports]],[[Mellanox MXM]],[$1],[$ompi_check_mxm_happy])
82+
fi
7983

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

‎config/ompi_check_psm.m4‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ dnl Copyright (c) 2006 QLogic Corp. All rights reserved.
1414
dnl Copyright (c) 2009 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$
1820
dnl
1921
dnl Additional copyrights may follow
@@ -27,46 +29,53 @@ dnl
2729
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
2830
# support, otherwise executes action-if-not-found
2931
AC_DEFUN([OMPI_CHECK_PSM],[
30-
AC_ARG_WITH([psm],
31-
[AC_HELP_STRING([--with-psm(=DIR)],
32-
[Build PSM (Qlogic InfiniPath) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
33-
OPAL_CHECK_WITHDIR([psm], [$with_psm], [include/psm.h])
34-
AC_ARG_WITH([psm-libdir],
35-
[AC_HELP_STRING([--with-psm-libdir=DIR],
36-
[Search for PSM (QLogic InfiniPath PSM) libraries in DIR])])
37-
OPAL_CHECK_WITHDIR([psm-libdir], [$with_psm_libdir], [libpsm_infinipath.*])
32+
if test -z "$ompi_check_psm_happy" ; then
33+
AC_ARG_WITH([psm],
34+
[AC_HELP_STRING([--with-psm(=DIR)],
35+
[Build PSM (Qlogic InfiniPath) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
36+
OPAL_CHECK_WITHDIR([psm], [$with_psm], [include/psm.h])
37+
AC_ARG_WITH([psm-libdir],
38+
[AC_HELP_STRING([--with-psm-libdir=DIR],
39+
[Search for PSM (QLogic InfiniPath PSM) libraries in DIR])])
40+
OPAL_CHECK_WITHDIR([psm-libdir], [$with_psm_libdir], [libpsm_infinipath.*])
41+
42+
ompi_check_psm_$1_save_CPPFLAGS="$CPPFLAGS"
43+
ompi_check_psm_$1_save_LDFLAGS="$LDFLAGS"
44+
ompi_check_psm_$1_save_LIBS="$LIBS"
3845

39-
ompi_check_psm_$1_save_CPPFLAGS="$CPPFLAGS"
40-
ompi_check_psm_$1_save_LDFLAGS="$LDFLAGS"
41-
ompi_check_psm_$1_save_LIBS="$LIBS"
46+
AS_IF([test "$with_psm" != "no"],
47+
[AS_IF([test ! -z "$with_psm" && test "$with_psm" != "yes"],
48+
[ompi_check_psm_dir="$with_psm"])
49+
AS_IF([test ! -z "$with_psm_libdir" && test "$with_psm_libdir" != "yes"],
50+
[ompi_check_psm_libdir="$with_psm_libdir"])
4251

43-
AS_IF([test "$with_psm" != "no"],
44-
[AS_IF([test ! -z "$with_psm" && test "$with_psm" != "yes"],
45-
[ompi_check_psm_dir="$with_psm"])
46-
AS_IF([test ! -z "$with_psm_libdir" && test "$with_psm_libdir" != "yes"],
47-
[ompi_check_psm_libdir="$with_psm_libdir"])
52+
OPAL_CHECK_PACKAGE([ompi_check_psm],
53+
[psm.h],
54+
[psm_infinipath],
55+
[psm_finalize],
56+
[],
57+
[$ompi_check_psm_dir],
58+
[$ompi_check_psm_libdir],
59+
[ompi_check_psm_happy="yes"],
60+
[ompi_check_psm_happy="no"])],
61+
[ompi_check_psm_happy="no"])
4862

49-
OPAL_CHECK_PACKAGE([$1],
50-
[psm.h],
51-
[psm_infinipath],
52-
[psm_finalize],
53-
[],
54-
[$ompi_check_psm_dir],
55-
[$ompi_check_psm_libdir],
56-
[ompi_check_psm_happy="yes"],
57-
[ompi_check_psm_happy="no"])],
58-
[ompi_check_psm_happy="no"])
63+
CPPFLAGS="$ompi_check_psm_$1_save_CPPFLAGS"
64+
LDFLAGS="$ompi_check_psm_$1_save_LDFLAGS"
65+
LIBS="$ompi_check_psm_$1_save_LIBS"
5966

60-
CPPFLAGS="$ompi_check_psm_$1_save_CPPFLAGS"
61-
LDFLAGS="$ompi_check_psm_$1_save_LDFLAGS"
62-
LIBS="$ompi_check_psm_$1_save_LIBS"
67+
AS_IF([test "$ompi_check_psm_happy" = "yes" && test "$enable_progress_threads" = "yes"],
68+
[AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.])
69+
ompi_check_psm_happy="no"])
6370

64-
AS_IF([test "$ompi_check_psm_happy" = "yes" && test "$enable_progress_threads" = "yes"],
65-
[AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.])
66-
ompi_check_psm_happy="no"])
71+
OMPI_SUMMARY_ADD([[Transports]],[[QLogic Infinipath (PSM)]],[$1],[$ompi_check_psm_happy])
72+
fi
6773

6874
AS_IF([test "$ompi_check_psm_happy" = "yes"],
69-
[$2],
75+
[$1_LDFLAGS="[$]$1_LDFLAGS $ompi_check_psm_LDFLAGS"
76+
$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_psm_CPPFLAGS"
77+
$1_LIBS="[$]$1_LIBS $ompi_check_psm_LIBS"
78+
$2],
7079
[AS_IF([test ! -z "$with_psm" && test "$with_psm" != "no"],
7180
[AC_MSG_ERROR([PSM support requested but not found. Aborting])])
7281
$3])

‎config/ompi_check_psm2.m4‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
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,46 +30,53 @@
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.*])
42+
43+
ompi_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"
44+
ompi_check_psm2_$1_save_LDFLAGS="$LDFLAGS"
45+
ompi_check_psm2_$1_save_LIBS="$LIBS"
3946

40-
ompi_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"
41-
ompi_check_psm2_$1_save_LDFLAGS="$LDFLAGS"
42-
ompi_check_psm2_$1_save_LIBS="$LIBS"
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"])
4352

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"])
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"])
4963

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"])
64+
CPPFLAGS="$ompi_check_psm2_$1_save_CPPFLAGS"
65+
LDFLAGS="$ompi_check_psm2_$1_save_LDFLAGS"
66+
LIBS="$ompi_check_psm2_$1_save_LIBS"
6067

61-
CPPFLAGS="$ompi_check_psm2_$1_save_CPPFLAGS"
62-
LDFLAGS="$ompi_check_psm2_$1_save_LDFLAGS"
63-
LIBS="$ompi_check_psm2_$1_save_LIBS"
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"])
6471

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"])
72+
OMPI_SUMMARY_ADD([[Transports]],[[Intel Omnipath (PSM2)]],[$1],[$ompi_check_psm2_happy])
73+
fi
6874

6975
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
70-
[$2],
76+
[$1_LDFLAGS="[$]$1_LDFLAGS $ompi_check_psm2_LDFLAGS"
77+
$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_psm2_CPPFLAGS"
78+
$1_LIBS="[$]$1_LIBS $ompi_check_psm2_LIBS"
79+
$2],
7180
[AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "no"],
7281
[AC_MSG_ERROR([PSM2 support requested but not found. Aborting])])
7382
$3])

0 commit comments

Comments
 (0)