Skip to content

Commit 5566b42

Browse files
jsquyresjsquyres
committed
ompi/fortran: remove proof-of-concept mpi_f08 module
This module was always intended to be a proof of concept, and was far from complete. If/when someone implemented F08 descriptor support for the mpi_f08 module, this commit can either be restored or used as reference material. Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit 791bcee)
1 parent e518a7c commit 5566b42

29 files changed

+45
-1577
lines changed

‎config/ompi_config_files.m4‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- shell-script -*-
22
#
3-
# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
3+
# Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
44
# Copyright (c) 2017 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
# $COPYRIGHT$
@@ -35,8 +35,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
3535
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h
3636
ompi/mpi/fortran/use-mpi-f08/Makefile
3737
ompi/mpi/fortran/use-mpi-f08/mod/Makefile
38-
ompi/mpi/fortran/use-mpi-f08-desc/Makefile
39-
ompi/mpi/fortran/use-mpi-f08-desc/mod/Makefile
4038
ompi/mpi/fortran/mpiext/Makefile
4139
ompi/mpi/tool/Makefile
4240
ompi/mpi/tool/profile/Makefile

‎config/ompi_configure_options.m4‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
13-
dnl Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
13+
dnl Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved
1414
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2009 IBM Corporation. All rights reserved.
1616
dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
@@ -231,26 +231,6 @@ AC_DEFINE_UNQUOTED(MPI_PARAM_CHECK, $mpi_param_check,
231231
AC_DEFINE_UNQUOTED(OMPI_PARAM_CHECK, $ompi_param_check,
232232
[Whether we want to check MPI parameters never or possible (an integer constant)])
233233

234-
#
235-
# Do we want the prototype "use mpi_f08" implementation that uses
236-
# Fortran descriptors?
237-
#
238-
239-
AC_MSG_CHECKING([which 'use mpi_f08' implementation to use])
240-
AC_ARG_ENABLE(mpi-f08-subarray-prototype,
241-
AC_HELP_STRING([--enable-mpi-f08-subarray-prototype],
242-
[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.]))
243-
OMPI_BUILD_FORTRAN_F08_SUBARRAYS=0
244-
AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -lt $OMPI_FORTRAN_USEMPIF08_BINDINGS],
245-
[AC_MSG_RESULT([none (use mpi_f08 disabled)])],
246-
[AS_IF([test "$enable_mpi_f08_subarray_prototype" = "yes"],
247-
[OMPI_BUILD_FORTRAN_F08_SUBARRAYS=1],
248-
[AC_MSG_RESULT([regular (no subarray support)])])
249-
])
250-
AC_DEFINE_UNQUOTED([OMPI_BUILD_FORTRAN_F08_SUBARRAYS],
251-
[$OMPI_BUILD_FORTRAN_F08_SUBARRAYS],
252-
[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)])
253-
254234
AC_ARG_ENABLE([mpi-io],
255235
[AC_HELP_STRING([--disable-mpi-io],
256236
[Disable built-in support for MPI-2 I/O, likely because

‎config/ompi_ext.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dnl
33
dnl Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
44
dnl University Research and Technology
55
dnl Corporation. All rights reserved.
6-
dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
6+
dnl Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
77
dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved.
88
dnl Copyright (c) 2015-2017 Research Organization for Information Science
99
dnl and Technology (RIST). All rights reserved.
@@ -212,8 +212,8 @@ module mpi_f08_ext
212212
EOF
213213

214214
# Only build this mpi_f08_ext module if we're building the "use
215-
# mpi_f08" module *and* it's the non-descriptor one.
216-
AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS]
215+
# mpi_f08" module
216+
AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
217217
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1],
218218
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0])
219219
AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT,

‎config/ompi_setup_mpi_fortran.m4‎

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
13-
dnl Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
13+
dnl Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved
1414
dnl Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
1616
dnl reserved.
@@ -34,8 +34,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
3434
OMPI_FORTRAN_USEMPI_DIR=
3535
OMPI_FORTRAN_USEMPI_LIB=
3636

37-
OMPI_FORTRAN_USEMPIF08_DIR=
38-
OMPI_FORTRAN_USEMPIF08_MOD=
3937
OMPI_FORTRAN_USEMPIF08_LIB=
4038

4139
OMPI_FORTRAN_MAX_ARRAY_RANK=0
@@ -52,7 +50,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
5250
OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME=0
5351
OMPI_FORTRAN_HAVE_F08_ASSUMED_RANK=0
5452
OMPI_FORTRAN_HAVE_PRIVATE=0
55-
OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.FALSE.
5653

5754
# These macros control symbol names for Fortran/C interoperability
5855
#
@@ -533,35 +530,20 @@ end type test_mpi_handle],
533530
OMPI_FORTRAN_HAVE_F08_ASSUMED_RANK=1])
534531

535532
# Which mpi_f08 implementation are we using?
536-
# a) partial, proof-of-concept that supports array
537-
# subsections (Intel compiler only)
538-
# b) compiler supports BIND(C) and optional arguments
533+
# a) compiler supports BIND(C) and optional arguments
539534
# ("good" compilers)
540-
# c) compiler that does not support the items listed
535+
# b) compiler that does not support the items listed
541536
# in b) ("bad" compilers)
542537

