Skip to content

Commit b421a53

Browse files
bwbarrettbwbarrett
authored
Merge pull request #4070 from jsquyres/pr/v3.0.x/remove-proof-of-concept-use-mpi-f08-descriptor-module
v3.0.x: remove proof of concept use mpi f08 descriptor module
2 parents 32b4c90 + 5566b42 commit b421a53

37 files changed

+167
-1556
lines changed

‎config/ompi_config_files.m4‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
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
4+
# Copyright (c) 2017 Research Organization for Information Science
5+
# and Technology (RIST). All rights reserved.
46
# $COPYRIGHT$
57
#
68
# Additional copyrights may follow
@@ -32,7 +34,7 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
3234
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h
3335
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h
3436
ompi/mpi/fortran/use-mpi-f08/Makefile
35-
ompi/mpi/fortran/use-mpi-f08-desc/Makefile
37+
ompi/mpi/fortran/use-mpi-f08/mod/Makefile
3638
ompi/mpi/fortran/mpiext/Makefile
3739
ompi/mpi/tool/Makefile
3840
ompi/mpi/tool/profile/Makefile

‎config/ompi_configure_options.m4‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ 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
1717
dnl reserved.
1818
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
1919
dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
20-
dnl Copyright (c) 2015-2016 Research Organization for Information Science
20+
dnl Copyright (c) 2015-2017 Research Organization for Information Science
2121
dnl and Technology (RIST). All rights reserved.
2222
dnl
2323
dnl $COPYRIGHT$
@@ -231,30 +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([extra crispy (subarray prototype)])
249-
AC_MSG_WARN([Sorry, the subarray prototype is no longer available])
250-
AC_MSG_WARN([Contact your favorite OMPI developer and ask for it to be re-enabled])
251-
AC_MSG_ERROR([Cannot continue])],
252-
[AC_MSG_RESULT([regular (no subarray support)])])
253-
])
254-
AC_DEFINE_UNQUOTED([OMPI_BUILD_FORTRAN_F08_SUBARRAYS],
255-
[$OMPI_BUILD_FORTRAN_F08_SUBARRAYS],
256-
[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)])
257-
258234
AC_ARG_ENABLE([mpi-io],
259235
[AC_HELP_STRING([--disable-mpi-io],
260236
[Disable built-in support for MPI-2 I/O, likely because

‎config/ompi_ext.m4‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ 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.
8-
dnl Copyright (c) 2015 Research Organization for Information Science
8+
dnl Copyright (c) 2015-2017 Research Organization for Information Science
99
dnl and Technology (RIST). All rights reserved.
1010
dnl $COPYRIGHT$
1111
dnl
@@ -212,9 +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 && \
217-
test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0],
215+
# mpi_f08" module
216+
AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
218217
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1],
219218
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0])
220219
AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT,

‎config/ompi_setup_mpi_fortran.m4‎

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ 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.
1717
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
18-
dnl Copyright (c) 2014-2016 Research Organization for Information Science
18+
dnl Copyright (c) 2014-2017 Research Organization for Information Science
1919
dnl and Technology (RIST). All rights reserved.
2020
dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
2121
dnl $COPYRIGHT$
@@ -34,7 +34,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
3434
OMPI_FORTRAN_USEMPI_DIR=
3535
OMPI_FORTRAN_USEMPI_LIB=
3636

37-
OMPI_FORTRAN_USEMPIF08_DIR=
3837
OMPI_FORTRAN_USEMPIF08_LIB=
3938

4039
OMPI_FORTRAN_MAX_ARRAY_RANK=0
@@ -51,7 +50,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
5150
OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME=0
5251
OMPI_FORTRAN_HAVE_F08_ASSUMED_RANK=0
5352
OMPI_FORTRAN_HAVE_PRIVATE=0
54-
OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.FALSE.
5553

5654
# These macros control symbol names for Fortran/C interoperability
5755
#
@@ -532,33 +530,20 @@ end type test_mpi_handle],
532530
OMPI_FORTRAN_HAVE_F08_ASSUMED_RANK=1])
533531

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

