From 6b57b77ecb7f4ceee8e5d5da72e96d7692975bb5 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 21 Sep 2016 15:11:26 +0900 Subject: [PATCH] configury: add the --disable-io-ompio option --disable-io-ompio is a shortcut that disable the following frameworks and components - fbtl - fcoll - sharedfp - common/ompio - io/ompio Fixes open-mpi/ompi#1934 --- config/ompi_configure_options.m4 | 4 ++++ ompi/mca/common/ompio/configure.m4 | 3 ++- ompi/mca/fbtl/configure.m4 | 20 +++++++++++++------- ompi/mca/fcoll/configure.m4 | 20 +++++++++++++------- ompi/mca/io/ompio/configure.m4 | 21 +++++++++++++++++++++ ompi/mca/sharedfp/configure.m4 | 20 +++++++++++++------- 6 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 ompi/mca/io/ompio/configure.m4 diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4 index ad5436c61b..01fdff4da5 100644 --- a/config/ompi_configure_options.m4 +++ b/config/ompi_configure_options.m4 @@ -263,5 +263,9 @@ AC_ARG_ENABLE([mpi-io], the ompio component and a specially modified version of ROMIO that fits inside the romio314 component])]) +AC_ARG_ENABLE([io-ompio], + [AC_HELP_STRING([--disable-io-ompio], + [Disable the ompio ROM-IO component])]) + ])dnl diff --git a/ompi/mca/common/ompio/configure.m4 b/ompi/mca/common/ompio/configure.m4 index 5b416f181c..eee33e5750 100644 --- a/ompi/mca/common/ompio/configure.m4 +++ b/ompi/mca/common/ompio/configure.m4 @@ -15,7 +15,8 @@ AC_DEFUN([MCA_ompi_common_ompio_CONFIG],[ AC_CONFIG_FILES([ompi/mca/common/ompio/Makefile]) - AS_IF([test "$enable_mpi_io" != "no"], + AS_IF([test "$enable_mpi_io" != "no" && + test "$enable_io_ompio" != "no"], [$1], [$2]) ])dnl diff --git a/ompi/mca/fbtl/configure.m4 b/ompi/mca/fbtl/configure.m4 index ae9f6f5b36..803de5aaf7 100644 --- a/ompi/mca/fbtl/configure.m4 +++ b/ompi/mca/fbtl/configure.m4 @@ -1,6 +1,8 @@ # -*- shell-script -*- # -# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # # $COPYRIGHT$ # @@ -13,10 +15,14 @@ # ------------------------------------------- AC_DEFUN([MCA_ompi_fbtl_CONFIG], [ - # An AC-ARG-ENABLE for mpi-io was set in ompi/mca/io/configure.m4. - # If it's no, we shouldn't bother building anything in fcoll. - AS_IF([test "$enable_mpi_io" != "no"], - [want_mpi_io=1], - [want_mpi_io=0]) - MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_mpi_io]) + OPAL_VAR_SCOPE_PUSH([want_io_ompio]) + + AS_IF([test "$enable_mpi_io" != "no" && + test "$enable_io_ompio" != "no"], + [want_io_ompio=1], + [want_io_ompio=0]) + + MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio]) + + OPAL_VAR_SCOPE_POP ]) diff --git a/ompi/mca/fcoll/configure.m4 b/ompi/mca/fcoll/configure.m4 index ff87e2b7ed..30f5cbfc52 100644 --- a/ompi/mca/fcoll/configure.m4 +++ b/ompi/mca/fcoll/configure.m4 @@ -1,6 +1,8 @@ # -*- shell-script -*- # -# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # # $COPYRIGHT$ # @@ -13,10 +15,14 @@ # ------------------------------------------- AC_DEFUN([MCA_ompi_fcoll_CONFIG], [ - # An AC-ARG-ENABLE for mpi-io was set in ompi/mca/io/configure.m4. - # If it's no, we shouldn't bother building anything in fcoll. - AS_IF([test "$enable_mpi_io" != "no"], - [want_mpi_io=1], - [want_mpi_io=0]) - MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_mpi_io]) + OPAL_VAR_SCOPE_PUSH([want_io_ompio]) + + AS_IF([test "$enable_mpi_io" != "no" && + test "$enable_io_ompio" != "no"], + [want_io_ompio=1], + [want_io_ompio=0]) + + MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio]) + + OPAL_VAR_SCOPE_POP ]) diff --git a/ompi/mca/io/ompio/configure.m4 b/ompi/mca/io/ompio/configure.m4 new file mode 100644 index 0000000000..31eb6bf760 --- /dev/null +++ b/ompi/mca/io/ompio/configure.m4 @@ -0,0 +1,21 @@ +# -*- shell-script -*- +# +# Copyright (c) 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_io_ompio_CONFIG([action-if-can-compile], +# [action-if-cant-compile]) +# ------------------------------------------------ +AC_DEFUN([MCA_ompi_io_ompio_CONFIG],[ + AC_CONFIG_FILES([ompi/mca/io/ompio/Makefile]) + + AS_IF([test "$enable_io_ompio" != "no"], + [$1], + [$2]) +])dnl diff --git a/ompi/mca/sharedfp/configure.m4 b/ompi/mca/sharedfp/configure.m4 index 9c46f76e91..9859df4226 100644 --- a/ompi/mca/sharedfp/configure.m4 +++ b/ompi/mca/sharedfp/configure.m4 @@ -1,6 +1,8 @@ # -*- shell-script -*- # -# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # # $COPYRIGHT$ # @@ -13,10 +15,14 @@ # ------------------------------------------- AC_DEFUN([MCA_ompi_sharedfp_CONFIG], [ - # An AC-ARG-ENABLE for mpi-io was set in ompi/mca/io/configure.m4. - # If it's no, we shouldn't bother building anything in fcoll. - AS_IF([test "$enable_mpi_io" != "no"], - [want_mpi_io=1], - [want_mpi_io=0]) - MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_mpi_io]) + OPAL_VAR_SCOPE_PUSH([want_io_ompio]) + + AS_IF([test "$enable_mpi_io" != "no" && + test "$enable_io_ompio" != "no"], + [want_io_ompio=1], + [want_io_ompio=0]) + + MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio]) + + OPAL_VAR_SCOPE_POP ])