543538
AC_MSG_CHECKING([which mpi_f08 implementation to build])
544-
AS_IF([test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 1],
545-
[ # Case a) partial/prototype implementation
546-
OMPI_FORTRAN_USEMPIF08_DIR=mpi/fortran/use-mpi-f08-desc
547-
OMPI_FORTRAN_USEMPIF08_MOD=$OMPI_FORTRAN_USEMPIF08_DIR/mod
548-
OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.TRUE.
549-
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
550-
AC_MSG_RESULT([array subsections (partial/experimental)])
539+
AS_IF([test $OMPI_FORTRAN_HAVE_OPTIONAL_ARGS -eq 1],
540+
[ # Case a) "good compiler"
541+
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
542+
AC_MSG_RESULT(["good" compiler, no array subsections])
551543
],
552-
[ # Both cases b) and c)
553-
OMPI_FORTRAN_USEMPIF08_DIR=mpi/fortran/use-mpi-f08
554-
OMPI_FORTRAN_USEMPIF08_MOD=$OMPI_FORTRAN_USEMPIF08_DIR/mod
555-
OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.FALSE.
556-
AS_IF([test $OMPI_FORTRAN_HAVE_OPTIONAL_ARGS -eq 1],
557-
[ # Case b) "good compiler"
558-
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
559-
AC_MSG_RESULT(["good" compiler, no array subsections])
560-
],
561-
[ # Case c) "bad compiler"
562-
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=1
563-
AC_MSG_RESULT(["bad" compiler, no array subsections])
564-
])
544+
[ # Case b) "bad compiler"
545+
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=1
546+
AC_MSG_RESULT(["bad" compiler, no array subsections])
565547
])
566548
])
567549

@@ -702,9 +684,6 @@ end type test_mpi_handle],
702684
# use mpi_f08 final setup
703685
# -------------------
704686

705-
# This goes into ompi/Makefile.am
706-
AC_SUBST(OMPI_FORTRAN_USEMPIF08_DIR)
707-
AC_SUBST(OMPI_FORTRAN_USEMPIF08_MOD)
708687
# This goes into mpifort-wrapper-data.txt
709688
AC_SUBST(OMPI_FORTRAN_USEMPIF08_LIB)
710689

@@ -718,12 +697,6 @@ end type test_mpi_handle],
718697
AC_SUBST(OMPI_F08_SUFFIX)
719698
AC_SUBST(OMPI_F_SUFFIX)
720699

721-
# This goes into ompi/mpi/fortran/configure-fortran-output.h
722-
AC_SUBST(OMPI_FORTRAN_SUBARRAYS_SUPPORTED)
723-
AC_DEFINE_UNQUOTED(OMPI_FORTRAN_SUBARRAYS_SUPPORTED,
724-
[$OMPI_FORTRAN_SUBARRAYS_SUPPORTED],
725-
[Value to load to the MPI_SUBARRAYS_SUPPORTED compile-time constant])
726-
727700
# This is used to generate weak symbols (or not) in
728701
# ompi/mpi/fortran/mpif-h/<foo>_f.c, and
729702
# ompi/mpi/fortran/configure-fortran-output.h.

‎ompi/Makefile.am‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2008-2017 Cisco Systems, Inc. All rights reserved
1313
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
1414
# Copyright (c) 2010-2011 Sandia National Laboratories. All rights reserved.
1515
# Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
@@ -90,9 +90,9 @@ SUBDIRS = \
9090
mpi/fortran/mpif-h \
9191
$(OMPI_MPIEXT_USEMPI_DIR) \
9292
$(OMPI_FORTRAN_USEMPI_DIR) \
93-
$(OMPI_FORTRAN_USEMPIF08_MOD) \
93+
mpi/fortran/use-mpi-f08/mod \
9494
$(OMPI_MPIEXT_USEMPIF08_DIRS) \
95-
$(OMPI_FORTRAN_USEMPIF08_DIR) \
95+
mpi/fortran/use-mpi-f08 \
9696
mpi/fortran/mpiext \
9797
$(MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS) \
9898
$(OMPI_CONTRIB_SUBDIRS)
@@ -121,8 +121,6 @@ DIST_SUBDIRS = \
121121
mpi/fortran/use-mpi-ignore-tkr \
122122
mpi/fortran/use-mpi-f08 \
123123
mpi/fortran/use-mpi-f08/mod \
124-
mpi/fortran/use-mpi-f08-desc \
125-
mpi/fortran/use-mpi-f08-desc/mod \
126124
mpi/fortran/mpiext \
127125
mpi/java \
128126
$(OMPI_MPIEXT_ALL_SUBDIRS) \

‎ompi/include/mpif-config.h.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
! University of Stuttgart. All rights reserved.
1111
! Copyright (c) 2004-2005 The Regents of the University of California.
1212
! All rights reserved.
13-
! Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13+
! Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved
1414
! Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1515
! reserved.
1616
! $COPYRIGHT$
@@ -74,7 +74,8 @@
7474
!
7575
logical MPI_SUBARRAYS_SUPPORTED
7676
logical MPI_ASYNC_PROTECTS_NONBLOCKING
77-
parameter (MPI_SUBARRAYS_SUPPORTED=@OMPI_FORTRAN_SUBARRAYS_SUPPORTED@)
77+
! Hard-coded for .false. for now
78+
parameter (MPI_SUBARRAYS_SUPPORTED= .false.)
7879
! Hard-coded for .false. for now
7980
parameter (MPI_ASYNC_PROTECTS_NONBLOCKING = .false.)
8081

‎ompi/mpi/fortran/use-mpi-f08-desc/ISO_Fortran_binding.h‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)