diff --git a/config/ompi_check_psm.m4 b/config/ompi_check_psm.m4 index b6bf697854f..4333ed7b9d5 100644 --- a/config/ompi_check_psm.m4 +++ b/config/ompi_check_psm.m4 @@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2006 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2006 QLogic Corp. All rights reserved. -dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights @@ -68,7 +68,7 @@ AC_DEFUN([OMPI_CHECK_PSM],[ [AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.]) ompi_check_psm_happy="no"]) - OMPI_SUMMARY_ADD([[Transports]],[[QLogic Infinipath (PSM)]],[$1],[$ompi_check_psm_happy]) + OMPI_SUMMARY_ADD([[Transports]],[[Intel TrueScale (PSM)]],[$1],[$ompi_check_psm_happy]) fi AS_IF([test "$ompi_check_psm_happy" = "yes"], diff --git a/config/opal_check_cma.m4 b/config/opal_check_cma.m4 index 68a3f86e5ce..bd99b55edab 100644 --- a/config/opal_check_cma.m4 +++ b/config/opal_check_cma.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2009 The University of Tennessee and The University # of Tennessee Research Foundation. All rights # reserved. -# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010-2012 IBM Corporation. All rights reserved. # Copyright (c) 2013-2016 Los Alamos National Security, LLC. All rights # reserved. @@ -41,7 +41,7 @@ AC_DEFUN([OPAL_CHECK_CMA],[ OPAL_VAR_SCOPE_POP - OMPI_SUMMARY_ADD([[Transports]],[[Linux CMA IPC]],[$1],[$ompi_check_cma_happy]) + OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/Linux CMA]],[$1],[$ompi_check_cma_happy]) fi AS_IF([test "$ompi_check_cma_happy" = "yes"], [$2], [$3]) diff --git a/config/opal_check_cuda.m4 b/config/opal_check_cuda.m4 index 11456ef905e..6e2da3a7d7a 100644 --- a/config/opal_check_cuda.m4 +++ b/config/opal_check_cuda.m4 @@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. -dnl Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2009 IBM Corporation. All rights reserved. dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights @@ -124,6 +124,8 @@ else CUDA_SUPPORT=0 fi +OMPI_SUMMARY_ADD([[Miscellaneous]],[[CUDA support]],[opal_cuda], [$opal_check_cuda_happy]) + AM_CONDITIONAL([OPAL_cuda_support], [test "x$CUDA_SUPPORT" = "x1"]) AC_DEFINE_UNQUOTED([OPAL_CUDA_SUPPORT],$CUDA_SUPPORT, [Whether we want cuda device pointer support]) diff --git a/config/opal_check_knem.m4 b/config/opal_check_knem.m4 index eb00a081fe0..e1210784ba6 100644 --- a/config/opal_check_knem.m4 +++ b/config/opal_check_knem.m4 @@ -3,7 +3,7 @@ dnl dnl Copyright (c) 2009 The University of Tennessee and The University dnl of Tennessee Research Foundation. All rights dnl reserved. -dnl Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2010-2012 IBM Corporation. All rights reserved. dnl Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights dnl reserved. @@ -61,7 +61,7 @@ AC_DEFUN([OPAL_CHECK_KNEM],[ CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS" - OMPI_SUMMARY_ADD([[Transports]],[[KNEM Shared Memory]],[$1],[$opal_check_knem_happy]) + OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/Linux KNEM]],[$1],[$opal_check_knem_happy]) OPAL_VAR_SCOPE_POP fi diff --git a/config/opal_check_libfabric.m4 b/config/opal_check_libfabric.m4 index 08774045eb8..e14a1c12fc2 100644 --- a/config/opal_check_libfabric.m4 +++ b/config/opal_check_libfabric.m4 @@ -1,6 +1,6 @@ dnl -*- shell-script -*- dnl -dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights dnl reserved. dnl $COPYRIGHT$ @@ -71,7 +71,7 @@ AC_DEFUN([OPAL_CHECK_LIBFABRIC],[ LDFLAGS=$opal_check_libfabric_$1_save_LDFLAGS LIBS=$opal_check_libfabric_$1_save_LIBS - OMPI_SUMMARY_ADD([[Transports]],[[OpenFabrics libfabric]],[$1],[$opal_check_libfabric_happy]) + OMPI_SUMMARY_ADD([[Transports]],[[OpenFabrics Libfabric]],[$1],[$opal_check_libfabric_happy]) OPAL_VAR_SCOPE_POP fi diff --git a/config/opal_check_portals4.m4 b/config/opal_check_portals4.m4 index 71fc3ffa61c..1e3e0a207ae 100644 --- a/config/opal_check_portals4.m4 +++ b/config/opal_check_portals4.m4 @@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2006 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2006 QLogic Corp. All rights reserved. -dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights @@ -94,7 +94,7 @@ AC_DEFUN([OPAL_CHECK_PORTALS4],[ AS_IF([test $max_md_size -ne 0 && test $max_va_size -ne 0], [AC_MSG_NOTICE([Portals 4 address space size: $max_md_size, $max_va_size])]) - OMPI_SUMMARY_ADD([[Transports]],[[portals4]],[$1],[$ompi_check_portals4_happy]) + OMPI_SUMMARY_ADD([[Transports]],[[Portals4]],[$1],[$ompi_check_portals4_happy]) fi AS_IF([test "$ompi_check_portals4_happy" = "yes"], diff --git a/config/opal_check_xpmem.m4 b/config/opal_check_xpmem.m4 index 7d8e3d2a87d..829f7209f8c 100644 --- a/config/opal_check_xpmem.m4 +++ b/config/opal_check_xpmem.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2009-2011 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011-2016 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2014 Intel, Inc. All rights reserved. @@ -101,7 +101,7 @@ AC_DEFUN([OPAL_CHECK_XPMEM], [ fi fi - OMPI_SUMMARY_ADD([[Transports]],[[XPMEM Shared Memory]],[$1],[$opal_check_cray_xpmem_happy]) + OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/XPMEM]],[$1],[$opal_check_cray_xpmem_happy]) fi AS_IF([test "$opal_check_xpmem_happy" = "yes"], [ diff --git a/config/opal_summary.m4 b/config/opal_summary.m4 index 754b57ab68d..4e072bd3fdc 100644 --- a/config/opal_summary.m4 +++ b/config/opal_summary.m4 @@ -2,6 +2,7 @@ dnl -*- shell-script -*- dnl dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights dnl reserved. +dnl Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -33,55 +34,50 @@ AC_DEFUN([OMPI_SUMMARY_ADD],[ AC_DEFUN([OMPI_SUMMARY_PRINT],[ OPAL_VAR_SCOPE_PUSH([ompi_summary_section ompi_summary_section_name]) - echo "\nOpen MPI configuration:" - echo "-----------------------" - echo "Version: $OMPI_MAJOR_VERSION.$OMPI_MINOR_VERSION.$OMPI_RELEASE_VERSION $OMPI_GREEK_VERSION" - - dnl Print out which projects will be built - echo "Build Open Platform Abstration project: yes" - if test "$project_orte_amc" = "true" ; then - echo "Build Open Runtime project: yes" - else - echo "Build Open Runtime project: no" - fi + cat < #endif ]) - OMPI_SUMMARY_ADD([[Transports]],[[tcp]],[[btl_tcp]],[$opal_btl_tcp_happy]) + OMPI_SUMMARY_ADD([[Transports]],[[TCP]],[[btl_tcp]],[$opal_btl_tcp_happy]) ])dnl diff --git a/opal/mca/btl/vader/configure.m4 b/opal/mca/btl/vader/configure.m4 index bb67b1a9804..578b9fc9861 100644 --- a/opal/mca/btl/vader/configure.m4 +++ b/opal/mca/btl/vader/configure.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2009 The University of Tennessee and The University # of Tennessee Research Foundation. All rights # reserved. -# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2015 Research Organization for Information Science @@ -43,7 +43,9 @@ AC_DEFUN([MCA_opal_btl_vader_CONFIG],[ # always happy [$1] - # substitute in the things needed to build with XPMEM support + OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/copy in+copy out]],[$1],[yes]) + +# substitute in the things needed to build with XPMEM support AC_SUBST([btl_vader_CFLAGS]) AC_SUBST([btl_vader_CPPFLAGS]) AC_SUBST([btl_vader_LDFLAGS]) diff --git a/orte/mca/plm/rsh/configure.m4 b/orte/mca/plm/rsh/configure.m4 index e1956e025bd..6c9bd98055d 100644 --- a/orte/mca/plm/rsh/configure.m4 +++ b/orte/mca/plm/rsh/configure.m4 @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2011-2013 Los Alamos National Security, LLC. # All rights reserved. -# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -27,5 +27,6 @@ AC_DEFUN([MCA_orte_plm_rsh_CONFIG],[ AC_CHECK_FUNC([fork], [plm_rsh_happy="yes"], [plm_rsh_happy="no"]) + OMPI_SUMMARY_ADD([[Resource Managers]],[[ssh/rsh]],[$1],[$plm_rsh_happy]) AS_IF([test "$plm_rsh_happy" = "yes"], [$1], [$2]) ])dnl