Merge pull request #9445 from jsquyres/pr/i-dont-think-you-know-what-…

…a-fortran-array-really-is

Fortran mpi module: remove interface names

ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h.in

@@ -1,6 +1,6 @@
 ! -*- fortran -*-
 !
-! Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+! Copyright (c) 2006-2021 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 !                         reserved.
 ! Copyright (c) 2012      The University of Tennessee and The University
@@ -17,7 +17,7 @@
 !
 ! $HEADER$
 
-interface MPI_Address
+interface
 
 subroutine MPI_Address(location, address, ierror)
   @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ location
@@ -28,7 +28,7 @@ end subroutine MPI_Address
 
 end interface
 
-interface MPI_Attr_delete
+interface
 
 subroutine MPI_Attr_delete(comm, keyval, ierror)
   integer, intent(in) :: comm
@@ -38,7 +38,7 @@ end subroutine MPI_Attr_delete
 
 end interface
 
-interface MPI_Attr_get
+interface
 
 subroutine MPI_Attr_get(comm, keyval, attribute_val, flag, ierror)
   integer, intent(in) :: comm
@@ -50,7 +50,7 @@ end subroutine MPI_Attr_get
 
 end interface
 
-interface MPI_Attr_put
+interface
 
 subroutine MPI_Attr_put(comm, keyval, attribute_val, ierror)
   integer, intent(in) :: comm
@@ -61,7 +61,7 @@ end subroutine MPI_Attr_put
 
 end interface
 
-interface MPI_Errhandler_create
+interface
 
 subroutine MPI_Errhandler_create(function, errhandler, ierror)
   external :: function
@@ -71,7 +71,7 @@ end subroutine MPI_Errhandler_create
 
 end interface
 
-interface MPI_Errhandler_get
+interface
 
 subroutine MPI_Errhandler_get(comm, errhandler, ierror)
   integer, intent(in) :: comm
@@ -81,7 +81,7 @@ end subroutine MPI_Errhandler_get
 
 end interface
 
-interface MPI_Errhandler_set
+interface
 
 subroutine MPI_Errhandler_set(comm, errhandler, ierror)
   integer, intent(in) :: comm
@@ -91,7 +91,7 @@ end subroutine MPI_Errhandler_set
 
 end interface
 
-interface MPI_Keyval_create
+interface
 
 subroutine MPI_Keyval_create(copy_fn, delete_fn, keyval, extra_state, ierror)
   external :: copy_fn
@@ -103,7 +103,7 @@ end subroutine MPI_Keyval_create
 
 end interface
 
-interface MPI_Keyval_free
+interface
 
 subroutine MPI_Keyval_free(keyval, ierror)
   integer, intent(inout) :: keyval
@@ -112,7 +112,7 @@ end subroutine MPI_Keyval_free
 
 end interface
 
-interface MPI_Type_extent
+interface
 
 subroutine MPI_Type_extent(datatype, extent, ierror)
   integer, intent(in) :: datatype
@@ -122,7 +122,7 @@ end subroutine MPI_Type_extent
 
 end interface
 
-interface MPI_Type_hindexed
+interface
 
 subroutine MPI_Type_hindexed(count, array_of_blocklengths, array_of_displacements, oldtype, newtype&
         , ierror)
@@ -136,7 +136,7 @@ end subroutine MPI_Type_hindexed
 
 end interface
 
-interface MPI_Type_hvector
+interface
 
 subroutine MPI_Type_hvector(count, blocklength, stride, oldtype, newtype&
         , ierror)
@@ -150,7 +150,7 @@ end subroutine MPI_Type_hvector
 
 end interface
 
-interface MPI_Type_lb
+interface
 
 subroutine MPI_Type_lb(datatype, lb, ierror)
   integer, intent(in) :: datatype
@@ -160,7 +160,7 @@ end subroutine MPI_Type_lb
 
 end interface
 
-interface MPI_Type_struct
+interface
 
 subroutine MPI_Type_struct(count, array_of_blocklengths, array_of_displacements, array_of_types, newtype&
         , ierror)
@@ -174,7 +174,7 @@ end subroutine MPI_Type_struct
 
 end interface
 
-interface MPI_Type_ub
+interface
 
 subroutine MPI_Type_ub(datatype, ub, ierror)
   integer, intent(in) :: datatype

ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-status.h

@@ -2,14 +2,15 @@
 !
 ! Copyright (c) 2020      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
+! Copyright (c) 2021      Cisco Systems, Inc.  All rights reserved
 ! $COPYRIGHT$
 !
 ! Additional copyrights may follow
 !
 ! $HEADER$
 
 
-interface MPI_Status_f082f
+interface
 
 subroutine MPI_Status_f082f(f08_status, f_status, ierror)
   use mpi_types
@@ -22,7 +23,7 @@ end subroutine MPI_Status_f082f
 end interface
 
 
-interface MPI_Status_f2f08
+interface
 
 subroutine MPI_Status_f2f08(f_status, f08_status, ierror)
   use mpi_types
@@ -35,7 +36,7 @@ end subroutine MPI_Status_f2f08
 end interface
 
 
-interface PMPI_Status_f082f
+interface
 
 subroutine PMPI_Status_f082f(f08_status, f_status, ierror)
   use mpi_types
@@ -48,7 +49,7 @@ end subroutine PMPI_Status_f082f
 end interface
 
 
-interface PMPI_Status_f2f08
+interface
 
 subroutine PMPI_Status_f2f08(f_status, f08_status, ierror)
   use mpi_types

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

@@ -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-2019 Cisco Systems, Inc.  All rights reserved
+# Copyright (c) 2006-2021 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 #                         reserved.
 # Copyright (c) 2014-2021 Research Organization for Information Science
@@ -87,11 +87,6 @@ lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES = \
      mpi.F90 \
      mpi_aint_add_f90.f90 \
      mpi_aint_diff_f90.f90 \
-     mpi_comm_spawn_multiple_f90.f90 \
-     mpi_testall_f90.f90 \
-     mpi_testsome_f90.f90 \
-     mpi_waitall_f90.f90 \
-     mpi_waitsome_f90.f90 \
      mpi_wtick_f90.f90 \
      mpi_wtime_f90.f90
 

ompi/mpi/fortran/use-mpi-tkr/mpi-f90-cptr-interfaces.h

@@ -1,6 +1,6 @@
 ! -*- fortran -*-
 !
-! Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+! Copyright (c) 2014-2021 Cisco Systems, Inc.  All rights reserved
 ! $COPYRIGHT$
 !
 ! Additional copyrights may follow
@@ -17,6 +17,7 @@
 ! below.
 !
 
+! This interface requires a name because there are multiple subroutines.
 interface MPI_Win_allocate
 
 subroutine MPI_Win_allocate(size, disp_unit, info, comm, &
@@ -46,6 +47,7 @@ end subroutine MPI_Win_allocate_cptr
 end interface
 
 
+! This interface requires a name because there are multiple subroutines.
 interface MPI_Win_allocate_shared
 
 subroutine MPI_Win_allocate_shared(size, disp_unit, info, comm, &
@@ -75,6 +77,7 @@ end subroutine MPI_Win_allocate_shared_cptr
 end interface
 
 
+! This interface requires a name because there are multiple subroutines.
 interface MPI_Win_shared_query
 
 subroutine MPI_Win_shared_query(win, rank, size, disp_unit, baseptr,&