Skip to content

Commit 69568ee

Browse files
jsquyreshjelmn
jsquyres
authored and
hjelmn
committed
configury: minor updates to config summary output
(cherry picked from commit 48c650c) Signed-off-by: Nathan Hjelm <[email protected]>
1 parent f9f14d6 commit 69568ee

File tree

12 files changed

+57
-46
lines changed

12 files changed

+57
-46
lines changed

‎config/ompi_check_psm.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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.
1717
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
@@ -77,7 +77,7 @@ AC_DEFUN([OMPI_CHECK_PSM],[
7777
[AC_MSG_WARN([glob.h not found. Can not build component.])
7878
ompi_check_psm_happy="no"])])
7979

80-
OMPI_SUMMARY_ADD([[Transports]],[[QLogic Infinipath (PSM)]],[$1],[$ompi_check_psm_happy])
80+
OMPI_SUMMARY_ADD([[Transports]],[[Intel TrueScale (PSM)]],[$1],[$ompi_check_psm_happy])
8181
fi
8282

8383
AS_IF([test "$ompi_check_psm_happy" = "yes"],

‎config/opal_check_cma.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2009 The University of Tennessee and The University
44
# of Tennessee Research Foundation. All rights
55
# reserved.
6-
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
6+
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
77
# Copyright (c) 2010-2012 IBM Corporation. All rights reserved.
88
# Copyright (c) 2013-2016 Los Alamos National Security, LLC. All rights
99
# reserved.
@@ -41,7 +41,7 @@ AC_DEFUN([OPAL_CHECK_CMA],[
4141

4242
OPAL_VAR_SCOPE_POP
4343

44-
OMPI_SUMMARY_ADD([[Transports]],[[Linux CMA IPC]],[$1],[$ompi_check_cma_happy])
44+
OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/Linux CMA]],[$1],[$ompi_check_cma_happy])
4545
fi
4646

4747
AS_IF([test "$ompi_check_cma_happy" = "yes"], [$2], [$3])

‎config/opal_check_cuda.m4‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
13-
dnl Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
13+
dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
1414
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2009 IBM Corporation. All rights reserved.
1616
dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
@@ -124,6 +124,8 @@ else
124124
CUDA_SUPPORT=0
125125
fi
126126

127+
OMPI_SUMMARY_ADD([[Miscellaneous]],[[CUDA support]],[opal_cuda], [$opal_check_cuda_happy])
128+
127129
AM_CONDITIONAL([OPAL_cuda_support], [test "x$CUDA_SUPPORT" = "x1"])
128130
AC_DEFINE_UNQUOTED([OPAL_CUDA_SUPPORT],$CUDA_SUPPORT,
129131
[Whether we want cuda device pointer support])

‎config/opal_check_knem.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dnl
33
dnl Copyright (c) 2009 The University of Tennessee and The University
44
dnl of Tennessee Research Foundation. All rights
55
dnl reserved.
6-
dnl Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
6+
dnl Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
77
dnl Copyright (c) 2010-2012 IBM Corporation. All rights reserved.
88
dnl Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
99
dnl reserved.
@@ -61,7 +61,7 @@ AC_DEFUN([OPAL_CHECK_KNEM],[
6161

6262
CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS"
6363

64-
OMPI_SUMMARY_ADD([[Transports]],[[KNEM Shared Memory]],[$1],[$opal_check_knem_happy])
64+
OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/Linux KNEM]],[$1],[$opal_check_knem_happy])
6565
OPAL_VAR_SCOPE_POP
6666
fi
6767

