Merge pull request #4068 from jsquyres/pr/remove-f08-desc

ompi/fortran: remove proof-of-concept mpi_f08 module

Author: jsquyres

config/ompi_config_files.m4

@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2017      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
@@ -35,8 +35,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h
         ompi/mpi/fortran/use-mpi-f08/Makefile
         ompi/mpi/fortran/use-mpi-f08/mod/Makefile
-        ompi/mpi/fortran/use-mpi-f08-desc/Makefile
-        ompi/mpi/fortran/use-mpi-f08-desc/mod/Makefile
         ompi/mpi/fortran/mpiext/Makefile
         ompi/mpi/tool/Makefile
         ompi/mpi/tool/profile/Makefile

config/ompi_configure_options.m4

@@ -10,7 +10,7 @@ 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-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2006-2017 Cisco Systems, Inc.  All rights reserved
 dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2009      IBM Corporation.  All rights reserved.
 dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
@@ -231,26 +231,6 @@ AC_DEFINE_UNQUOTED(MPI_PARAM_CHECK, $mpi_param_check,
 AC_DEFINE_UNQUOTED(OMPI_PARAM_CHECK, $ompi_param_check,
     [Whether we want to check MPI parameters never or possible (an integer constant)])
 
-#
-# Do we want the prototype "use mpi_f08" implementation that uses
-# Fortran descriptors?
-#
-
-AC_MSG_CHECKING([which 'use mpi_f08' implementation to use])
-AC_ARG_ENABLE(mpi-f08-subarray-prototype,
-    AC_HELP_STRING([--enable-mpi-f08-subarray-prototype],
-                   [Use the PROTOTYPE and SEVERLY FUNCTIONALITY-LIMITED Fortran 08 'use mpi_f08' implementation that supports subarrrays (via Fortran descriptors).  This option will disable the normal 'use mpi_f08' implementation and *only* build the prototype implementation.]))
-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([regular (no subarray support)])])
-      ])
-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

config/ompi_ext.m4

@@ -3,7 +3,7 @@ dnl
 dnl Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
 dnl                         University Research and Technology
 dnl                         Corporation.  All rights reserved.
-dnl Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
 dnl Copyright (c) 2011-2012 Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2015-2017 Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
@@ -215,8 +215,8 @@ module mpi_f08_ext
 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]
+    # mpi_f08" module
+    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,

config/ompi_setup_mpi_fortran.m4

@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2007 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-2015 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2006-2017 Cisco Systems, Inc.  All rights reserved
 dnl Copyright (c) 2006-2008 Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
@@ -34,8 +34,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
     OMPI_FORTRAN_USEMPI_DIR=
     OMPI_FORTRAN_USEMPI_LIB=
 
-    OMPI_FORTRAN_USEMPIF08_DIR=
-    OMPI_FORTRAN_USEMPIF08_MOD=
     OMPI_FORTRAN_USEMPIF08_LIB=
 
     OMPI_FORTRAN_MAX_ARRAY_RANK=0
@@ -52,7 +50,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
     OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME=0
     OMPI_FORTRAN_HAVE_F08_ASSUMED_RANK=0
     OMPI_FORTRAN_HAVE_PRIVATE=0
-    OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.FALSE.
 
     # These macros control symbol names for Fortran/C interoperability
     #
@@ -533,35 +530,20 @@ end type test_mpi_handle],
                 OMPI_FORTRAN_HAVE_F08_ASSUMED_RANK=1])
 
                # Which mpi_f08 implementation are we using?
-               # a) partial, proof-of-concept that supports array
-               #    subsections (Intel compiler only)
-               # b) compiler supports BIND(C) and optional arguments
+               # a) compiler supports BIND(C) and optional arguments
                #    ("good" compilers)
-               # c) compiler that does not support the items listed
+               # b) compiler that does not support the items listed
                #    in b) ("bad" compilers)
 
                AC_MSG_CHECKING([which mpi_f08 implementation to build])
