use-mpi-f08: Wtick/Wtime + sentinel updates

Two changes that are related to each other:

1. Since Wtick/Wtime are simple interfaces (not wrappers) to the
   back-end C MPI_Wtick/MPI_Wtime functions, just declare them as
   bind(C) in the mpi module and then have the mpi_f08 module use just
   those 2 symbols in the mpi_f08 module (ditto for the PMPI
   versions).

2. Similar for the special "sentinel" values (e.g., MPI_BOTTOM).  No
   longer generate them via gen-mpi-mangling.pl; just BIND(C) them in
   the mpi module and then "use" them in the mpi_f08 module.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>

Author: jsquyres

.gitignore

@@ -190,7 +190,6 @@ ompi/include/mpif-c-constants.h
 ompi/include/mpif-common.h
 ompi/include/mpi-ext.h
 ompi/include/mpif-ext.h
-ompi/include/mpif-f08-types.h
 ompi/include/mpif-handles.h
 ompi/include/mpif-io-constants.h
 ompi/include/mpif-constants.h

ompi/mpi/fortran/base/gen-mpi-mangling.pl

@@ -159,30 +159,7 @@ sub gen_c_constants {
     close (OUT);
 }
 
-sub gen_f08_types {
-    open(OUT, ">$file_f08_types") ||
-        die "Can't write to $file_f08_types";
-
-    print OUT "! WARNING: This is a generated file!  Edits will be lost! */
-!
-! Copyright (c) 2015      Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
-! \$COPYRIGHT\$
-!
-! This file was generated by gen-mpi-mangling.pl
-!\n\n";
-
-    foreach my $key (sort(keys(%{$fortran}))) {
-        my $f = $fortran->{$key};
-        print OUT "$f->{f_type}, bind(C, name=\"".mangle($f->{c_name})."\") :: $f->{f_name}\n";
-    }
-
-    close (OUT);
-}
-
 gen_c_constants_decl();
 gen_c_constants();
-gen_f08_types();
 
 exit(0);

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

@@ -29,6 +29,7 @@ if OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT
 AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \
              $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/base \
              $(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-f08/mod \
              $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08 \
              -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90)

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90

@@ -21,26 +21,8 @@
 
 module mpi_f08_interfaces
 
-#include "mpi-f08-interfaces.h"
-
-! MPI_Wtick is not a wrapper function
-!
-interface MPI_Wtick
-function  MPI_Wtick_f08( ) BIND(C,name="MPI_Wtick")
-   use, intrinsic :: ISO_C_BINDING
-   implicit none
-   DOUBLE PRECISION :: MPI_Wtick_f08
-end function  MPI_Wtick_f08
-end interface MPI_Wtick
+  use :: mpi, only : MPI_Wtick, MPI_Wtime
 
-! MPI_Wtime is not a wrapper function
-!
-interface MPI_Wtime
-function  MPI_Wtime_f08( ) BIND(C,name="MPI_Wtime")
-   use, intrinsic :: ISO_C_BINDING
-   implicit none
-   DOUBLE PRECISION :: MPI_Wtime_f08
-end function  MPI_Wtime_f08
-end interface MPI_Wtime
+#include "mpi-f08-interfaces.h"
 
 end module mpi_f08_interfaces

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90

@@ -28,6 +28,9 @@ module mpi_f08_types
    use, intrinsic :: ISO_C_BINDING
    use mpi_types
 
+   ! Use the same constants that are BIND(C)'ed in the mpi module
+   use :: mpi, only : MPI_ARGV_NULL, MPI_ARGVS_NULL, MPI_BOTTOM, MPI_ERRCODES_IGNORE, MPI_IN_PLACE, MPI_STATUS_IGNORE, MPI_STATUS_IGNORE, MPI_STATUSES_IGNORE, MPI_UNWEIGHTED, MPI_WEIGHTS_EMPTY
+
    include "mpif-config.h"
    include "mpif-constants.h"
    include "mpif-io-constants.h"
@@ -163,8 +166,4 @@ module mpi_f08_types
   type(MPI_Datatype), parameter   :: MPI_OFFSET                  = MPI_Datatype(OMPI_MPI_OFFSET)
   type(MPI_Datatype), parameter   :: MPI_COMPLEX4                = MPI_Datatype(OMPI_MPI_COMPLEX4)
 
-!... Special sentinel constants
-!------------------------------
-#include "mpif-f08-types.h"
-
 end module mpi_f08_types

ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90

@@ -25,26 +25,8 @@
 
 module pmpi_f08_interfaces
 
-#include "mpi-f08-interfaces.h"
-
-! MPI_Wtick is not a wrapper function
-!
-interface PMPI_Wtick
-function  PMPI_Wtick_f08( ) BIND(C,name="PMPI_Wtick")
-   use, intrinsic :: ISO_C_BINDING
-   implicit none
-   DOUBLE PRECISION :: PMPI_Wtick_f08
-end function  PMPI_Wtick_f08
-end interface PMPI_Wtick
+  use :: mpi, only : PMPI_Wtick, PMPI_Wtime
 
-! MPI_Wtime is not a wrapper function
-!
-interface PMPI_Wtime
-function  PMPI_Wtime_f08( ) BIND(C,name="PMPI_Wtime")
-   use, intrinsic :: ISO_C_BINDING
-   implicit none
-   DOUBLE PRECISION :: PMPI_Wtime_f08
-end function  PMPI_Wtime_f08
-end interface PMPI_Wtime
+#include "mpi-f08-interfaces.h"
 
 end module pmpi_f08_interfaces