Merge pull request #1567 from jsquyres/pr/fix-ompi-to-opal-name-conversion
m4: rename OMPI_SUMMARY_* macros to OPAL_SUMMARY_*
Этот коммит содержится в:
Коммит
68c1a5eb6c
@ -5,6 +5,7 @@ dnl Copyright (c) 2015 Research Organization for Information Science
|
|||||||
dnl and Technology (RIST). All rights reserved.
|
dnl and Technology (RIST). All rights reserved.
|
||||||
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||||
dnl reserved.
|
dnl reserved.
|
||||||
|
dnl Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl $COPYRIGHT$
|
dnl $COPYRIGHT$
|
||||||
dnl
|
dnl
|
||||||
dnl Additional copyrights may follow
|
dnl Additional copyrights may follow
|
||||||
@ -78,7 +79,7 @@ AC_DEFUN([OMPI_CHECK_MXM],[
|
|||||||
|
|
||||||
AS_IF([test "$ompi_mxm_version_ok" = "no"], [ompi_check_mxm_happy="no"])
|
AS_IF([test "$ompi_mxm_version_ok" = "no"], [ompi_check_mxm_happy="no"])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Mellanox MXM]],[$1],[$ompi_check_mxm_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Mellanox MXM]],[$1],[$ompi_check_mxm_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$ompi_check_mxm_happy" = "yes"],
|
AS_IF([test "$ompi_check_mxm_happy" = "yes"],
|
||||||
|
@ -68,7 +68,7 @@ AC_DEFUN([OMPI_CHECK_PSM],[
|
|||||||
[AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.])
|
[AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.])
|
||||||
ompi_check_psm_happy="no"])
|
ompi_check_psm_happy="no"])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Intel TrueScale (PSM)]],[$1],[$ompi_check_psm_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Intel TrueScale (PSM)]],[$1],[$ompi_check_psm_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$ompi_check_psm_happy" = "yes"],
|
AS_IF([test "$ompi_check_psm_happy" = "yes"],
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
# Copyright (c) 2004-2006 The Regents of the University of California.
|
# Copyright (c) 2004-2006 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2006 QLogic Corp. All rights reserved.
|
# Copyright (c) 2006 QLogic Corp. All rights reserved.
|
||||||
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2014 Intel Corporation. All rights reserved.
|
# Copyright (c) 2014 Intel Corporation. All rights reserved.
|
||||||
# Copyright (c) 2015 Research Organization for Information Science
|
# Copyright (c) 2015 Research Organization for Information Science
|
||||||
# and Technology (RIST). All rights reserved.
|
# and Technology (RIST). All rights reserved.
|
||||||
@ -69,7 +69,7 @@ AC_DEFUN([OMPI_CHECK_PSM2],[
|
|||||||
[AC_MSG_WARN([PSM2 driver does not currently support progress threads. Disabling MTL.])
|
[AC_MSG_WARN([PSM2 driver does not currently support progress threads. Disabling MTL.])
|
||||||
ompi_check_psm2_happy="no"])
|
ompi_check_psm2_happy="no"])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Intel Omnipath (PSM2)]],[$1],[$ompi_check_psm2_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Intel Omnipath (PSM2)]],[$1],[$ompi_check_psm2_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
|
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
# and Technology (RIST). All rights reserved.
|
# and Technology (RIST). All rights reserved.
|
||||||
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||||
# reserved.
|
# reserved.
|
||||||
|
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
#
|
#
|
||||||
# Additional copyrights may follow
|
# Additional copyrights may follow
|
||||||
@ -76,7 +77,7 @@ AC_DEFUN([OMPI_CHECK_UCX],[
|
|||||||
|
|
||||||
AS_IF([test "$ompi_ucx_version_ok" = "no"], [ompi_check_ucx_happy="no"])
|
AS_IF([test "$ompi_ucx_version_ok" = "no"], [ompi_check_ucx_happy="no"])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Open UCX]],[$1],[$ompi_check_ucx_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Open UCX]],[$1],[$ompi_check_ucx_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ AC_DEFUN([OPAL_CHECK_CMA],[
|
|||||||
|
|
||||||
OPAL_VAR_SCOPE_POP
|
OPAL_VAR_SCOPE_POP
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/Linux CMA]],[$1],[$ompi_check_cma_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/Linux CMA]],[$1],[$ompi_check_cma_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$ompi_check_cma_happy" = "yes"], [$2], [$3])
|
AS_IF([test "$ompi_check_cma_happy" = "yes"], [$2], [$3])
|
||||||
|
@ -124,7 +124,7 @@ else
|
|||||||
CUDA_SUPPORT=0
|
CUDA_SUPPORT=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Miscellaneous]],[[CUDA support]],[opal_cuda], [$opal_check_cuda_happy])
|
OPAL_SUMMARY_ADD([[Miscellaneous]],[[CUDA support]],[opal_cuda], [$opal_check_cuda_happy])
|
||||||
|
|
||||||
AM_CONDITIONAL([OPAL_cuda_support], [test "x$CUDA_SUPPORT" = "x1"])
|
AM_CONDITIONAL([OPAL_cuda_support], [test "x$CUDA_SUPPORT" = "x1"])
|
||||||
AC_DEFINE_UNQUOTED([OPAL_CUDA_SUPPORT],$CUDA_SUPPORT,
|
AC_DEFINE_UNQUOTED([OPAL_CUDA_SUPPORT],$CUDA_SUPPORT,
|
||||||
|
@ -61,7 +61,7 @@ AC_DEFUN([OPAL_CHECK_KNEM],[
|
|||||||
|
|
||||||
CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS"
|
CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS"
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/Linux KNEM]],[$1],[$opal_check_knem_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/Linux KNEM]],[$1],[$opal_check_knem_happy])
|
||||||
OPAL_VAR_SCOPE_POP
|
OPAL_VAR_SCOPE_POP
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ AC_DEFUN([OPAL_CHECK_LIBFABRIC],[
|
|||||||
LDFLAGS=$opal_check_libfabric_$1_save_LDFLAGS
|
LDFLAGS=$opal_check_libfabric_$1_save_LDFLAGS
|
||||||
LIBS=$opal_check_libfabric_$1_save_LIBS
|
LIBS=$opal_check_libfabric_$1_save_LIBS
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[OpenFabrics Libfabric]],[$1],[$opal_check_libfabric_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[OpenFabrics Libfabric]],[$1],[$opal_check_libfabric_happy])
|
||||||
|
|
||||||
OPAL_VAR_SCOPE_POP
|
OPAL_VAR_SCOPE_POP
|
||||||
fi
|
fi
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights
|
# Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights
|
||||||
# reserved.
|
# reserved.
|
||||||
# Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
|
# Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
|
||||||
@ -277,7 +277,7 @@ AC_DEFUN([OPAL_CHECK_OPENFABRICS],[
|
|||||||
LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"
|
LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"
|
||||||
LIBS="$ompi_check_openib_$1_save_LIBS"
|
LIBS="$ompi_check_openib_$1_save_LIBS"
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[OpenFabrics Verbs]],[$1],[$opal_check_openib_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[OpenFabrics Verbs]],[$1],[$opal_check_openib_happy])
|
||||||
|
|
||||||
OPAL_VAR_SCOPE_POP
|
OPAL_VAR_SCOPE_POP
|
||||||
fi
|
fi
|
||||||
|
@ -94,7 +94,7 @@ AC_DEFUN([OPAL_CHECK_PORTALS4],[
|
|||||||
AS_IF([test $max_md_size -ne 0 && test $max_va_size -ne 0],
|
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])])
|
[AC_MSG_NOTICE([Portals 4 address space size: $max_md_size, $max_va_size])])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Portals4]],[$1],[$ompi_check_portals4_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Portals4]],[$1],[$ompi_check_portals4_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$ompi_check_portals4_happy" = "yes"],
|
AS_IF([test "$ompi_check_portals4_happy" = "yes"],
|
||||||
|
@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
|
|||||||
dnl Copyright (c) 2004-2006 The Regents of the University of California.
|
dnl Copyright (c) 2004-2006 The Regents of the University of California.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
dnl Copyright (c) 2006 QLogic Corp. 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) 2011-2016 Los Alamos National Security, LLC. All rights
|
dnl Copyright (c) 2011-2016 Los Alamos National Security, LLC. All rights
|
||||||
dnl reserved.
|
dnl reserved.
|
||||||
dnl Copyright (c) 2014 Intel, Inc. All rights reserved
|
dnl Copyright (c) 2014 Intel, Inc. All rights reserved
|
||||||
@ -68,7 +68,7 @@ AC_DEFUN([OPAL_CHECK_UGNI], [
|
|||||||
[AC_MSG_WARN([GNI driver does not currently support progress threads. Disabling.])
|
[AC_MSG_WARN([GNI driver does not currently support progress threads. Disabling.])
|
||||||
opal_check_ugni_happy="no"])
|
opal_check_ugni_happy="no"])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Cray uGNI (Gemini/Aries)]],[$1],[$opal_check_ugni_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Cray uGNI (Gemini/Aries)]],[$1],[$opal_check_ugni_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$opal_check_ugni_happy" = "yes"],
|
AS_IF([test "$opal_check_ugni_happy" = "yes"],
|
||||||
|
@ -101,7 +101,7 @@ AC_DEFUN([OPAL_CHECK_XPMEM], [
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/XPMEM]],[$1],[$opal_check_cray_xpmem_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/XPMEM]],[$1],[$opal_check_cray_xpmem_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$opal_check_xpmem_happy" = "yes"], [
|
AS_IF([test "$opal_check_xpmem_happy" = "yes"], [
|
||||||
|
@ -9,7 +9,7 @@ dnl Additional copyrights may follow
|
|||||||
dnl
|
dnl
|
||||||
dnl $HEADER$
|
dnl $HEADER$
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN([OMPI_SUMMARY_ADD],[
|
AC_DEFUN([OPAL_SUMMARY_ADD],[
|
||||||
OPAL_VAR_SCOPE_PUSH([ompi_summary_section ompi_summary_line ompi_summary_section_current])
|
OPAL_VAR_SCOPE_PUSH([ompi_summary_section ompi_summary_line ompi_summary_section_current])
|
||||||
|
|
||||||
dnl need to replace spaces in the section name with somethis else. _ seems like a reasonable
|
dnl need to replace spaces in the section name with somethis else. _ seems like a reasonable
|
||||||
@ -32,7 +32,7 @@ AC_DEFUN([OMPI_SUMMARY_ADD],[
|
|||||||
OPAL_VAR_SCOPE_POP
|
OPAL_VAR_SCOPE_POP
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([OMPI_SUMMARY_PRINT],[
|
AC_DEFUN([OPAL_SUMMARY_PRINT],[
|
||||||
OPAL_VAR_SCOPE_PUSH([ompi_summary_section ompi_summary_section_name])
|
OPAL_VAR_SCOPE_PUSH([ompi_summary_section ompi_summary_section_name])
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|||||||
dnl University of Stuttgart. All rights reserved.
|
dnl University of Stuttgart. All rights reserved.
|
||||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
dnl All rights reserved.
|
dnl 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 Copyright (c) 2015 Research Organization for Information Science
|
||||||
dnl and Technology (RIST). All rights reserved.
|
dnl and Technology (RIST). All rights reserved.
|
||||||
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||||
@ -157,7 +157,7 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
|
|||||||
CRAY_ALPSUTIL_LIBS = $CRAY_ALPSUTIL_STATIC_LIBS],
|
CRAY_ALPSUTIL_LIBS = $CRAY_ALPSUTIL_STATIC_LIBS],
|
||||||
[])
|
[])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Resource Managers]],[[Cray Alps]],[$1],[$orte_check_cray_alps_happy])
|
OPAL_SUMMARY_ADD([[Resource Managers]],[[Cray Alps]],[$1],[$orte_check_cray_alps_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$orte_check_cray_alps_happy" = "yes"],
|
AS_IF([test "$orte_check_cray_alps_happy" = "yes"],
|
||||||
|
@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|||||||
dnl University of Stuttgart. All rights reserved.
|
dnl University of Stuttgart. All rights reserved.
|
||||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
dnl Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved.
|
dnl Copyright (c) 2007-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2015 Research Organization for Information Science
|
dnl Copyright (c) 2015 Research Organization for Information Science
|
||||||
dnl and Technology (RIST). All rights reserved.
|
dnl and Technology (RIST). All rights reserved.
|
||||||
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||||
@ -122,7 +122,7 @@ AC_DEFUN([ORTE_CHECK_LSF],[
|
|||||||
LDFLAGS="$orte_check_lsf_$1_save_LDFLAGS"
|
LDFLAGS="$orte_check_lsf_$1_save_LDFLAGS"
|
||||||
LIBS="$orte_check_lsf_$1_save_LIBS"
|
LIBS="$orte_check_lsf_$1_save_LIBS"
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Resource Managers]],[[LSF]],[$1],[$orte_check_lsf_happy])
|
OPAL_SUMMARY_ADD([[Resource Managers]],[[LSF]],[$1],[$orte_check_lsf_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$orte_check_lsf_happy" = "yes"],
|
AS_IF([test "$orte_check_lsf_happy" = "yes"],
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||||
# reserved.
|
# reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
@ -50,7 +50,7 @@ AC_DEFUN([ORTE_CHECK_GRIDENGINE],[
|
|||||||
orte_gridengine_build=yes],
|
orte_gridengine_build=yes],
|
||||||
[AC_MSG_RESULT([not found])])])])])
|
[AC_MSG_RESULT([not found])])])])])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Resource Managers]],[[Grid Engine]],[$1],[$orte_gridengine_build])
|
OPAL_SUMMARY_ADD([[Resource Managers]],[[Grid Engine]],[$1],[$orte_gridengine_build])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$orte_gridengine_build" = "yes"],
|
AS_IF([test "$orte_gridengine_build" = "yes"],
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||||
# reserved.
|
# reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
@ -68,7 +68,7 @@ AC_DEFUN([ORTE_CHECK_SLURM],[
|
|||||||
[orte_check_slurm_happy="yes"],
|
[orte_check_slurm_happy="yes"],
|
||||||
[orte_check_slurm_happy="no"])])
|
[orte_check_slurm_happy="no"])])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Resource Managers]],[[Slurm]],[$1],[$orte_check_slurm_happy])
|
OPAL_SUMMARY_ADD([[Resource Managers]],[[Slurm]],[$1],[$orte_check_slurm_happy])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_IF([test "$orte_check_slurm_happy" = "yes"],
|
AS_IF([test "$orte_check_slurm_happy" = "yes"],
|
||||||
|
@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|||||||
dnl University of Stuttgart. All rights reserved.
|
dnl University of Stuttgart. All rights reserved.
|
||||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
dnl Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
|
dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2015 Research Organization for Information Science
|
dnl Copyright (c) 2015 Research Organization for Information Science
|
||||||
dnl and Technology (RIST). All rights reserved.
|
dnl and Technology (RIST). All rights reserved.
|
||||||
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||||
@ -145,7 +145,7 @@ AC_DEFUN([ORTE_CHECK_TM],[
|
|||||||
orte_check_tm_happy=no
|
orte_check_tm_happy=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Resource Managers]],[[Torque]],[$1],[$orte_check_tm_happy])
|
OPAL_SUMMARY_ADD([[Resource Managers]],[[Torque]],[$1],[$orte_check_tm_happy])
|
||||||
|
|
||||||
OPAL_VAR_SCOPE_POP
|
OPAL_VAR_SCOPE_POP
|
||||||
fi
|
fi
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
|
# Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights
|
# Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights
|
||||||
# reserved.
|
# reserved.
|
||||||
@ -1392,4 +1392,4 @@ m4_ifdef([project_oshmem], [OSHMEM_CONFIG_FILES])
|
|||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
OMPI_SUMMARY_PRINT
|
OPAL_SUMMARY_PRINT
|
||||||
|
@ -37,7 +37,7 @@ AC_DEFUN([MCA_opal_btl_scif_CONFIG],[
|
|||||||
|
|
||||||
AS_IF([test "$opal_btl_scif_happy" = "yes"], [$1], [$2])
|
AS_IF([test "$opal_btl_scif_happy" = "yes"], [$1], [$2])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Intel SCIF]],[[btl_scif]],[$opal_btl_scif_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[Intel SCIF]],[[btl_scif]],[$opal_btl_scif_happy])
|
||||||
|
|
||||||
# substitute in the things needed to build scif
|
# substitute in the things needed to build scif
|
||||||
AC_SUBST([btl_scif_CPPFLAGS])
|
AC_SUBST([btl_scif_CPPFLAGS])
|
||||||
|
@ -36,5 +36,5 @@ AC_DEFUN([MCA_opal_btl_tcp_CONFIG],[
|
|||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
])
|
])
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[TCP]],[[btl_tcp]],[$opal_btl_tcp_happy])
|
OPAL_SUMMARY_ADD([[Transports]],[[TCP]],[[btl_tcp]],[$opal_btl_tcp_happy])
|
||||||
])dnl
|
])dnl
|
||||||
|
@ -43,7 +43,7 @@ AC_DEFUN([MCA_opal_btl_vader_CONFIG],[
|
|||||||
# always happy
|
# always happy
|
||||||
[$1]
|
[$1]
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Transports]],[[Shared memory/copy in+copy out]],[$1],[yes])
|
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/copy in+copy out]],[$1],[yes])
|
||||||
|
|
||||||
# substitute in the things needed to build with XPMEM support
|
# substitute in the things needed to build with XPMEM support
|
||||||
AC_SUBST([btl_vader_CFLAGS])
|
AC_SUBST([btl_vader_CFLAGS])
|
||||||
|
@ -27,6 +27,6 @@ AC_DEFUN([MCA_orte_plm_rsh_CONFIG],[
|
|||||||
|
|
||||||
AC_CHECK_FUNC([fork], [plm_rsh_happy="yes"], [plm_rsh_happy="no"])
|
AC_CHECK_FUNC([fork], [plm_rsh_happy="yes"], [plm_rsh_happy="no"])
|
||||||
|
|
||||||
OMPI_SUMMARY_ADD([[Resource Managers]],[[ssh/rsh]],[$1],[$plm_rsh_happy])
|
OPAL_SUMMARY_ADD([[Resource Managers]],[[ssh/rsh]],[$1],[$plm_rsh_happy])
|
||||||
AS_IF([test "$plm_rsh_happy" = "yes"], [$1], [$2])
|
AS_IF([test "$plm_rsh_happy" = "yes"], [$1], [$2])
|
||||||
])dnl
|
])dnl
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user