‎config/opal_check_libfabric.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl -*- shell-script -*-
22
dnl
3-
dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
3+
dnl Copyright (c) 2015-2016 Cisco Systems, Inc. All rights reserved.
44
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
55
dnl reserved.
66
dnl $COPYRIGHT$
@@ -71,7 +71,7 @@ AC_DEFUN([OPAL_CHECK_LIBFABRIC],[
7171
LDFLAGS=$opal_check_libfabric_$1_save_LDFLAGS
7272
LIBS=$opal_check_libfabric_$1_save_LIBS
7373

74-
OMPI_SUMMARY_ADD([[Transports]],[[OpenFabrics libfabric]],[$1],[$opal_check_libfabric_happy])
74+
OMPI_SUMMARY_ADD([[Transports]],[[OpenFabrics Libfabric]],[$1],[$opal_check_libfabric_happy])
7575

7676
OPAL_VAR_SCOPE_POP
7777
fi

‎config/opal_check_portals4.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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.
1717
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
@@ -94,7 +94,7 @@ AC_DEFUN([OPAL_CHECK_PORTALS4],[
9494
AS_IF([test $max_md_size -ne 0 && test $max_va_size -ne 0],
9595
[AC_MSG_NOTICE([Portals 4 address space size: $max_md_size, $max_va_size])])
9696

97-
OMPI_SUMMARY_ADD([[Transports]],[[portals4]],[$1],[$ompi_check_portals4_happy])
97+
OMPI_SUMMARY_ADD([[Transports]],[[Portals4]],[$1],[$ompi_check_portals4_happy])
9898
fi
9999

100100
AS_IF([test "$ompi_check_portals4_happy" = "yes"],

‎config/opal_check_xpmem.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13-
# Copyright (c) 2009-2011 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
1414
# Copyright (c) 2011-2016 Los Alamos National Security, LLC. All rights
1515
# reserved.
1616
# Copyright (c) 2014 Intel, Inc. All rights reserved.
@@ -101,7 +101,7 @@ AC_DEFUN([OPAL_CHECK_XPMEM], [
101101
fi
102102
fi
103103
104-
OMPI_SUMMARY_ADD([[Transports]],[[XPMEM Shared Memory]],[$1],[$opal_check_cray_xpmem_happy])
104+
OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/XPMEM]],[$1],[$opal_check_cray_xpmem_happy])
105105
fi
106106
107107
AS_IF([test "$opal_check_xpmem_happy" = "yes"], [

‎config/opal_summary.m4‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ dnl -*- shell-script -*-
22
dnl
33
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
44
dnl reserved.
5+
dnl Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
56
dnl $COPYRIGHT$
67
dnl
78
dnl Additional copyrights may follow
@@ -33,55 +34,50 @@ AC_DEFUN([OMPI_SUMMARY_ADD],[
3334

3435
AC_DEFUN([OMPI_SUMMARY_PRINT],[
3536
OPAL_VAR_SCOPE_PUSH([ompi_summary_section ompi_summary_section_name])
36-
echo "\nOpen MPI configuration:"
37-
echo "-----------------------"
38-
echo "Version: $OMPI_MAJOR_VERSION.$OMPI_MINOR_VERSION.$OMPI_RELEASE_VERSION $OMPI_GREEK_VERSION"
39-
40-
dnl Print out which projects will be built
41-
echo "Build Open Platform Abstration project: yes"
42-
if test "$project_orte_amc" = "true" ; then
43-
echo "Build Open Runtime project: yes"
44-
else
45-
echo "Build Open Runtime project: no"
46-
fi
37+
cat <<EOF
4738

48-
if test "$project_ompi_amc" = "true" ; then
49-
echo "Build Open MPI project: yes"
50-
else
51-
echo "Build Open MPI project: no"
52-
fi
39+
Open MPI configuration:
40+
-----------------------
41+
Version: $OMPI_MAJOR_VERSION.$OMPI_MINOR_VERSION.$OMPI_RELEASE_VERSION$OMPI_GREEK_VERSION
42+
EOF
5343

54-
if test "$project_shmem_amc" = "true" ; then
55-
echo "Build Open SHMEM project: yes"
44+
if test "$project_ompi_amc" = "true" ; then
45+
echo "Build MPI C bindings: yes"
5646
else
57-
echo "Build Open SHMEM project: no"
47+
echo "Build MPI C bindings: no"
5848
fi
5949

6050
dnl Print out the bindings if we are building OMPI
6151
if test "$project_ompi_amc" = "true" ; then
6252
if test x$enable_mpi_cxx = xyes ; then
63-
echo "MPI C++ bindings (deprecated): yes"
53+
echo "Build MPI C++ bindings (deprecated): yes"
6454
else
65-
echo "MPI C++ bindings (deprecated): no"
55+
echo "Build MPI C++ bindings (deprecated): no"
6656
fi
6757

6858
if test $OMPI_BUILD_FORTRAN_BINDINGS = $OMPI_FORTRAN_MPIFH_BINDINGS ; then
69-
echo "MPI Fortran bindings: mpif.h"
59+
echo "Build MPI Fortran bindings: mpif.h"
7060
elif test $OMPI_BUILD_FORTRAN_BINDINGS = $OMPI_FORTRAN_USEMPI_BINDINGS ; then
71-
echo "MPI Fortran bindings: mpif.h, use mpi"
61+
echo "Build MPI Fortran bindings: mpif.h, use mpi"
7262
elif test $OMPI_BUILD_FORTRAN_BINDINGS = $OMPI_FORTRAN_USEMPIF08_BINDINGS ; then
73-
echo "MPI Fortran bindings: mpif.h, use mpi, use mpi_f08"
63+
echo "Build MPI Fortran bindings: mpif.h, use mpi, use mpi_f08"
7464
else
75-
echo "MPI Fortran bindings: no"
65+
echo "Build MPI Fortran bindings: no"
7666
fi
7767

7868
if test x$opal_java_happy = xyes ; then
79-
echo "MPI Java bindings (experimental): yes"
69+
echo "Build MPI Java bindings (experimental): yes"
8070
else
81-
echo "MPI Java bindings (experimental): no"
71+
echo "MPI Build Java bindings (experimental): no"
8272
fi
8373
fi
8474

75+
if test "$project_shmem_amc" = "true" ; then
76+
echo "Build Open SHMEM support: yes"
77+
else
78+
echo "Build Open SHMEM support: no"
79+
fi
80+
8581
if test $WANT_DEBUG = 0 ; then
8682
echo "Debug build: no"
8783
else
@@ -90,6 +86,8 @@ AC_DEFUN([OMPI_SUMMARY_PRINT],[
9086

9187
if test ! -z $with_platform ; then
9288
echo "Platform file: $with_platform"
89+
else
90+
echo "Platform file: (none)"
9391
fi
9492

9593
echo
@@ -103,8 +101,13 @@ AC_DEFUN([OMPI_SUMMARY_PRINT],[
103101
done
104102

105103
if test $WANT_DEBUG = 1 ; then
106-
echo "INTERNAL DEBUGGING IS ENABLED. DO NOT USE THIS BUILD FOR PERFORMANCE MEASUREMENTS!\n"
104+
cat <<EOF
105+
*****************************************************************************
106+
THIS IS A DEBUG BUILD! DO NOT USE THIS BUILD FOR PERFORMANCE MEASUREMENTS!
107+
*****************************************************************************
108+
EOF
107109
fi
110+
echo " "
108111

109112
OPAL_VAR_SCOPE_POP
110113
])

‎opal/mca/btl/scif/configure.m4‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# reserved.
55
# Copyright (c) 2015 Research Organization for Information Science
66
# and Technology (RIST). All rights reserved.
7+
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -36,6 +37,8 @@ AC_DEFUN([MCA_opal_btl_scif_CONFIG],[
3637

3738
AS_IF([test "$opal_btl_scif_happy" = "yes"], [$1], [$2])
3839

40+
OMPI_SUMMARY_ADD([[Transports]],[[Intel SCIF]],[[btl_scif]],[$opal_btl_scif_happy])
41+
3942
# substitute in the things needed to build scif
4043
AC_SUBST([btl_scif_CPPFLAGS])
4144
AC_SUBST([btl_scif_LDFLAGS])

‎opal/mca/btl/tcp/configure.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13-
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved.
1414
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1515
# reserved.
1616
# $COPYRIGHT$
@@ -36,5 +36,5 @@ AC_DEFUN([MCA_opal_btl_tcp_CONFIG],[
3636
#include <netinet/in.h>
3737
#endif
3838
])
39-
OMPI_SUMMARY_ADD([[Transports]],[[tcp]],[[btl_tcp]],[$opal_btl_tcp_happy])
39+
OMPI_SUMMARY_ADD([[Transports]],[[TCP]],[[btl_tcp]],[$opal_btl_tcp_happy])
4040
])dnl

0 commit comments

Comments
 (0)