ports/openmpi
ports/openmpi
1
1
Fork 0
Code Releases Activity

config/opal_*: portability fixes

Browse Source 
convert "test ... -o" to "test ... ||"
convert "test ... -a" to "test ... &&"
This commit is contained in:
Gilles Gouaillardet 2015-02-03 15:19:22 +09:00
parent 8fc7c79579
commit b4c333fe9b
22 changed files with 327 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
config/opal_check_attributes.m4
View File

@ -1,28 +1,30 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
# Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Mellanox Technologies, Inc.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
dnl Copyright (c) 2004-2010 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) 2009 Oak Ridge National Labs. All rights reserved.
dnl Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2013 Mellanox Technologies, Inc.
dnl All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
#
# Search the generated warnings for
# Search the generated warnings for
# keywords regarding skipping or ignoring certain attributes
# Intel: ignore
# Sun C++: skip
@ -94,7 +96,7 @@ AC_DEFUN([_OPAL_CHECK_SPECIFIC_ATTRIBUTE], [
# If the attribute is supported by both compilers,
# try to recompile a *cross-check*, IFF defined.
#
if test '(' "$opal_cv___attribute__[$1]" = "1" -a "[$3]" != "" ')' ; then
if test "$opal_cv___attribute__[$1]" = "1" && test "[$3]" != "" ; then
ac_c_werror_flag_safe=$ac_c_werror_flag
ac_c_werror_flag="yes"
CFLAGS_safe=$CFLAGS

58
config/opal_check_cray_pmi.m4
View File

@ -1,27 +1,27 @@
# -*- shell-script ; indent-tabs-mode:nil -*-
#
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# 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) 2011-2014 Los Alamos National Security, LLC. All rights
# reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved.
# Copyright (c) 2014 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- shell-script ; indent-tabs-mode:nil -*-
dnl
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
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) 2009-2011 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2014-2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
AC_DEFUN([OPAL_CHECK_CRAY_PMI_EXPLICIT],[
@ -39,10 +39,10 @@ AC_DEFUN([OPAL_CHECK_CRAY_PMI_EXPLICIT],[
[opal_cray_pmi_include_good=0
AC_MSG_WARN([No pmi.h in path specified by $with_cray_pmi])])
AS_IF([test "$opal_cray_pmi_lib_good" -eq 1 -a "$opal_cray_pmi_include_good" -eq 1],
AS_IF([test "$opal_cray_pmi_lib_good" -eq 1 && test "$opal_cray_pmi_include_good" -eq 1],
[CRAY_PMI_LDFLAGS="-L$with_cray_pmi/lib64 -L/usr/lib/alps"
CRAY_PMI_LIBS="-L$with_cray_pmi/lib64 -lpmi"
CRAY_PMI_CFLAGS="-I $with_cray_pmi/include"
CRAY_PMI_CFLAGS="-I $with_cray_pmi/include"
$1],
[$2])
@ -78,7 +78,7 @@ AC_DEFUN([OPAL_CHECK_CRAY_PMI],[
AS_IF([test "$with_cray_pmi" = "no"],
[AC_MSG_RESULT([no])
$3],
[AS_IF([test "$with_cray_pmi" = "auto" -o "$with_cray_pmi" = "yes"],
[AS_IF([test "$with_cray_pmi" = "auto" || test "$with_cray_pmi" = "yes"],
[PKG_CHECK_MODULES_STATIC([CRAY_PMI], [cray-pmi],
[opal_check_cray_pmi_happy="yes"],
[opal_check_cray_pmi_happy="no"]
@ -92,8 +92,8 @@ AC_DEFUN([OPAL_CHECK_CRAY_PMI],[
[opal_check_cray_pmi_happy="no"])
AC_MSG_WARN([opal_chack_cray_pmi_happy = $opal_check_cray_pmi_happy])])
])
AS_IF([test "$opal_check_cray_pmi_happy" = "yes" -a "$enable_static" = "yes"],
AS_IF([test "$opal_check_cray_pmi_happy" = "yes" && test "$enable_static" = "yes"],
[CRAY_PMI_LIBS = $CRAY_PMI_STATIC_LIBS],[])
AS_IF([test "$opal_check_cray_pmi_happy" = "yes"],

13
config/opal_check_cuda.m4
View File

@ -6,7 +6,7 @@ dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
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.
@ -17,13 +17,16 @@ dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
dnl Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl
dnl $COPYRIGHT$
dnl
dnl
dnl Additional copyrights may follow
dnl
dnl
dnl $HEADER$
dnl
AC_DEFUN([OPAL_CHECK_CUDA],[
#
# Check to see if user wants CUDA support
@ -42,7 +45,7 @@ AC_MSG_CHECKING([if --with-cuda is set])
# macro as that would error out after not finding it in the first directory.
# Note that anywhere CUDA aware code is in the Open MPI repository requires
# us to make use of AC_REQUIRE to ensure this check has been done.
AS_IF([test "$with_cuda" = "no" -o "x$with_cuda" = "x"],
AS_IF([test "$with_cuda" = "no" || test "x$with_cuda" = "x"],
[opal_check_cuda_happy="no"
AC_MSG_RESULT([not set (--with-cuda=$with_cuda)])],
[AS_IF([test "$with_cuda" = "yes"],
@ -71,7 +74,7 @@ AS_IF([test "$with_cuda" = "no" -o "x$with_cuda" = "x"],
# We cannot have CUDA support without dlopen support. Check for that and
# error out if the user has also set --disable-dlopen.
AS_IF([test "$enable_dlopen" = "no" -a "$opal_check_cuda_happy" = "yes"],
AS_IF([test "$enable_dlopen" = "no" && test "$opal_check_cuda_happy" = "yes"],
[AC_MSG_ERROR([--with-cuda cannot be used with --disable-dlopen. Remove one of them and reconfigure.])])
# If we have CUDA support, check to see if we have CUDA 4.1 support

8
config/opal_check_ident.m4
View File

@ -1,7 +1,9 @@
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -86,7 +88,7 @@ EOF
[opal_output="`strings -a conftest.${OBJEXT} | grep $opal_ident`"
grep $opal_ident conftest.${OBJEXT} 2>&1 1>/dev/null
opal_status=$?
AS_IF([test "$opal_output" != "" -o "$opal_status" = "0"],
AS_IF([test "$opal_output" != "" || test "$opal_status" = "0"],
[$6],
[$7])],
[OPAL_LOG_MSG([the failed program was:])

38
config/opal_check_knem.m4
View File

@ -1,18 +1,20 @@
# -*- shell-script -*-
#
# 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) 2010-2012 IBM Corporation. All rights reserved.
# Copyright (c) 2014 Los Alamos National Security, LLC. All rights
# reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- shell-script -*-
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) 2010-2012 IBM Corporation. All rights reserved.
dnl Copyright (c) 2014 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
# OPAL_CHECK_KNEM(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
@ -29,7 +31,7 @@ AC_DEFUN([OPAL_CHECK_KNEM],[
opal_check_knem_$1_save_CPPFLAGS="$CPPFLAGS"
AS_IF([test "$with_knem" != "no"],
[AS_IF([test ! -z "$with_knem" -a "$with_knem" != "yes"],
[AS_IF([test ! -z "$with_knem" && test "$with_knem" != "yes"],
[opal_check_knem_dir="$with_knem"])
_OPAL_CHECK_PACKAGE_HEADER([$1],
@ -58,9 +60,9 @@ AC_DEFUN([OPAL_CHECK_KNEM],[
CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS"
AS_IF([test "$opal_check_knem_happy" = "yes" -a "$opal_cv_knem_version_ok" = "yes"],
AS_IF([test "$opal_check_knem_happy" = "yes" && test "$opal_cv_knem_version_ok" = "yes"],
[$2],
[AS_IF([test ! -z "$with_knem" -a "$with_knem" != "no"],
[AS_IF([test ! -z "$with_knem" && test "$with_knem" != "no"],
[AC_MSG_ERROR([KNEM support requested but not found. Aborting])])
$3])
OPAL_VAR_SCOPE_POP

3
config/opal_check_openfabrics.m4
View File

@ -26,7 +26,6 @@
# $HEADER$
#
# OPAL_CHECK_OPENFABRICS(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if OPENIB support can be found. sets prefix_{CPPFLAGS,
@ -428,6 +427,6 @@ AC_DEFUN([OPAL_CHECK_MLNX_OPENFABRICS],[
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
AS_IF([test "1" = "$$1_have_mverbs" -a "1" = $$1_have_mqe],
AS_IF([test "1" = "$$1_have_mverbs" && test "1" = $$1_have_mqe],
[$2], [$3])
])dnl

58
config/opal_check_portals4.m4
View File

@ -1,27 +1,29 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2006 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2006 QLogic Corp. All rights reserved.
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
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) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
# OPAL_CHECK_PORTALS4(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if PORTALS4 support can be found. sets prefix_{CPPFLAGS,
# check if PORTALS4 support can be found. sets prefix_{CPPFLAGS,
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OPAL_CHECK_PORTALS4],[
@ -39,9 +41,9 @@ AC_DEFUN([OPAL_CHECK_PORTALS4],[
ompi_check_portals4_$1_save_LIBS="$LIBS"
AS_IF([test "$with_portals4" != "no"],
[AS_IF([test ! -z "$with_portals4" -a "$with_portals4" != "yes"],
[AS_IF([test ! -z "$with_portals4" && test "$with_portals4" != "yes"],
[ompi_check_portals4_dir="$with_portals4"])
AS_IF([test ! -z "$with_portals4_libdir" -a "$with_portals4_libdir" != "yes"],
AS_IF([test ! -z "$with_portals4_libdir" && test "$with_portals4_libdir" != "yes"],
[ompi_check_portals4_libdir="$with_portals4_libdir"])
OPAL_CHECK_PACKAGE([$1],
@ -63,7 +65,7 @@ AC_DEFUN([OPAL_CHECK_PORTALS4],[
AC_ARG_WITH([portals4-max-md-size],
[AC_HELP_STRING([--with-portals4-max-md-size=SIZE],
[Log base 2 of the maximum size in bytes of a memory descriptor. Should only be set for implementations which do not support binding all of virtual address space.])])
AS_IF([test "$with_portals4_max_md_size" = "yes" -o "$with_portals4_max_md_size" = "no"],
AS_IF([test "$with_portals4_max_md_size" = "yes" || test "$with_portals4_max_md_size" = "no"],
[AC_MSG_ERROR([--with-portals4-max-md-size requires an integer argument])],
[AS_IF([test -n "$with_portals4_max_md_size"],
[max_md_size="$with_portals4_max_md_size"])])
@ -74,24 +76,24 @@ AC_DEFUN([OPAL_CHECK_PORTALS4],[
AC_ARG_WITH([portals4-max-va-size],
[AC_HELP_STRING([--with-portals4-max-va-size=SIZE],
[Log base 2 of the maximum size in bytes of the user virtual address space. Should only be set for implementations which do not support binding all of virtual address space.])])
AS_IF([test "$with_portals4_max_va_size" = "yes" -o "$with_portals4_max_va_size" = "no"],
AS_IF([test "$with_portals4_max_va_size" = "yes" || test "$with_portals4_max_va_size" = "no"],
[AC_MSG_ERROR([--with-portals4-max-va-size requires an integer argument])],
[AS_IF([test -n "$with_portals4_max_va_size"],
[max_va_size="$with_portals4_max_va_size"])])
AC_DEFINE_UNQUOTED([OPAL_PORTALS4_MAX_VA_SIZE], [$max_va_size],
[Log base 2 of the maximum size in bytes of the user virtual address space. Set to 0 if MD can bind all of memory.])
AS_IF([test \( $max_md_size -eq 0 -a $max_va_size -ne 0 \) -o \( $max_md_size -ne 0 -a $max_va_size -eq 0 \)],
AS_IF([(test $max_md_size -eq 0 && test $max_va_size -ne 0 ) || (test $max_md_size -ne 0 && test $max_va_size -eq 0 )],
[AC_ERROR([If either --with-portals4-max-md-size or --with-portals4-max-va-size is set, both must be set.])])
AS_IF([test $max_md_size -ge $max_va_size],
[max_md_size=0
max_va_size=0])
AS_IF([test $max_md_size -ne 0 -a $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])])
AS_IF([test "$ompi_check_portals4_happy" = "yes"],
[$2],
[AS_IF([test ! -z "$with_portals4" -a "$with_portals4" != "no"],
[AS_IF([test ! -z "$with_portals4" && test "$with_portals4" != "no"],
[AC_MSG_ERROR([Portals4 support requested but not found. Aborting])])
$3])
])

52
config/opal_check_ugni.m4
View File

@ -1,26 +1,28 @@
# -*- Mode: Shell ; indent-tabs-mode:nil -*-
#
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2006 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2006 QLogic Corp. All rights reserved.
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011-2014 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- Mode: Shell ; indent-tabs-mode:nil -*-
dnl
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
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) 2011-2014 Los Alamos National Security, LLC.
dnl All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
# OPAL_CHECK_UGNI(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
@ -67,13 +69,13 @@ AC_DEFUN([OPAL_CHECK_UGNI], [
LDFLAGS="$opal_check_ugni_$1_save_LDFLAGS"
LIBS="$opal_check_ugni_$1_save_LIBS"
AS_IF([test "$opal_check_ugni_happy" = "yes" -a "$enable_progress_threads" = "yes"],
AS_IF([test "$opal_check_ugni_happy" = "yes" && test "$enable_progress_threads" = "yes"],
[AC_MSG_WARN([GNI driver does not currently support progress threads. Disabling.])
opal_check_ugni_happy="no"])
AS_IF([test "$opal_check_ugni_happy" = "yes"],
[$2],
[AS_IF([test ! -z "$with_ugni" -a "$with_ugni" != "no"],
[AS_IF([test ! -z "$with_ugni" && test "$with_ugni" != "no"],
[AC_MSG_ERROR([GNI support requested but not found. Cannot continue.])])
$3])

64
config/opal_check_verbs.m4
View File

@ -1,26 +1,28 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights
# reserved.
# Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
# Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
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-2014 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
dnl Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
# Internal helper macro to look for the verbs libdir
@ -84,24 +86,24 @@ AC_DEFUN([OPAL_CHECK_VERBS_DIR],[
])
opal_verbs_dir=
AS_IF([test -n "$with_verbs" -a "$with_verbs" != "yes" -a "$with_verbs" != "no"],
AS_IF([test -n "$with_verbs" && test "$with_verbs" != "yes" && test "$with_verbs" != "no"],
[opal_verbs_dir=$with_verbs])
opal_verbs_libdir=
AS_IF([test -n "$with_verbs_libdir" -a "$with_verbs_libdir" != "yes" -a "$with_verbs_libdir" != "no"],
AS_IF([test -n "$with_verbs_libdir" && test "$with_verbs_libdir" != "yes" && test "$with_verbs_libdir" != "no"],
[opal_verbs_libdir=$with_verbs_libdir])
# If the top dir was specified but the libdir was not, look for
# it. Note that if the user needs a specific libdir (i.e., if our
# hueristic ordering below is not sufficient), they need to
# specify it.
AS_IF([test -z "$opal_verbs_libdir" -a -n "$opal_verbs_dir"],
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
[_OPAL_CHECK_VERBS_LIBDIR(["$opal_verbs_dir/lib"])])
AS_IF([test -z "$opal_verbs_libdir" -a -n "$opal_verbs_dir"],
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
[_OPAL_CHECK_VERBS_LIBDIR(["$opal_verbs_dir/lib64"])])
AS_IF([test -z "$opal_verbs_libdir" -a -n "$opal_verbs_dir"],
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
[_OPAL_CHECK_VERBS_LIBDIR(["$opal_verbs_dir/lib32"])])
AS_IF([test -z "$opal_verbs_libdir" -a -n "$opal_verbs_dir"],
AS_IF([test -z "$opal_verbs_libdir" && test -n "$opal_verbs_dir"],
[AC_MSG_WARN([Could not find libibverbs in the usual locations under $opal_verbs_dir])
AC_MSG_ERROR([Cannot continue])
])
@ -109,9 +111,9 @@ AC_DEFUN([OPAL_CHECK_VERBS_DIR],[
# If the libdir was specified, but the top dir was not, look for
# it. Note that if the user needs a specific top dir (i.e., if
# our hueristic below is not sufficient), they need to specify it.
AS_IF([test -z "$opal_verbs" -a -n "$opal_verbs_libdir"],
AS_IF([test -z "$opal_verbs" && test -n "$opal_verbs_libdir"],
[_OPAL_CHECK_VERBS_DIR([`dirname "$opal_verbs_libdir"`])])
AS_IF([test -z "$opal_verbs_dir" -a -n "$opal_verbs_libdir"],
AS_IF([test -z "$opal_verbs_dir" && test -n "$opal_verbs_libdir"],
[AC_MSG_WARN([Could not find verbs.h in the usual locations under $opal_verbs_dir])
AC_MSG_ERROR([Cannot continue])
])

12
config/opal_config_asm.m4
View File

@ -11,6 +11,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -386,13 +388,13 @@ foo$opal_cv_asm_label_suffix
[opal_asm_addr=""])
# test for both 16 and 10 (decimal and hex notations)
echo "configure: .align test address offset is $opal_asm_addr" >&AC_FD_CC
if test "$opal_asm_addr" = "16" -o "$opal_asm_addr" = "10" ; then
if test "$opal_asm_addr" = "16" || test "$opal_asm_addr" = "10" ; then
opal_cv_asm_align_log="yes"
else
opal_cv_asm_align_log="no"
fi])
if test "$opal_cv_asm_align_log" = "yes" -o "$opal_cv_asm_align_log" = "1" ; then
if test "$opal_cv_asm_align_log" = "yes" || test "$opal_cv_asm_align_log" = "1" ; then
opal_asm_align_log_result=1
else
opal_asm_align_log_result=0
@ -1039,7 +1041,7 @@ AC_MSG_ERROR([Can not continue.])
asm_format="${asm_format}-${opal_cv_asm_lsym}"
asm_format="${asm_format}-${opal_cv_asm_type}-${opal_asm_size}"
asm_format="${asm_format}-${opal_asm_align_log_result}"
if test "$opal_cv_asm_arch" = "POWERPC32" -o "$opal_cv_asm_arch" = "POWERPC64" ; then
if test "$opal_cv_asm_arch" = "POWERPC32" || test "$opal_cv_asm_arch" = "POWERPC64" ; then
asm_format="${asm_format}-${opal_cv_asm_powerpc_r_reg}"
else
asm_format="${asm_format}-1"
@ -1068,7 +1070,7 @@ AC_MSG_ERROR([Can not continue.])
# Check for RDTSCP support
result=0
AS_IF([test "$opal_cv_asm_arch" = "OPAL_AMD64" -o "$opal_cv_asm_arch" = "OPAL_IA32"],
AS_IF([test "$opal_cv_asm_arch" = "OPAL_AMD64" || test "$opal_cv_asm_arch" = "OPAL_IA32"],
[AC_MSG_CHECKING([for RDTSCP assembly support])
AC_LANG_PUSH([C])
AC_TRY_RUN([[
@ -1114,7 +1116,7 @@ AC_DEFUN([OPAL_ASM_FIND_FILE], [
AC_REQUIRE([AC_PROG_GREP])
AC_REQUIRE([AC_PROG_FGREP])
if test "$opal_cv_asm_arch" != "WINDOWS" -a "$opal_cv_asm_builtin" != "BUILTIN_SYNC" -a "$opal_cv_asm_builtin" != "BUILTIN_OSX" ; then
if test "$opal_cv_asm_arch" != "WINDOWS" && test "$opal_cv_asm_builtin" != "BUILTIN_SYNC" && test "$opal_cv_asm_builtin" != "BUILTIN_OSX" ; then
AC_CHECK_PROG([PERL], [perl], [perl])
# see if we have a pre-built one already

26
config/opal_config_pthreads.m4
View File

@ -5,18 +5,18 @@ dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
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) 2012 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2014 Research Organization for Information Science
dnl Copyright (c) 2014-2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl
dnl Additional copyrights may follow
dnl
dnl
dnl $HEADER$
dnl
dnl OPAL_CONFIG_POSIX_THREADS()
@ -218,7 +218,7 @@ AC_DEFUN([OPAL_INTL_POSIX_THREADS_PLAIN_FC], [
#
# Fortran compiler
#
if test "$opal_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
if test "$opal_pthread_fortran_success" = "0" && test "$OMPI_WANT_FORTRAN_BINDINGS" = "1" && test $ompi_fortran_happy -eq 1; then
AC_MSG_CHECKING([if Fortran compiler and POSIX threads work as is])
AC_LANG_PUSH(C)
@ -322,7 +322,7 @@ AC_DEFUN([OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC], [
#
# Fortran compiler
#
if test "$opal_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
if test "$opal_pthread_fortran_success" = "0" && test "$OMPI_WANT_FORTRAN_BINDINGS" = "1" && test $ompi_fortran_happy -eq 1; then
for pf in $pflags; do
AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $pf])
FCFLAGS="$orig_FCFLAGS $pf"
@ -437,7 +437,7 @@ AC_DEFUN([OPAL_INTL_POSIX_THREADS_LIBS_CXX],[
# C++ compiler
#
if test "$opal_pthread_cxx_success" = "0"; then
if test ! "$opal_pthread_c_success" = "0" -a ! "$PTHREAD_LIBS" = "" ; then
if test ! "$opal_pthread_c_success" = "0" && test ! "$PTHREAD_LIBS" = "" ; then
AC_MSG_CHECKING([if C++ compiler and POSIX threads work with $PTHREAD_LIBS])
case "${host_cpu}-${host-_os}" in
*-aix* | *-freebsd*)
@ -507,8 +507,8 @@ AC_DEFUN([OPAL_INTL_POSIX_THREADS_LIBS_FC],[
#
# Fortran compiler
#
if test "$opal_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
if test ! "$opal_pthread_c_success" = "0" -a ! "$PTHREAD_LIBS" = "" ; then
if test "$opal_pthread_fortran_success" = "0" && test "$OMPI_WANT_FORTRAN_BINDINGS" = "1" && test $ompi_fortran_happy -eq 1; then
if test ! "$opal_pthread_c_success" = "0" && test ! "$PTHREAD_LIBS" = "" ; then
AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $PTHREAD_LIBS])
LIBS="$orig_LIBS $PTHREAD_LIBS"
AC_LANG_PUSH(C)
@ -650,13 +650,13 @@ CXXCPPFLAGS="$orig_CXXCPPFLAGS"
LDFLAGS="$orig_LDFLAGS"
LIBS="$orig_LIBS"
if test "$OMPI_WANT_FORTRAN_BINDINGS" != "1" -o $ompi_fortran_happy -ne 1; then
if test "$OMPI_WANT_FORTRAN_BINDINGS" != "1" || test $ompi_fortran_happy -ne 1; then
opal_pthread_fortran_success=1
fi
if test "$opal_pthread_c_success" = "1" -a \
"$opal_pthread_cxx_success" = "1" -a \
"$opal_pthread_fortran_success" = "1"; then
if test "$opal_pthread_c_success" = "1" && \
test "$opal_pthread_cxx_success" = "1" && \
test "$opal_pthread_fortran_success" = "1"; then
internal_useless=1
$1
else

4
config/opal_config_subdir.m4
View File

@ -12,6 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -37,7 +39,7 @@ subdir_failure="$4"
# Sanity checks
#
if test "$subdir_dir" != ":" -a -d $srcdir/$subdir_dir; then
if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
AC_MSG_NOTICE([OPAL configuring in $subdir_dir])
#

16
config/opal_configure_options.m4
View File

@ -18,6 +18,8 @@ dnl reserved.
dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
dnl Copyright (c) 2011-2013 NVIDIA Corporation. All rights reserved.
dnl Copyright (c) 2013 Intel, Inc. All rights reserved
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl
dnl $COPYRIGHT$
dnl
@ -99,7 +101,7 @@ else
WANT_MEM_DEBUG=0
fi
#################### Early development override ####################
if test "$WANT_MEM_DEBUG" = "0" -a -z "$enable_mem_debug" -a "$OPAL_DEVEL" = 1; then
if test "$WANT_MEM_DEBUG" = "0" && test -z "$enable_mem_debug" && test "$OPAL_DEVEL" = 1; then
WANT_MEM_DEBUG=1
echo "--> developer override: enable mem profiling by default"
fi
@ -123,7 +125,7 @@ else
WANT_MEM_PROFILE=0
fi
#################### Early development override ####################
if test "$WANT_MEM_PROFILE" = "0" -a -z "$enable_mem_profile" -a "$OPAL_DEVEL" = 1; then
if test "$WANT_MEM_PROFILE" = "0" && test -z "$enable_mem_profile" && test "$OPAL_DEVEL" = 1; then
WANT_MEM_PROFILE=1
echo "--> developer override: enable mem profiling by default"
fi
@ -147,7 +149,7 @@ else
WANT_PICKY_COMPILER=0
fi
#################### Early development override ####################
if test "$WANT_PICKY_COMPILER" = "0" -a -z "$enable_picky" -a "$OPAL_DEVEL" = 1; then
if test "$WANT_PICKY_COMPILER" = "0" && test -z "$enable_picky" && test "$OPAL_DEVEL" = 1; then
WANT_PICKY_COMPILER=1
echo "--> developer override: enable picky compiler by default"
fi
@ -186,11 +188,11 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_TIMING, $WANT_TIMING,
[Whether we want developer-level timing framework or not])
AM_CONDITIONAL([OPAL_COMPILE_TIMING], [test "$WANT_TIMING" = "1"])
AM_CONDITIONAL([OPAL_INSTALL_TIMING_BINARIES], [test "$WANT_TIMING" = "1" -a "$enable_binaries" != "no"])
AM_CONDITIONAL([OPAL_INSTALL_TIMING_BINARIES], [test "$WANT_TIMING" = "1" && test "$enable_binaries" != "no"])
#################### Early development override ####################
if test "$WANT_DEBUG" = "0" -a -z "$enable_debug" -a "$OPAL_DEVEL" = 1; then
if test "$WANT_DEBUG" = "0" && test -z "$enable_debug" && test "$OPAL_DEVEL" = 1; then
WANT_DEBUG=1
echo "--> developer override: enable debugging code by default"
fi
@ -401,7 +403,7 @@ AC_MSG_CHECKING([if want package/brand string])
AC_ARG_WITH([package-string],
[AC_HELP_STRING([--with-package-string=STRING],
[Use a branding string throughout Open MPI])])
if test "$with_package_string" = "" -o "$with_package_string" = "no"; then
if test "$with_package_string" = "" || test "$with_package_string" = "no"; then
with_package_string="Open MPI $OPAL_CONFIGURE_USER@$OPAL_CONFIGURE_HOST Distribution"
fi
AC_DEFINE_UNQUOTED([OPAL_PACKAGE_STRING], ["$with_package_string"],
@ -415,7 +417,7 @@ AC_MSG_CHECKING([if want ident string])
AC_ARG_WITH([ident-string],
[AC_HELP_STRING([--with-ident-string=STRING],
[Embed an ident string into Open MPI object files])])
if test "$with_ident_string" = "" -o "$with_ident_string" = "no"; then
if test "$with_ident_string" = "" || test "$with_ident_string" = "no"; then
with_ident_string="%VERSION%"
fi
# This is complicated, because $OPAL_VERSION may have spaces in it.

14
config/opal_functions.m4
View File

@ -14,6 +14,8 @@ dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
dnl Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl
dnl $COPYRIGHT$
dnl
@ -225,7 +227,7 @@ dnl #######################################################################
AC_DEFUN([OPAL_LOG_FILE],[
# 1 is the filename
if test -n "$1" -a -f "$1"; then
if test -n "$1" && test -f "$1"; then
cat $1 >&5
fi])dnl
@ -268,7 +270,7 @@ for val in ${$1}; do
# Loop over every token we've seen so far
opal_done="`expr $opal_i \> $opal_count`"
while test "$opal_found" = "0" -a "$opal_done" = "0"; do
while test "$opal_found" = "0" && test "$opal_done" = "0"; do
# Have we seen this token already? Prefix the comparison with
# "x" so that "-Lfoo" values won't be cause an error.
@ -373,7 +375,7 @@ AC_DEFUN([OPAL_FLAGS_UNIQ],[
# Loop over every token we've seen so far
opal_done="`expr $opal_i \> $opal_count`"
while test "$opal_found" = "0" -a "$opal_done" = "0"; do
while test "$opal_found" = "0" && test "$opal_done" = "0"; do
# Have we seen this token already? Prefix the comparison
# with "x" so that "-Lfoo" values won't be cause an error.
@ -464,7 +466,7 @@ AC_DEFUN([OPAL_FLAGS_APPEND_UNIQ], [
for arg in $2; do
opal_tmp=`echo $arg | cut -c1-2`
opal_append=1
AS_IF([test "$opal_tmp" = "-I" -o "$opal_tmp" = "-L" -o "$opal_tmp" = "-l"],
AS_IF([test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"],
[for val in ${$1}; do
AS_IF([test "x$val" = "x$arg"], [opal_append=0])
done])
@ -584,11 +586,11 @@ AC_DEFUN([OPAL_WITH_OPTION_MIN_MAX_VALUE], [
AC_ARG_WITH([max-]m4_translit($1, [_], [-]),
AC_HELP_STRING([--with-max-]m4_translit($1, [_], [-])[=VALUE],
[maximum length of ]m4_translit($1, [_], [ ])[s. VALUE argument has to be specified (default: [$2]).]))
if test ! -z "$with_max_[$1]" -a "$with_max_[$1]" != "no" ; then
if test ! -z "$with_max_[$1]" && test "$with_max_[$1]" != "no" ; then
# Ensure it's a number (hopefully an integer!), and >0
expr $with_max_[$1] + 1 > /dev/null 2> /dev/null
AS_IF([test "$?" != "0"], [happy=0],
[AS_IF([test $with_max_[$1] -ge $3 -a $with_max_[$1] -le $4],
[AS_IF([test $with_max_[$1] -ge $3 && test $with_max_[$1] -le $4],
[happy=1], [happy=0])])
# If badness in the above tests, bail

42
config/opal_load_platform.m4
View File

@ -1,22 +1,24 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
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) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
# OPAL_LOAD_PLATFORM()
# --------------------
@ -37,7 +39,7 @@ AC_DEFUN([OPAL_LOAD_PLATFORM], [
AC_MSG_ERROR([--without-platform is not a valid argument])
elif test "$with_platform" != "" ; then
# if not an absolute path, check in contrib/platform
if test ! "`echo $with_platform | cut -c1`" = "/" -a ! "`echo $with_platform | cut -c2`" = ".." ; then
if test ! "`echo $with_platform | cut -c1`" = "/" && test ! "`echo $with_platform | cut -c2`" = ".." ; then
if test -r "${srcdir}/contrib/platform/$with_platform" ; then
with_platform="${srcdir}/contrib/platform/$with_platform"
fi

30
config/opal_mca.m4
View File

@ -122,7 +122,7 @@ AC_DEFUN([OPAL_MCA],[
AC_MSG_RESULT([yes])
AC_MSG_ERROR([*** The enable-mca-direct flag requires an explicit list of
*** type-component pairs. For example, --enable-mca-direct=pml-ob1,coll-basic])
elif test ! -z "$enable_mca_direct" -a "$enable_mca_direct" != "" ; then
elif test ! -z "$enable_mca_direct" && test "$enable_mca_direct" != "" ; then
#
# we need to add this into the static list, unless the static list
# is everything
@ -142,7 +142,7 @@ AC_DEFUN([OPAL_MCA],[
for item in $enable_mca_direct; do
type="`echo $item | cut -f1 -d-`"
comp="`echo $item | cut -f2- -d-`"
if test -z $type -o -z $comp ; then
if test -z $type || test -z $comp ; then
AC_MSG_ERROR([*** The enable-mca-direct flag requires a
*** list of type-component pairs. Invalid input detected.])
else
@ -164,7 +164,7 @@ AC_DEFUN([OPAL_MCA],[
if test "$enable_static" != "no"; then
DSO_all=0
msg=none
elif test -z "$enable_mca_dso" -o "$enable_mca_dso" = "yes"; then
elif test -z "$enable_mca_dso" || test "$enable_mca_dso" = "yes"; then
DSO_all=1
msg=all
elif test "$enable_mca_dso" = "no"; then
@ -193,7 +193,7 @@ AC_DEFUN([OPAL_MCA],[
if test "$enable_mca_static" = "yes"; then
STATIC_all=1
msg=all
elif test -z "$enable_mca_static" -o "$enable_mca_static" = "no"; then
elif test -z "$enable_mca_static" || test "$enable_mca_static" = "no"; then
STATIC_all=0
msg=none
else
@ -225,7 +225,7 @@ AC_DEFUN([OPAL_MCA],[
[# BWB: Until projects have seperate configure scripts
# and can skip running all of ORTE, just avoid recursing
# into orte sub directory if orte disabled
if test "mca_project" = "ompi" -a "$enable_mpi" != "no" || test "mca_project" = "opal" || test "mca_project" = "orte" || test "mca_project" = "oshmem"; then
if (test "mca_project" = "ompi" && test "$enable_mpi" != "no") || test "mca_project" = "opal" || test "mca_project" = "orte" || test "mca_project" = "oshmem"; then
MCA_PROJECT_SUBDIRS="$MCA_PROJECT_SUBDIRS mca_project"
fi
MCA_CONFIGURE_PROJECT(mca_project)])
@ -631,7 +631,7 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[
AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[
for component_path in $srcdir/$1/mca/$2/* ; do
component="`basename $component_path`"
if test -d $component_path -a -x $component_path/configure ; then
if test -d $component_path && test -x $component_path/configure ; then
opal_show_subsubsubtitle "MCA component $2:$component (need to configure)"
opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: before, should_build=$8"
@ -656,7 +656,7 @@ AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[
# First check for the ABORT tag
line="`$GREP ABORT= $infile | cut -d= -f2-`"
if test -n "$line" -a "$line" != "no"; then
if test -n "$line" && test "$line" != "no"; then
AC_MSG_WARN([MCA component configure script told me to abort])
AC_MSG_ERROR([cannot continue])
fi
@ -701,14 +701,14 @@ AC_DEFUN([MCA_COMPONENT_COMPILE_MODE],[
shared_mode_override=static
# Setup for either shared or static
if test "$STATIC_FRAMEWORK" = "1" -o \
"$STATIC_COMPONENT" = "1" -o \
"$STATIC_all" = "1" ; then
if test "$STATIC_FRAMEWORK" = "1" || \
test "$STATIC_COMPONENT" = "1" || \
test "$STATIC_all" = "1" ; then
$4="static"
elif test "$shared_mode_override" = "dso" -o \
"$SHARED_FRAMEWORK" = "1" -o \
"$SHARED_COMPONENT" = "1" -o \
"$DSO_all" = "1"; then
elif test "$shared_mode_override" = "dso" || \
test "$SHARED_FRAMEWORK" = "1" || \
test "$SHARED_COMPONENT" = "1" || \
test "$DSO_all" = "1"; then
$4="dso"
else
$4="static"
@ -820,7 +820,7 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but
AS_LITERAL_IF([$3],
[AS_IF([test "$$2_$3_WRAPPER_EXTRA_CPPFLAGS" != ""],
[m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0])
AS_IF([test "$8" = "static" -a "$stop_at_first" = "1"],
AS_IF([test "$8" = "static" && test "$stop_at_first" = "1"],
[AS_IF([test "$with_devel_headers" = "yes"],
[OPAL_FLAGS_APPEND_UNIQ([mca_wrapper_extra_cppflags], [$$2_$3_WRAPPER_EXTRA_CPPFLAGS])])],
[AC_MSG_WARN([ignoring $2_$3_WRAPPER_EXTRA_CPPFLAGS ($$2_$3_WRAPPER_EXTRA_CPPFLAGS): component conditions not met])])])])

6
config/opal_setup_cc.m4
View File

@ -14,6 +14,8 @@ dnl Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2012 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -115,7 +117,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
fi
# Do we want debugging?
if test "$WANT_DEBUG" = "1" -a "$enable_debug_symbols" != "no" ; then
if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
if test "$opal_c_vendor" = "gnu"; then
CFLAGS="$CFLAGS -g" # keep the -g3 for when it will become a standard option.
else
@ -129,7 +131,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
# These flags are generally gcc-specific; even the
# gcc-impersonating compilers won't accept them.
OPAL_CFLAGS_BEFORE_PICKY="$CFLAGS"
if test "$WANT_PICKY_COMPILER" = 1 -a "$opal_c_vendor" = "gnu" ; then
if test "$WANT_PICKY_COMPILER" = 1 && test "$opal_c_vendor" = "gnu" ; then
add="-Wall -Wundef -Wno-long-long -Wsign-compare"
add="$add -Wmissing-prototypes -Wstrict-prototypes"
add="$add -Wcomment -pedantic"

48
config/opal_setup_component_package.m4
View File

@ -1,23 +1,25 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
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) 2008-2009 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
# OPAL_SETUP_COMPONENT_PACKAGE(1: framework_name,
# 2: component_name,
@ -66,9 +68,9 @@ AC_DEFUN([OPAL_SETUP_COMPONENT_PACKAGE],[
[Search for the $3 libraries in DIR])])
OPAL_CHECK_WITHDIR([$3-libdir], [$with_$3_libdir], [$5])
AS_IF([test ! -z "$with_$3" -a "$with_$3" != "yes"],
AS_IF([test ! -z "$with_$3" && test "$with_$3" != "yes"],
[$1_$2_dir="$with_$3"])
AS_IF([test ! -z "$with_$3_libdir" -a "$with_$3_libdir" != "yes"],
AS_IF([test ! -z "$with_$3_libdir" && test "$with_$3_libdir" != "yes"],
[$1_$2_libdir="$with_$3_libdir"])
AS_IF([test "$with_$3" = "no"],
@ -92,7 +94,7 @@ AC_DEFUN([OPAL_SETUP_COMPONENT_PACKAGE],[
# sanity check
AS_IF([test "$$1_$2_happy" = "no"],
[AS_IF([test "$with_$3" != "no" -a ! -z "$with_$3"],
[AS_IF([test "$with_$3" != "no" && test ! -z "$with_$3"],
[AC_MSG_WARN([$1:$2 requested but not found])
AC_MSG_ERROR([Cannot continue])])])

6
config/opal_setup_cxx.m4
View File

@ -14,6 +14,8 @@ dnl Copyright (c) 2006 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -92,7 +94,7 @@ AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[
fi
# Do we want debugging?
if test "$WANT_DEBUG" = "1" -a "$enable_debug_symbols" != "no" ; then
if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
CXXFLAGS="$CXXFLAGS -g"
OPAL_FLAGS_UNIQ(CXXFLAGS)
AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
@ -101,7 +103,7 @@ AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[
# These flags are generally g++-specific; even the g++-impersonating
# compilers won't accept them.
OPAL_CXXFLAGS_BEFORE_PICKY="$CXXFLAGS"
if test "$WANT_PICKY_COMPILER" = 1 -a "$opal_cxx_vendor" = "gnu"; then
if test "$WANT_PICKY_COMPILER" = 1 && test "$opal_cxx_vendor" = "gnu"; then
add="-Wall -Wundef -Wno-long-long"
# see if -Wno-long-double works...

17
config/opal_setup_ft.m4
View File

@ -1,3 +1,14 @@
dnl
dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
dnl
dnl $HEADER$
dnl
#
# --with-ft=TYPE
# TYPE:
@ -52,7 +63,7 @@ AC_DEFUN([OPAL_SETUP_FT],[
if test "$opal_setup_ft_options" = "yes"; then
AC_MSG_CHECKING([if want fault tolerance])
fi
if test "x$with_ft" != "x" -o "$opal_want_ft" = "1"; then
if test "x$with_ft" != "x" || test "$opal_want_ft" = "1"; then
opal_want_ft=1
opal_want_ft_cr=0
opal_want_ft_type=none
@ -63,7 +74,7 @@ AC_DEFUN([OPAL_SETUP_FT],[
IFS=$as_save_IFS
# Default value
if test "$opt" = "" -o "$opt" = "yes"; then
if test "$opt" = "" || test "$opt" = "yes"; then
opal_want_ft_cr=1
elif test "$opt" = "LAM"; then
opal_want_ft_cr=1
@ -136,7 +147,7 @@ AC_DEFUN([OPAL_SETUP_FT],[
opal_want_ft_thread=0
AC_MSG_RESULT([Disabled])
# if default, and no progress or MPI threads
elif test "$enable_ft_thread" = "undef" -a "$enable_opal_multi_threads" = "no" ; then
elif test "$enable_ft_thread" = "undef" && test "$enable_opal_multi_threads" = "no" ; then
opal_want_ft_thread=0
AC_MSG_RESULT([Disabled (OPAL Thread Support Disabled)])
# if default, and MPI threads enabled for C/R only

24
config/opal_setup_java.m4
View File

@ -15,6 +15,8 @@ dnl reserved.
dnl Copyright (c) 2007-2012 Oracle and/or its affiliates. All rights reserved.
dnl Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -54,24 +56,24 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
opal_java_happy=no
else
# Check for bozo case: ensure a directory was specified
AS_IF([test "$with_jdk_dir" = "yes" -o "$with_jdk_dir" = "no"],
AS_IF([test "$with_jdk_dir" = "yes" || test "$with_jdk_dir" = "no"],
[AC_MSG_WARN([Must specify a directory name for --with-jdk-dir])
AC_MSG_ERROR([Cannot continue])])
AS_IF([test "$with_jdk_bindir" = "yes" -o "$with_jdk_bindir" = "no"],
AS_IF([test "$with_jdk_bindir" = "yes" || test "$with_jdk_bindir" = "no"],
[AC_MSG_WARN([Must specify a directory name for --with-jdk-bindir])
AC_MSG_ERROR([Cannot continue])])
AS_IF([test "$with_jdk_headers" = "yes" -o "$with_jdk_headers" = "no"],
AS_IF([test "$with_jdk_headers" = "yes" || test "$with_jdk_headers" = "no"],
[AC_MSG_WARN([Must specify a directory name for --with-jdk-headers])
AC_MSG_ERROR([Cannot continue])])
# Check for bozo case: either specify --with-jdk-dir or
# (--with-jdk-bindir, --with-jdk-headers) -- not both.
opal_java_bad=0
AS_IF([test -n "$with_jdk_dir" -a -n "$with_jdk_bindir" -o \
-n "$with_jdk_dir" -a -n "$with_jdk_headers"],
AS_IF([test -n "$with_jdk_dir" && \
(test -n "$with_jdk_bindir" || test -n "$with_jdk_headers")],
[opal_java_bad=1])
AS_IF([test -z "$with_jdk_bindir" -a -n "$with_jdk_headers" -o \
-n "$with_jdk_bindir" -a -z "$with_jdk_headers"],
AS_IF([(test -z "$with_jdk_bindir" && test -n "$with_jdk_headers") || \
(test -n "$with_jdk_bindir" && test -z "$with_jdk_headers")],
[opal_java_bad=1])
AS_IF([test "$opal_java_bad" = "1"],
[AC_MSG_WARN([Either specify --with-jdk-dir or both of (--with-jdk_bindir, --with-jdk-headers) -- not both.])
@ -136,7 +138,7 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
# Solaris
opal_java_dir=/usr/java
AC_MSG_CHECKING([Solaris locations])
AS_IF([test -d $opal_java_dir -a -r "$opal_java_dir/include/jni.h"],
AS_IF([test -d $opal_java_dir && test -r "$opal_java_dir/include/jni.h"],
[AC_MSG_RESULT([found ($opal_java_dir)])
with_jdk_headers=$opal_java_dir/include
with_jdk_bindir=$opal_java_dir/bin
@ -153,7 +155,7 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
# Look for various Java-related programs
opal_java_happy=no
opal_java_PATH_save=$PATH
AS_IF([test -n "$with_jdk_bindir" -a "$with_jdk_bindir" != "yes" -a "$with_jdk_bindir" != "no"],
AS_IF([test -n "$with_jdk_bindir" && test "$with_jdk_bindir" != "yes" && test "$with_jdk_bindir" != "no"],
[PATH="$with_jdk_bindir:$PATH"])
AC_PATH_PROG(JAVAC, javac)
AC_PATH_PROG(JAVAH, javah)
@ -161,7 +163,7 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
PATH=$opal_java_PATH_save
# Check to see if we have all 3 programs.
AS_IF([test -z "$JAVAC" -o -z "$JAVAH" -o -z "$JAR"],
AS_IF([test -z "$JAVAC" || test -z "$JAVAH" || test -z "$JAR"],
[opal_java_happy=no
HAVE_JAVA_SUPPORT=0],
[opal_java_happy=yes
@ -172,7 +174,7 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
[opal_java_CPPFLAGS_save=$CPPFLAGS
# silence a stupid Mac warning
CPPFLAGS="$CPPFLAGS -DTARGET_RT_MAC_CFM=0"
AS_IF([test -n "$with_jdk_headers" -a "$with_jdk_headers" != "yes" -a "$with_jdk_headers" != "no"],
AS_IF([test -n "$with_jdk_headers" && test "$with_jdk_headers" != "yes" && test "$with_jdk_headers" != "no"],
[OPAL_JDK_CPPFLAGS="-I$with_jdk_headers"
# Some flavors of JDK also require -I<blah>/linux.
# See if that's there, and if so, add a -I for that,

20
config/opal_setup_wrappers.m4
View File

@ -12,6 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
dnl Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -75,50 +77,50 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_INIT],[
AC_ARG_WITH([wrapper-cflags],
[AC_HELP_STRING([--with-wrapper-cflags],
[Extra flags to add to CFLAGS when using mpicc])])
AS_IF([test "$with_wrapper_cflags" = "yes" -o "$with_wrapper_cflags" = "no"],
AS_IF([test "$with_wrapper_cflags" = "yes" || test "$with_wrapper_cflags" = "no"],
[AC_MSG_ERROR([--with-wrapper-cflags must have an argument.])])
AC_ARG_WITH([wrapper-cflags-prefix],
[AC_HELP_STRING([--with-wrapper-cflags-prefix],
[Extra flags (before user flags) to add to CFLAGS when using mpicc])])
AS_IF([test "$with_wrapper_cflags_prefix" = "yes" -o "$with_wrapper_cflags_prefix" = "no"],
AS_IF([test "$with_wrapper_cflags_prefix" = "yes" || test "$with_wrapper_cflags_prefix" = "no"],
[AC_MSG_ERROR([--with-wrapper-cflags-prefix must have an argument.])])
AC_ARG_WITH([wrapper-cxxflags],
[AC_HELP_STRING([--with-wrapper-cxxflags],
[Extra flags to add to CXXFLAGS when using mpiCC/mpic++])])
AS_IF([test "$with_wrapper_cxxflags" = "yes" -o "$with_wrapper_cxxflags" = "no"],
AS_IF([test "$with_wrapper_cxxflags" = "yes" || test "$with_wrapper_cxxflags" = "no"],
[AC_MSG_ERROR([--with-wrapper-cxxflags must have an argument.])])
AC_ARG_WITH([wrapper-cxxflags-prefix],
[AC_HELP_STRING([--with-wrapper-cxxflags-prefix],
[Extra flags to add to CXXFLAGS when using mpiCC/mpic++])])
AS_IF([test "$with_wrapper_cxxflags_prefix" = "yes" -o "$with_wrapper_cxxflags_prefix" = "no"],
AS_IF([test "$with_wrapper_cxxflags_prefix" = "yes" || test "$with_wrapper_cxxflags_prefix" = "no"],
[AC_MSG_ERROR([--with-wrapper-cxxflags-prefix must have an argument.])])
m4_ifdef([project_ompi], [
AC_ARG_WITH([wrapper-fcflags],
[AC_HELP_STRING([--with-wrapper-fcflags],
[Extra flags to add to FCFLAGS when using mpifort])])
AS_IF([test "$with_wrapper_fcflags" = "yes" -o "$with_wrapper_fcflags" = "no"],
AS_IF([test "$with_wrapper_fcflags" = "yes" || test "$with_wrapper_fcflags" = "no"],
[AC_MSG_ERROR([--with-wrapper-fcflags must have an argument.])])
AC_ARG_WITH([wrapper-fcflags-prefix],
[AC_HELP_STRING([--with-wrapper-fcflags-prefix],
[Extra flags (before user flags) to add to FCFLAGS when using mpifort])])
AS_IF([test "$with_wrapper_fcflags_prefix" = "yes" -o "$with_wrapper_fcflags_prefix" = "no"],
AS_IF([test "$with_wrapper_fcflags_prefix" = "yes" || test "$with_wrapper_fcflags_prefix" = "no"],
[AC_MSG_ERROR([--with-wrapper-fcflags-prefix must have an argument.])])])
AC_ARG_WITH([wrapper-ldflags],
[AC_HELP_STRING([--with-wrapper-ldflags],
[Extra flags to add to LDFLAGS when using wrapper compilers])])
AS_IF([test "$with_wrapper_ldflags" = "yes" -o "$with_wrapper_ldflags" = "no"],
AS_IF([test "$with_wrapper_ldflags" = "yes" || test "$with_wrapper_ldflags" = "no"],
[AC_MSG_ERROR([--with-wrapper-ldflags must have an argument.])])
AC_ARG_WITH([wrapper-libs],
[AC_HELP_STRING([--with-wrapper-libs],
[Extra flags to add to LIBS when using wrapper compilers])])
AS_IF([test "$with_wrapper_libs" = "yes" -o "$with_wrapper_libs" = "no"],
AS_IF([test "$with_wrapper_libs" = "yes" || test "$with_wrapper_libs" = "no"],
[AC_MSG_ERROR([--with-wrapper-libs must have an argument.])])
AC_MSG_CHECKING([if want wrapper compiler rpath support])
@ -242,7 +244,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
WRAPPER_RPATH_SUPPORT=disabled
AS_IF([test "$enable_wrapper_rpath" = "yes"],
[OPAL_SETUP_RPATH])
AS_IF([test "$enable_wrapper_rpath" = "yes" -a "$WRAPPER_RPATH_SUPPORT" = "disabled"],
AS_IF([test "$enable_wrapper_rpath" = "yes" && test "$WRAPPER_RPATH_SUPPORT" = "disabled"],
[AC_MSG_WARN([RPATH support requested but not available])
AC_MSG_ERROR([Cannot continue])])