-               AS_IF([test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 1],
-                     [ # Case a) partial/prototype implementation
-                      OMPI_FORTRAN_USEMPIF08_DIR=mpi/fortran/use-mpi-f08-desc
-                      OMPI_FORTRAN_USEMPIF08_MOD=$OMPI_FORTRAN_USEMPIF08_DIR/mod
-                      OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.TRUE.
-                      OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
-                      AC_MSG_RESULT([array subsections (partial/experimental)])
+               AS_IF([test $OMPI_FORTRAN_HAVE_OPTIONAL_ARGS -eq 1],
+                     [ # Case a) "good compiler"
+                         OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
+                         AC_MSG_RESULT(["good" compiler, no array subsections])
                      ],
-                     [ # Both cases b) and c)
-                      OMPI_FORTRAN_USEMPIF08_DIR=mpi/fortran/use-mpi-f08
-                      OMPI_FORTRAN_USEMPIF08_MOD=$OMPI_FORTRAN_USEMPIF08_DIR/mod
-                      OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.FALSE.
-                      AS_IF([test $OMPI_FORTRAN_HAVE_OPTIONAL_ARGS -eq 1],
-                            [ # Case b) "good compiler"
-                             OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
-                             AC_MSG_RESULT(["good" compiler, no array subsections])
-                            ],
-                            [ # Case c) "bad compiler"
-                             OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=1
-                             AC_MSG_RESULT(["bad" compiler, no array subsections])
-                            ])
+                     [ # Case b) "bad compiler"
+                         OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=1
+                         AC_MSG_RESULT(["bad" compiler, no array subsections])
                      ])
           ])
 
@@ -702,9 +684,6 @@ end type test_mpi_handle],
     # use mpi_f08 final setup
     # -------------------
 
-    # This goes into ompi/Makefile.am
-    AC_SUBST(OMPI_FORTRAN_USEMPIF08_DIR)
-    AC_SUBST(OMPI_FORTRAN_USEMPIF08_MOD)
     # This goes into mpifort-wrapper-data.txt
     AC_SUBST(OMPI_FORTRAN_USEMPIF08_LIB)
 
@@ -718,12 +697,6 @@ end type test_mpi_handle],
     AC_SUBST(OMPI_F08_SUFFIX)
     AC_SUBST(OMPI_F_SUFFIX)
 
-    # This goes into ompi/mpi/fortran/configure-fortran-output.h
-    AC_SUBST(OMPI_FORTRAN_SUBARRAYS_SUPPORTED)
-    AC_DEFINE_UNQUOTED(OMPI_FORTRAN_SUBARRAYS_SUPPORTED,
-                       [$OMPI_FORTRAN_SUBARRAYS_SUPPORTED],
-                       [Value to load to the MPI_SUBARRAYS_SUPPORTED compile-time constant])
-
     # This is used to generate weak symbols (or not) in
     # ompi/mpi/fortran/mpif-h/<foo>_f.c, and
     # ompi/mpi/fortran/configure-fortran-output.h.

ompi/Makefile.am

@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2017 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 2010-2011 Sandia National Laboratories. All rights reserved.
 # Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
@@ -90,9 +90,9 @@ SUBDIRS = \
         mpi/fortran/mpif-h \
         $(OMPI_MPIEXT_USEMPI_DIR) \
         $(OMPI_FORTRAN_USEMPI_DIR) \
-        $(OMPI_FORTRAN_USEMPIF08_MOD) \
+        mpi/fortran/use-mpi-f08/mod \
         $(OMPI_MPIEXT_USEMPIF08_DIRS) \
-        $(OMPI_FORTRAN_USEMPIF08_DIR) \
+        mpi/fortran/use-mpi-f08 \
         mpi/fortran/mpiext \
         $(MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS) \
         $(OMPI_CONTRIB_SUBDIRS)
@@ -121,8 +121,6 @@ DIST_SUBDIRS = \
         mpi/fortran/use-mpi-ignore-tkr \
         mpi/fortran/use-mpi-f08 \
         mpi/fortran/use-mpi-f08/mod \
-        mpi/fortran/use-mpi-f08-desc \
-        mpi/fortran/use-mpi-f08-desc/mod \
         mpi/fortran/mpiext \
         mpi/java \
         $(OMPI_MPIEXT_ALL_SUBDIRS) \

ompi/include/mpif-config.h.in

@@ -10,7 +10,7 @@
 !                         University of Stuttgart.  All rights reserved.
 ! Copyright (c) 2004-2005 The Regents of the University of California.
 !                         All rights reserved.
-! Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+! Copyright (c) 2006-2017 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2013      Los Alamos National Security, LLC. All rights
 !                         reserved.
 ! $COPYRIGHT$
@@ -74,7 +74,8 @@
 !
       logical MPI_SUBARRAYS_SUPPORTED
       logical MPI_ASYNC_PROTECTS_NONBLOCKING
-      parameter (MPI_SUBARRAYS_SUPPORTED=@OMPI_FORTRAN_SUBARRAYS_SUPPORTED@)
+      ! Hard-coded for .false. for now
+      parameter (MPI_SUBARRAYS_SUPPORTED= .false.)
       ! Hard-coded for .false. for now
       parameter (MPI_ASYNC_PROTECTS_NONBLOCKING = .false.)