Skip to content

configury: fix --disable-mpi-io for static builds #2018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2016
Merged

configury: fix --disable-mpi-io for static builds #2018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion config/ompi_configure_options.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl Copyright (c) 2015-2016 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl
dnl $COPYRIGHT$
Expand Down Expand Up @@ -255,5 +255,13 @@ AC_DEFINE_UNQUOTED([OMPI_BUILD_FORTRAN_F08_SUBARRAYS],
[$OMPI_BUILD_FORTRAN_F08_SUBARRAYS],
[Whether we built the 'use mpi_f08' prototype subarray-based implementation or not (i.e., whether to build the use-mpi-f08-desc prototype or the regular use-mpi-f08 implementation)])

AC_ARG_ENABLE([mpi-io],
[AC_HELP_STRING([--disable-mpi-io],
[Disable built-in support for MPI-2 I/O, likely because
an externally-provided MPI I/O package will be used.
Default is to use the internal framework system that uses
the ompio component and a specially modified version of ROMIO
that fits inside the romio314 component])])

])dnl

21 changes: 21 additions & 0 deletions ompi/mca/common/ompio/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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_common_ompio_CONFIG([action-if-can-compile],
# [action-if-cant-compile])
# ------------------------------------------------
AC_DEFUN([MCA_ompi_common_ompio_CONFIG],[
AC_CONFIG_FILES([ompi/mca/common/ompio/Makefile])

AS_IF([test "$enable_mpi_io" != "no"],
[$1],
[$2])
])dnl
28 changes: 13 additions & 15 deletions ompi/mca/io/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# -*- shell-script -*-
#
# Copyright (c) 2006-2007 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
# All rights reserved.
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -14,20 +16,15 @@
# -------------------------------------------
AC_DEFUN([MCA_ompi_io_CONFIG],
[
AC_ARG_ENABLE([mpi-io],
[AC_HELP_STRING([--disable-mpi-io],
[Disable built-in support for MPI-2 I/O, likely because
an externally-provided MPI I/O package will be used.
Default is to use the internal component system and
its specially modified version of ROMIO])])
OPAL_VAR_SCOPE_PUSH([define_mpi_io])

OMPI_MPIF_IO_CONSTANTS_INCLUDE=
OMPI_MPIF_IO_HANDLES_INCLUDE=
AS_IF([test "$enable_mpi_io" != "no"],
Copy link
Member

@jsquyres jsquyres Sep 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this line now be checking $define_mpi_io instead of $enable_mpi_io?

Copy link
Contributor Author

@ggouaillardet ggouaillardet Sep 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is equivalent, but let's change it to be more consistent

Copy link
Contributor Author

@ggouaillardet ggouaillardet Sep 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on second thought, i'd rather use $enable_mpi_io everywhere, and locally define $define_mpi_io only where needed in ompi/mca/io/configure.m4

[define_mpi_io=1
OMPI_MPIF_IO_CONSTANTS_INCLUDE="include \"mpif-io-constants.h\""
OMPI_MPIF_IO_HANDLES_INCLUDE="include \"mpif-io-handles.h\""],
[define_mpi_io=0])
[OMPI_MPIF_IO_CONSTANTS_INCLUDE="include \"mpif-io-constants.h\""
OMPI_MPIF_IO_HANDLES_INCLUDE="include \"mpif-io-handles.h\""
define_mpi_io=1],
[OMPI_MPIF_IO_CONSTANTS_INCLUDE=
OMPI_MPIF_IO_HANDLES_INCLUDE=
define_mpi_io=0])
AC_SUBST(OMPI_MPIF_IO_CONSTANTS_INCLUDE)
AC_SUBST(OMPI_MPIF_IO_HANDLES_INCLUDE)

Expand All @@ -37,6 +34,7 @@ AC_DEFUN([MCA_ompi_io_CONFIG],
AC_SUBST(OMPI_PROVIDE_MPI_FILE_INTERFACE)
AC_DEFINE_UNQUOTED([OMPI_PROVIDE_MPI_FILE_INTERFACE], [$define_mpi_io],
[Whether OMPI should provide MPI File interface])
AM_CONDITIONAL([OMPI_PROVIDE_MPI_FILE_INTERFACE], [test "$define_mpi_io" = "1"])
AM_CONDITIONAL([OMPI_PROVIDE_MPI_FILE_INTERFACE], [test "$enable_mpi_io" != "no"])

OPAL_VAR_SCOPE_POP
])