542538
AC_MSG_CHECKING([which mpi_f08 implementation to build])
543-
AS_IF([test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 1],
544-
[ # Case a) partial/prototype implementation
545-
OMPI_FORTRAN_USEMPIF08_DIR=mpi/fortran/use-mpi-f08-desc
546-
OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.TRUE.
547-
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
548-
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])
549543
],
550-
[ # Both cases b) and c)
551-
OMPI_FORTRAN_USEMPIF08_DIR=mpi/fortran/use-mpi-f08
552-
OMPI_FORTRAN_SUBARRAYS_SUPPORTED=.FALSE.
553-
AS_IF([test $OMPI_FORTRAN_HAVE_OPTIONAL_ARGS -eq 1],
554-
[ # Case b) "good compiler"
555-
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=0
556-
AC_MSG_RESULT(["good" compiler, no array subsections])
557-
],
558-
[ # Case c) "bad compiler"
559-
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=1
560-
AC_MSG_RESULT(["bad" compiler, no array subsections])
561-
])
544+
[ # Case b) "bad compiler"
545+
OMPI_FORTRAN_NEED_WRAPPER_ROUTINES=1
546+
AC_MSG_RESULT(["bad" compiler, no array subsections])
562547
])
563548
])
564549

@@ -699,8 +684,6 @@ end type test_mpi_handle],
699684
# use mpi_f08 final setup
700685
# -------------------
701686

702-
# This goes into ompi/Makefile.am
703-
AC_SUBST(OMPI_FORTRAN_USEMPIF08_DIR)
704687
# This goes into mpifort-wrapper-data.txt
705688
AC_SUBST(OMPI_FORTRAN_USEMPIF08_LIB)
706689

@@ -714,12 +697,6 @@ end type test_mpi_handle],
714697
AC_SUBST(OMPI_F08_SUFFIX)
715698
AC_SUBST(OMPI_F_SUFFIX)
716699

717-
# This goes into ompi/mpi/fortran/configure-fortran-output.h
718-
AC_SUBST(OMPI_FORTRAN_SUBARRAYS_SUPPORTED)
719-
AC_DEFINE_UNQUOTED(OMPI_FORTRAN_SUBARRAYS_SUPPORTED,
720-
[$OMPI_FORTRAN_SUBARRAYS_SUPPORTED],
721-
[Value to load to the MPI_SUBARRAYS_SUPPORTED compile-time constant])
722-
723700
# This is used to generate weak symbols (or not) in
724701
# ompi/mpi/fortran/mpif-h/<foo>_f.c, and
725702
# ompi/mpi/fortran/configure-fortran-output.h.

‎ompi/Makefile.am‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
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
1616
# reserved.
17-
# Copyright (c) 2015 Intel, Inc. All rights reserved.
18-
# Copyright (c) 2015 Research Organization for Information Science
17+
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
18+
# Copyright (c) 2015-2017 Research Organization for Information Science
1919
# and Technology (RIST). All rights reserved.
2020
# Copyright (c) 2016 IBM Corporation. All rights reserved.
2121
# $COPYRIGHT$
@@ -90,8 +90,9 @@ SUBDIRS = \
9090
mpi/fortran/mpif-h \
9191
$(OMPI_MPIEXT_USEMPI_DIR) \
9292
$(OMPI_FORTRAN_USEMPI_DIR) \
93+
mpi/fortran/use-mpi-f08/mod \
9394
$(OMPI_MPIEXT_USEMPIF08_DIRS) \
94-
$(OMPI_FORTRAN_USEMPIF08_DIR) \
95+
mpi/fortran/use-mpi-f08 \
9596
mpi/fortran/mpiext \
9697
$(MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS) \
9798
$(OMPI_CONTRIB_SUBDIRS)
@@ -119,7 +120,7 @@ DIST_SUBDIRS = \
119120
mpi/fortran/use-mpi-tkr \
120121
mpi/fortran/use-mpi-ignore-tkr \
121122
mpi/fortran/use-mpi-f08 \
122-
mpi/fortran/use-mpi-f08-desc \
123+
mpi/fortran/use-mpi-f08/mod \
123124
mpi/fortran/mpiext \
124125
mpi/java \
125126
$(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/mpiext/Makefile.am‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#
2-
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
2+
# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
3+
# Copyright (c) 2017 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
35
# $COPYRIGHT$
46
#
57
# Additional copyrights may follow
@@ -18,6 +20,7 @@ if OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT
1820

1921
AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \
2022
$(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/base \
23+
$(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPIF08_MOD) \
2124
-I$(top_srcdir) $(FCFLAGS_f90)
2225

2326
flibs =
@@ -61,7 +64,7 @@ libforce_usempif08_module_to_be_built_la_SOURCES = mpi-f08-ext-module.F90
6164
# manually here. Bummer!
6265
#
6366

64-
mpi_f08_ext.lo: $(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mpi-f08-types.lo
67+
mpi_f08_ext.lo: $(top_builddir)/ompi/mpi/fortran/use-mpi-f08-modules/mpi-f08-types.lo
6568
mpi_f08_ext.lo: mpi-f08-ext-module.F90
6669
endif
6770

‎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)