From 344f000841b53e0aca4dce841bf9dc654cd0c761 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 9 Aug 2017 13:14:43 +0900 Subject: [PATCH] configury: enable Fortran 2008 subarray prototype so Open MPI can be configure'd with --enable-mpi-f08-subarray-prototype Signed-off-by: Gilles Gouaillardet --- config/ompi_configure_options.m4 | 8 ++------ config/ompi_ext.m4 | 5 ++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4 index 3301df03c1b..39caab9b0fe 100644 --- a/config/ompi_configure_options.m4 +++ b/config/ompi_configure_options.m4 @@ -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-2016 Research Organization for Information Science +dnl Copyright (c) 2015-2017 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl dnl $COPYRIGHT$ @@ -244,11 +244,7 @@ OMPI_BUILD_FORTRAN_F08_SUBARRAYS=0 AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -lt $OMPI_FORTRAN_USEMPIF08_BINDINGS], [AC_MSG_RESULT([none (use mpi_f08 disabled)])], [AS_IF([test "$enable_mpi_f08_subarray_prototype" = "yes"], - [OMPI_BUILD_FORTRAN_F08_SUBARRAYS=1 - AC_MSG_RESULT([extra crispy (subarray prototype)]) - AC_MSG_WARN([Sorry, the subarray prototype is no longer available]) - AC_MSG_WARN([Contact your favorite OMPI developer and ask for it to be re-enabled]) - AC_MSG_ERROR([Cannot continue])], + [OMPI_BUILD_FORTRAN_F08_SUBARRAYS=1], [AC_MSG_RESULT([regular (no subarray support)])]) ]) AC_DEFINE_UNQUOTED([OMPI_BUILD_FORTRAN_F08_SUBARRAYS], diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index ae0e91b2d34..41ddb2aa513 100644 --- a/config/ompi_ext.m4 +++ b/config/ompi_ext.m4 @@ -5,7 +5,7 @@ dnl University Research and Technology dnl Corporation. All rights reserved. dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved. -dnl Copyright (c) 2015 Research Organization for Information Science +dnl Copyright (c) 2015-2017 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl Copyright (c) 2017 The University of Tennessee and The University dnl of Tennessee Research Foundation. All rights @@ -216,8 +216,7 @@ EOF # Only build this mpi_f08_ext module if we're building the "use # mpi_f08" module *and* it's the non-descriptor one. - AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ - test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0], + AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS] [OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1], [OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0]) AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT,