Merge pull request #13040 from hppritcha/remove_support_for_tkr_use_mpi

fortran: remove use-mpi-tkr

Author: hppritcha

config/ompi_config_files.m4

@@ -32,9 +32,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/mpi/fortran/mpif-h/profile/Makefile
         ompi/mpi/fortran/use-mpi/Makefile
         ompi/mpi/fortran/use-mpi/mpi-types.F90
-        ompi/mpi/fortran/use-mpi-tkr/Makefile
-        ompi/mpi/fortran/use-mpi-tkr/fortran_sizes.h
-        ompi/mpi/fortran/use-mpi-tkr/fortran_kinds.sh
         ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile
         ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h
         ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h

config/ompi_setup_mpi_fortran.m4

@@ -138,11 +138,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
     AC_DEFINE([ompi_fortran_bogus_type_t], [int],
               [A bogus type that allows us to have sentinel type values that are still valid])
 
-    # These get filled in as we check for each type
-    OMPI_FORTRAN_IKINDS=
-    OMPI_FORTRAN_RKINDS=
-    OMPI_FORTRAN_CKINDS=
-
     # We want to set the #define's for all of these, so invoke the macros
     # regardless of whether we have F77 support or not.
     OMPI_FORTRAN_CHECK([CHARACTER], [yes],
@@ -284,14 +279,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
                        [$OMPI_FORTRAN_STATUS_SIZE],
                        [The number or Fortran INTEGER in MPI Status])
 
-    # Setup for the compilers that don't support ignore TKR functionality
-    OPAL_UNIQ(OMPI_FORTRAN_IKINDS)
-    AC_SUBST(OMPI_FORTRAN_IKINDS)
-    OPAL_UNIQ(OMPI_FORTRAN_RKINDS)
-    AC_SUBST(OMPI_FORTRAN_RKINDS)
-    OPAL_UNIQ(OMPI_FORTRAN_CKINDS)
-    AC_SUBST(OMPI_FORTRAN_CKINDS)
-
     # We can't use C_INTxx_T KIND values in mpif.h because many
     # existing MPI Fortran applications are of the form:
     #
@@ -405,16 +392,15 @@ end program]])],
           ])
 
     # If we got here, we can build the mpi module if it was requested.
-    # Decide whether to build the ignore TKR version or the
-    # non-ignore-TKR/legacy version.
+    # We only support compilers which have an ignore TKR feature.
     AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPI_BINDINGS && \
            test $ompi_fortran_happy -eq 1],
           [OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS
            AS_IF([test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1],
                  [OMPI_FORTRAN_USEMPI_DIR=mpi/fortran/use-mpi-ignore-tkr
                   OMPI_FORTRAN_USEMPI_LIB=-l${with_libmpi_name}_usempi_ignore_tkr],
-                 [OMPI_FORTRAN_USEMPI_DIR=mpi/fortran/use-mpi-tkr
-                  OMPI_FORTRAN_USEMPI_LIB=-l${with_libmpi_name}_usempi])
+                 [AC_MSG_WARN([** Fortran compiler does not support ignoring TKR.  Please use a newer fortran compiler.])
+                  AC_MSG_ERROR([*** Cannot continue])])
           ])
 
     OMPI_FORTRAN_HAVE_ISO_C_BINDING=0

ompi/Makefile.am

@@ -83,7 +83,7 @@ SUBDIRS = \
         mpi/fortran/mpif-h \
         mpi/fortran/use-mpi \
         $(OMPI_MPIEXT_USEMPI_DIR) \
-        $(OMPI_FORTRAN_USEMPI_DIR) \
+        mpi/fortran/use-mpi-ignore-tkr \
         mpi/fortran/mpiext-use-mpi \
         mpi/fortran/use-mpi-f08/base \
         mpi/fortran/use-mpi-f08/mod \
@@ -113,7 +113,6 @@ DIST_SUBDIRS = \
         mpi/fortran/base \
         mpi/fortran/mpif-h \
         mpi/fortran/use-mpi \
-        mpi/fortran/use-mpi-tkr \
         mpi/fortran/use-mpi-ignore-tkr \
         mpi/fortran/mpiext-use-mpi \
         mpi/fortran/use-mpi-f08 \

ompi/mpi/fortran/use-mpi-f08/Makefile.am

@@ -42,7 +42,7 @@ AM_FCFLAGS = -I$(top_srcdir)/ompi/mpi/fortran/use-mpi-f08/mod \
              -I$(top_builddir)/ompi/include \
              -I$(top_srcdir)/ompi/include \
              $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \
-             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
+             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-ignore-tkr \
              $(OMPI_FC_MODULE_FLAG)mod \
              $(OMPI_FC_MODULE_FLAG)bindings \
              -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90) \

ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.am

@@ -34,7 +34,7 @@ if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS
 AM_FCFLAGS = -I$(top_builddir)/ompi/include \
              -I$(top_srcdir)/ompi/include \
              $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \
-             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
+             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-ignore-tkr \
              $(OMPI_FC_MODULE_FLAG). \
              $(OMPI_FC_MODULE_FLAG)../mod \
              -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90)

ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am

@@ -34,7 +34,7 @@ if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS
 AM_FCFLAGS = -I$(top_builddir)/ompi/include \
              -I$(top_srcdir)/ompi/include \
              $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \
-             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
+             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-ignore-tkr \
              $(OMPI_FC_MODULE_FLAG). \
              -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90)
 

ompi/mpi/fortran/use-mpi-f08/profile/Makefile.am

@@ -46,7 +46,7 @@ AM_FCFLAGS = -I$(top_srcdir)/ompi/mpi/fortran/use-mpi-f08/mod \
              -I$(top_builddir)/ompi/include \
              -I$(top_srcdir)/ompi/include \
              $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \
-             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
+             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-ignore-tkr \
              $(OMPI_FC_MODULE_FLAG)../mod \
              $(OMPI_FC_MODULE_FLAG)../bindings \
              -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90) \