Merge pull request #5741 from ggouaillardet/topic/v4.0.x/use_mpi_f08_bindings

v4.0.x: fortran/use-mpi-f08: clean [p]ompi_FOO_f bindings
2018-09-20 18:10:11 -05:00 · 2018-09-20 18:10:11 -05:00 · 1a65b0ab66
--- a/config/ompi_config_files.m4
+++ b/config/ompi_config_files.m4
@ -1,7 +1,7 @@
 # -*- shell-script -*-
 #
 # Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2017      Research Organization for Information Science
+# Copyright (c) 2017-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2018      Los Alamos National Security, LLC. All rights
 #                         reserved.
@ -38,6 +38,7 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
        ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h
        ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h
        ompi/mpi/fortran/use-mpi-f08/Makefile
        ompi/mpi/fortran/use-mpi-f08/bindings/Makefile
        ompi/mpi/fortran/use-mpi-f08/mod/Makefile
        ompi/mpi/fortran/mpiext-use-mpi/Makefile
        ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@ -15,7 +15,7 @@
 # Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
-# Copyright (c) 2015-2017 Research Organization for Information Science
+# Copyright (c) 2015-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
@ -93,6 +93,7 @@ SUBDIRS = \
        $(OMPI_FORTRAN_USEMPI_DIR) \
        mpi/fortran/mpiext-use-mpi \
        mpi/fortran/use-mpi-f08/mod \
        mpi/fortran/use-mpi-f08/bindings \
        $(OMPI_MPIEXT_USEMPIF08_DIRS) \
        mpi/fortran/use-mpi-f08 \
        mpi/fortran/mpiext-use-mpi-f08 \
@ -124,6 +125,7 @@ DIST_SUBDIRS = \
        mpi/fortran/mpiext-use-mpi \
        mpi/fortran/use-mpi-f08 \
        mpi/fortran/use-mpi-f08/mod \
        mpi/fortran/use-mpi-f08/bindings \
        mpi/fortran/mpiext-use-mpi-f08 \
        mpi/java \
        $(OMPI_MPIEXT_ALL_SUBDIRS) \
--- a/ompi/mpi/fortran/use-mpi-f08/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-f08/Makefile.am
@ -7,7 +7,7 @@
 # Copyright (c) 2012-2013 Inria.  All rights reserved.
 # Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights
 #                         reserved.
-# Copyright (c) 2015-2017 Research Organization for Information Science
+# Copyright (c) 2015-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
@ -29,6 +29,7 @@ AM_FCFLAGS = -I$(top_builddir)/ompi/include \
             -I$(top_srcdir)/ompi/include \
             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
             $(OMPI_FC_MODULE_FLAG)mod \
             $(OMPI_FC_MODULE_FLAG)bindings \
             -I$(top_srcdir) $(FCFLAGS_f90)
 MOSTLYCLEANFILES = *.mod
@ -42,7 +43,6 @@ module_sentinel_file = \
 mpi-f08.lo: $(module_sentinel_file)
 mpi-f08.lo: mpi-f08.F90
 mpi-f08.lo: mpi-f-interfaces-bind.h pmpi-f-interfaces-bind.h
 mpi-f08.lo: sizeof_f08.h
 #
@ -792,8 +792,6 @@ pmpi_api_files = \
 lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES = \
        $(mpi_api_files) \
        $(pmpi_api_files) \
        mpi-f-interfaces-bind.h \
        pmpi-f-interfaces-bind.h \
        mpi-f08.F90 \
        buffer_detach.c \
        constants.h \
@ -830,11 +828,10 @@ lib@OMPI_LIBMPI_NAME@_usempif08_la_LDFLAGS = -version-info $(libmpi_usempif08_so
 mpi_api_lo_files = $(mpi_api_files:.F90=.lo)
 pmpi_api_lo_files = $(pmpi_api_files:.F90=.lo)
-$(mpi_api_lo_files): mpi-f08.lo
+$(mpi_api_lo_files): mpi-f08.lo bindings/libforce_usempif08_internal_bindings_to_be_built.la
-$(pmpi_api_lo_files): mpi-f08.lo
+$(pmpi_api_lo_files): mpi-f08.lo bindings/libforce_usempif08_internal_bindings_to_be_built.la
 mpi-f08.lo: $(module_sentinel_file) $(SIZEOF_H)
 mpi-f08.lo: mpi-f-interfaces-bind.h pmpi-f-interfaces-bind.h
 ###########################################################################
@ -852,13 +849,5 @@ uninstall-local:
 	  echo rm -f $(DESTDIR)$(libdir)/$$file; \
 	  rm -f $(DESTDIR)$(libdir)/$$file; \
 	done
 else
 # Need to have empty targets because AM can't handle having an
 # AM_CONDITIONAL was targets in the "if" statement but not in the
 # "else".  :-(
 install-exec-hook:
 uninstall-local:
 endif
--- a/ompi/mpi/fortran/use-mpi-f08/abort_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/abort_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Abort_f08(comm,errorcode,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_abort_f
+   use :: ompi_mpifh_bindings, only : ompi_abort_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: errorcode
--- a/ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -11,7 +13,7 @@ subroutine MPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,&
                              target_rank,target_disp,target_count,    &
                              target_datatype,op,win,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_accumulate_f
+   use :: ompi_mpifh_bindings, only : ompi_accumulate_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
   INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
--- a/ompi/mpi/fortran/use-mpi-f08/add_error_class_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/add_error_class_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Add_error_class_f08(errorclass,ierror)
-   use :: mpi_f08, only : ompi_add_error_class_f
+   use :: ompi_mpifh_bindings, only : ompi_add_error_class_f
   implicit none
   INTEGER, INTENT(OUT) :: errorclass
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/add_error_code_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/add_error_code_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Add_error_code_f08(errorclass,errorcode,ierror)
-   use :: mpi_f08, only : ompi_add_error_code_f
+   use :: ompi_mpifh_bindings, only : ompi_add_error_code_f
   implicit none
   INTEGER, INTENT(IN) :: errorclass
   INTEGER, INTENT(OUT) :: errorcode
--- a/ompi/mpi/fortran/use-mpi-f08/add_error_string_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/add_error_string_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Add_error_string_f08(errorcode,string,ierror)
-   use :: mpi_f08, only : ompi_add_error_string_f
+   use :: ompi_mpifh_bindings, only : ompi_add_error_string_f
   implicit none
   integer, intent(in) :: errorcode
   character(len=*), intent(in) :: string
--- a/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 function MPI_Aint_add_f08(addr1, addr2)
   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_aint_add_f
+   use :: ompi_mpifh_bindings, only : ompi_aint_add_f
   implicit none
   INTEGER(MPI_ADDRESS_KIND) :: MPI_Aint_add_f08
   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
--- a/ompi/mpi/fortran/use-mpi-f08/aint_diff_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/aint_diff_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 function MPI_Aint_diff_f08(addr1, addr2)
   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_aint_diff_f
+   use :: ompi_mpifh_bindings, only : ompi_aint_diff_f
   implicit none
   INTEGER(MPI_ADDRESS_KIND) :: MPI_Aint_diff_f08
   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
--- a/ompi/mpi/fortran/use-mpi-f08/allgather_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/allgather_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: mpi_f08, only : ompi_allgather_f
+   use :: ompi_mpifh_bindings, only : ompi_allgather_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
   INTEGER, INTENT(IN) :: sendcount, recvcount
--- a/ompi/mpi/fortran/use-mpi-f08/allgatherv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/allgatherv_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -10,7 +12,7 @@
 subroutine MPI_Allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
                              displs,recvtype,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: mpi_f08, only : ompi_allgatherv_f
+   use :: ompi_mpifh_bindings, only : ompi_allgatherv_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
   INTEGER, INTENT(IN) :: sendcount
--- a/ompi/mpi/fortran/use-mpi-f08/alloc_mem_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alloc_mem_f08.F90
@ -3,12 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Alloc_mem_f08(size,info,baseptr,ierror)
   use, intrinsic :: ISO_C_BINDING, only : C_PTR
   use :: mpi_f08_types, only : MPI_Info, MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_alloc_mem_f
+   use :: ompi_mpifh_bindings, only : ompi_alloc_mem_f
   implicit none
   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size
   TYPE(MPI_Info), INTENT(IN) :: info
--- a/ompi/mpi/fortran/use-mpi-f08/allreduce_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/allreduce_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Allreduce_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: mpi_f08, only : ompi_allreduce_f
+   use :: ompi_mpifh_bindings, only : ompi_allreduce_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
   INTEGER, INTENT(IN) :: count
--- a/ompi/mpi/fortran/use-mpi-f08/alltoall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alltoall_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -10,7 +12,7 @@
 subroutine MPI_Alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
                            recvcount,recvtype,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: mpi_f08, only : ompi_alltoall_f
+   use :: ompi_mpifh_bindings, only : ompi_alltoall_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
   INTEGER, INTENT(IN) :: sendcount, recvcount
--- a/ompi/mpi/fortran/use-mpi-f08/alltoallv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alltoallv_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -10,7 +12,7 @@
 subroutine MPI_Alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
                             recvcounts,rdispls,recvtype,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: mpi_f08, only : ompi_alltoallv_f
+   use :: ompi_mpifh_bindings, only : ompi_alltoallv_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
   INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
--- a/ompi/mpi/fortran/use-mpi-f08/alltoallw_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alltoallw_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -10,7 +12,7 @@
 subroutine MPI_Alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
                             recvbuf,recvcounts,rdispls,recvtypes,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: mpi_f08, only : ompi_alltoallw_f
+   use :: ompi_mpifh_bindings, only : ompi_alltoallw_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
   INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
--- a/ompi/mpi/fortran/use-mpi-f08/barrier_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/barrier_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Barrier_f08(comm,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_barrier_f
+   use :: ompi_mpifh_bindings, only : ompi_barrier_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Bcast_f08(buffer,count,datatype,root,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: mpi_f08, only : ompi_bcast_f
+   use :: ompi_mpifh_bindings, only : ompi_bcast_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer
   INTEGER, INTENT(IN) :: count, root
--- a/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.am
@ -0,0 +1,61 @@
 # -*- makefile -*-
 #
 # Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
 # Copyright (c) 2012-2013 Inria.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2015-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
 #
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
 include $(top_srcdir)/Makefile.ompi-rules
 # This Makefile is only relevant if we're building the "use mpi_f08"
 # MPI bindings.
 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/$(OMPI_FORTRAN_USEMPI_DIR) \
             $(OMPI_FC_MODULE_FLAG). \
             $(OMPI_FC_MODULE_FLAG)../mod \
             -I$(top_srcdir) $(FCFLAGS_f90)
 MOSTLYCLEANFILES = *.mod
 CLEANFILES += *.i90
 ###########################################################################
 module_sentinel_file = \
        libforce_usempif08_internal_bindings_to_be_built.la
 noinst_LTLIBRARIES = $(module_sentinel_file)
 # f08 support modules
 libforce_usempif08_internal_bindings_to_be_built_la_SOURCES = \
        mpi-f-interfaces-bind.h \
        ompi-mpifh-bindings.F90
 #
 # Automake doesn't do Fortran dependency analysis, so must list them
 # manually here.  Bummer!
 #
 ompi-mpifh-bindings.lo: mpi-f-interfaces-bind.h
 distclean-local:
 	rm -f *.mod
 endif
--- a/ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h
+++ b/ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h
--- a/ompi/mpi/fortran/use-mpi-f08/bindings/ompi-mpifh-bindings.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/bindings/ompi-mpifh-bindings.F90
@ -0,0 +1,35 @@
 ! -*- f90 -*-
 !
 ! Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 !                         University Research and Technology
 !                         Corporation.  All rights reserved.
 ! Copyright (c) 2004-2005 The University of Tennessee and The University
 !                         of Tennessee Research Foundation.  All rights
 !                         reserved.
 ! Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 !                         University of Stuttgart.  All rights reserved.
 ! Copyright (c) 2004-2005 The Regents of the University of California.
 !                         All rights reserved.
 ! Copyright (c) 2006-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2016-2018 Research Organization for Information Science
 !                         and Technology (RIST). All rights reserved.
 ! $COPYRIGHT$
 !
 ! Additional copyrights may follow
 !
 ! $HEADER$
 !
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 module ompi_mpifh_bindings
 !
 ! Declaration of the interfaces to the ompi impl files
 ! e.g., send_f.c
 !
 #include "mpi-f-interfaces-bind.h"
 end module ompi_mpifh_bindings
--- a/ompi/mpi/fortran/use-mpi-f08/bsend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/bsend_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Bsend_f08(buf,count,datatype,dest,tag,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: mpi_f08, only : ompi_bsend_f
+   use :: ompi_mpifh_bindings, only : ompi_bsend_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
   INTEGER, INTENT(IN) :: count, dest, tag
--- a/ompi/mpi/fortran/use-mpi-f08/bsend_init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/bsend_init_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Bsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: mpi_f08, only : ompi_bsend_init_f
+   use :: ompi_mpifh_bindings, only : ompi_bsend_init_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
   INTEGER, INTENT(IN) :: count, dest, tag
--- a/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90
@ -3,12 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Buffer_attach_f08(buffer,size,ierror)
-   use :: mpi_f08, only : ompi_buffer_attach_f
+   use :: ompi_mpifh_bindings, only : ompi_buffer_attach_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer
   INTEGER, INTENT(IN) :: size
--- a/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90
@ -3,12 +3,14 @@
 ! Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Buffer_detach_f08(buffer_addr,size,ierror)
-   use :: mpi_f08, only : ompi_buffer_detach_f
+   use :: ompi_mpifh_bindings, only : ompi_buffer_detach_f
   USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
   implicit none
   TYPE(C_PTR), INTENT(OUT) ::  buffer_addr
--- a/ompi/mpi/fortran/use-mpi-f08/cancel_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cancel_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Cancel_f08(request,ierror)
   use :: mpi_f08_types, only : MPI_Request
-   use :: mpi_f08, only : ompi_cancel_f
+   use :: ompi_mpifh_bindings, only : ompi_cancel_f
   implicit none
   TYPE(MPI_Request), INTENT(IN) :: request
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/cart_coords_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_coords_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Cart_coords_f08(comm,rank,maxdims,coords,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_cart_coords_f
+   use :: ompi_mpifh_bindings, only : ompi_cart_coords_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: rank, maxdims
--- a/ompi/mpi/fortran/use-mpi-f08/cart_rank_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_rank_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Cart_rank_f08(comm,coords,rank,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_cart_rank_f
+   use :: ompi_mpifh_bindings, only : ompi_cart_rank_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: coords(*)
--- a/ompi/mpi/fortran/use-mpi-f08/cart_shift_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_shift_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Cart_shift_f08(comm,direction,disp,rank_source,rank_dest,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_cart_shift_f
+   use :: ompi_mpifh_bindings, only : ompi_cart_shift_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: direction, disp
--- a/ompi/mpi/fortran/use-mpi-f08/cartdim_get_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cartdim_get_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Cartdim_get_f08(comm,ndims,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_cartdim_get_f
+   use :: ompi_mpifh_bindings, only : ompi_cartdim_get_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(OUT) :: ndims
--- a/ompi/mpi/fortran/use-mpi-f08/close_port_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/close_port_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Close_port_f08(port_name,ierror)
-   use :: mpi_f08, only : ompi_close_port_f
+   use :: ompi_mpifh_bindings, only : ompi_close_port_f
   implicit none
   CHARACTER(LEN=*), INTENT(IN) :: port_name
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/comm_accept_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_accept_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_accept_f08(port_name,info,root,comm,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: mpi_f08, only : ompi_comm_accept_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_accept_f
   implicit none
   CHARACTER(LEN=*), INTENT(IN) :: port_name
   TYPE(MPI_Info), INTENT(IN) :: info
--- a/ompi/mpi/fortran/use-mpi-f08/comm_call_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_call_errhandler_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_call_errhandler_f08(comm,errorcode,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_call_errhandler_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_call_errhandler_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: errorcode
--- a/ompi/mpi/fortran/use-mpi-f08/comm_compare_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_compare_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_compare_f08(comm1,comm2,result,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_compare_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_compare_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm1
   TYPE(MPI_Comm), INTENT(IN) :: comm2
--- a/ompi/mpi/fortran/use-mpi-f08/comm_connect_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_connect_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_connect_f08(port_name,info,root,comm,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: mpi_f08, only : ompi_comm_connect_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_connect_f
   implicit none
   CHARACTER(LEN=*), INTENT(IN) :: port_name
   TYPE(MPI_Info), INTENT(IN) :: info
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_errhandler_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -11,7 +13,7 @@ subroutine MPI_Comm_create_errhandler_f08(comm_errhandler_fn,errhandler,ierror)
   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
   use :: mpi_f08_types, only : MPI_Errhandler
   use :: mpi_f08_interfaces_callbacks, only : MPI_Comm_errhandler_function
-   use :: mpi_f08, only : ompi_comm_create_errhandler_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_create_errhandler_f
   implicit none
   PROCEDURE(MPI_Comm_errhandler_function) :: comm_errhandler_fn
   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_create_f08(comm,group,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: mpi_f08, only : ompi_comm_create_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_create_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Group), INTENT(IN) :: group
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_group_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_create_group_f08(comm,group,tag,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: mpi_f08, only : ompi_comm_create_group_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_create_group_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Group), INTENT(IN) :: group
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_keyval_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -13,7 +15,7 @@ subroutine MPI_Comm_create_keyval_f08(comm_copy_attr_fn,comm_delete_attr_fn,&
   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
   use :: mpi_f08_interfaces_callbacks, only : MPI_Comm_copy_attr_function
   use :: mpi_f08_interfaces_callbacks, only : MPI_Comm_delete_attr_function
-   use :: mpi_f08, only : ompi_comm_create_keyval_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_create_keyval_f
   implicit none
   PROCEDURE(MPI_Comm_copy_attr_function) :: comm_copy_attr_fn
   PROCEDURE(MPI_Comm_delete_attr_function) :: comm_delete_attr_fn
--- a/ompi/mpi/fortran/use-mpi-f08/comm_delete_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_delete_attr_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_delete_attr_f08(comm,comm_keyval,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_delete_attr_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_delete_attr_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: comm_keyval
--- a/ompi/mpi/fortran/use-mpi-f08/comm_disconnect_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_disconnect_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_disconnect_f08(comm,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_disconnect_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_disconnect_f
   implicit none
   TYPE(MPI_Comm), INTENT(INOUT) :: comm
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/comm_dup_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_dup_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_dup_f08(comm,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_dup_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_dup_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
--- a/ompi/mpi/fortran/use-mpi-f08/comm_dup_with_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_dup_with_info_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_dup_with_info_f08(comm,info,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: mpi_f08, only : ompi_comm_dup_with_info_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_dup_with_info_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Info), INTENT(IN) :: info
--- a/ompi/mpi/fortran/use-mpi-f08/comm_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_free_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_free_f08(comm,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_free_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_free_f
   implicit none
   TYPE(MPI_Comm), INTENT(INOUT) :: comm
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/comm_free_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_free_keyval_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_free_keyval_f08(comm_keyval,ierror)
-   use :: mpi_f08, only : ompi_comm_free_keyval_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_free_keyval_f
   implicit none
   INTEGER, INTENT(INOUT) :: comm_keyval
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_errhandler_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_get_errhandler_f08(comm,errhandler,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Errhandler
-   use :: mpi_f08, only : ompi_comm_get_errhandler_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_get_errhandler_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_info_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_get_info_f08(comm,info_used,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: mpi_f08, only : ompi_comm_get_info_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_get_info_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Info), INTENT(OUT) :: info_used
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_name_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_get_name_f08(comm,comm_name,resultlen,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_MAX_OBJECT_NAME
-   use :: mpi_f08, only : ompi_comm_get_name_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_get_name_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   CHARACTER(LEN=*), INTENT(OUT) :: comm_name
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_parent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_parent_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_get_parent_f08(parent,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_get_parent_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_get_parent_f
   implicit none
   TYPE(MPI_Comm), INTENT(OUT) :: parent
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/comm_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_group_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_group_f08(comm,group,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: mpi_f08, only : ompi_comm_group_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_group_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Group), INTENT(OUT) :: group
--- a/ompi/mpi/fortran/use-mpi-f08/comm_idup_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_idup_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_idup_f08(comm,newcomm,request,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Request
-   use :: mpi_f08, only : ompi_comm_idup_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_idup_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
--- a/ompi/mpi/fortran/use-mpi-f08/comm_join_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_join_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_join_f08(fd,intercomm,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_join_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_join_f
   implicit none
   INTEGER, INTENT(IN) :: fd
   TYPE(MPI_Comm), INTENT(OUT) :: intercomm
--- a/ompi/mpi/fortran/use-mpi-f08/comm_rank_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_rank_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_rank_f08(comm,rank,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_rank_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_rank_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(OUT) :: rank
--- a/ompi/mpi/fortran/use-mpi-f08/comm_remote_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_remote_group_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_remote_group_f08(comm,group,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: mpi_f08, only : ompi_comm_remote_group_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_remote_group_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Group), INTENT(OUT) :: group
--- a/ompi/mpi/fortran/use-mpi-f08/comm_remote_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_remote_size_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_remote_size_f08(comm,size,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_remote_size_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_remote_size_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(OUT) :: size
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_attr_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_set_attr_f08(comm,comm_keyval,attribute_val,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_comm_set_attr_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_set_attr_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: comm_keyval
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_errhandler_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_set_errhandler_f08(comm,errhandler,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Errhandler
-   use :: mpi_f08, only : ompi_comm_set_errhandler_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_set_errhandler_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Errhandler), INTENT(IN) :: errhandler
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_info_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_set_info_f08(comm,info,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: mpi_f08, only : ompi_comm_set_info_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_set_info_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   TYPE(MPI_Info), INTENT(IN) :: info
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_name_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_set_name_f08(comm,comm_name,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_set_name_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_set_name_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   CHARACTER(LEN=*), INTENT(IN) :: comm_name
--- a/ompi/mpi/fortran/use-mpi-f08/comm_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_size_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_size_f08(comm,size,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_size_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_size_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(OUT) :: size
--- a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90
@ -3,12 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_spawn_f08(command,argv,maxprocs,info,root,comm,intercomm, &
                              array_of_errcodes,ierror)
   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: mpi_f08, only : ompi_comm_spawn_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_spawn_f
   implicit none
   CHARACTER(LEN=*), INTENT(IN) :: command, argv
   INTEGER, INTENT(IN) :: maxprocs, root
--- a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90
@ -3,7 +3,7 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2015      Research Organization for Information Science
+! Copyright (c) 2015-2018 Research Organization for Information Science
 !                         and Technology (RIST). All rights reserved.
 ! $COPYRIGHT$
@ -11,7 +11,7 @@ subroutine MPI_Comm_spawn_multiple_f08(count,array_of_commands,array_of_argv, &
                                       array_of_maxprocs,array_of_info,root,  &
                                       comm,intercomm,array_of_errcodes,ierror)
   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: mpi_f08, only : ompi_comm_spawn_multiple_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_spawn_multiple_f
   implicit none
   INTEGER, INTENT(IN) :: count, root
   INTEGER, INTENT(IN) :: array_of_maxprocs(count)
--- a/ompi/mpi/fortran/use-mpi-f08/comm_split_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_split_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_split_f08(comm,color,key,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_comm_split_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_split_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: color, key
--- a/ompi/mpi/fortran/use-mpi-f08/comm_split_type_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_split_type_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Comm_split_type_f08(comm,split_type,key,info,newcomm,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: mpi_f08, only : ompi_comm_split_type_f
+   use :: ompi_mpifh_bindings, only : ompi_comm_split_type_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: split_type
--- a/ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -11,7 +13,7 @@ subroutine MPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,&
                                    datatype,target_rank,target_disp,win,&
                                    ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_compare_and_swap_f
+   use :: ompi_mpifh_bindings, only : ompi_compare_and_swap_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr, compare_addr
   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
--- a/ompi/mpi/fortran/use-mpi-f08/dims_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dims_create_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Dims_create_f08(nnodes,ndims,dims,ierror)
-   use :: mpi_f08, only : ompi_dims_create_f
+   use :: ompi_mpifh_bindings, only : ompi_dims_create_f
   implicit none
   INTEGER, INTENT(IN) :: nnodes, ndims
   INTEGER, INTENT(INOUT) :: dims(*)
--- a/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_adjacent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_adjacent_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Dist_graph_create_adjacent_f08(comm_old,indegree,sources,sourceweights,&
@ -25,6 +27,6 @@ subroutine MPI_Dist_graph_create_adjacent_f08(comm_old,indegree,sources,sourcewe
   call PMPI_Dist_graph_create_adjacent(comm_old%MPI_VAL,indegree,sources,&
                                          sourceweights,outdegree,destinations,&
                                          destweights,info%MPI_VAL,&
-                                          reorder,comm_dist_graph%MPI_VAL,ierror)
+                                          reorder,comm_dist_graph%MPI_VAL,c_ierror)
   if (present(ierror)) ierror = c_ierror
 end subroutine MPI_Dist_graph_create_adjacent_f08
--- a/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_f08.F90
@ -3,12 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Dist_graph_neighbors_f08(comm,maxindegree,sources,sourceweights,&
                                        maxoutdegree,destinations,destweights,ierror)
   use :: mpi_f08_types, only : MPI_Comm
-   use :: mpi_f08, only : ompi_dist_graph_neighbors_f
+   use :: ompi_mpifh_bindings, only : ompi_dist_graph_neighbors_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   INTEGER, INTENT(IN) :: maxindegree, maxoutdegree
--- a/ompi/mpi/fortran/use-mpi-f08/errhandler_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/errhandler_free_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Errhandler_free_f08(errhandler,ierror)
   use :: mpi_f08_types, only : MPI_Errhandler
-   use :: mpi_f08, only : ompi_errhandler_free_f
+   use :: ompi_mpifh_bindings, only : ompi_errhandler_free_f
   implicit none
   TYPE(MPI_Errhandler), INTENT(INOUT) :: errhandler
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/error_class_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/error_class_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Error_class_f08(errorcode,errorclass,ierror)
-   use :: mpi_f08, only : ompi_error_class_f
+   use :: ompi_mpifh_bindings, only : ompi_error_class_f
   implicit none
   INTEGER, INTENT(IN) :: errorcode
   INTEGER, INTENT(OUT) :: errorclass
--- a/ompi/mpi/fortran/use-mpi-f08/error_string_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/error_string_f08.F90
@ -3,10 +3,12 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_Error_string_f08(errorcode,string,resultlen,ierror)
-   use :: mpi_f08, only : ompi_error_string_f
+   use :: ompi_mpifh_bindings, only : ompi_error_string_f
   implicit none
   integer, intent(in) :: errorcode
   character(len=*), intent(out) :: string
--- a/ompi/mpi/fortran/use-mpi-f08/exscan_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/exscan_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_Exscan_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: mpi_f08, only : ompi_exscan_f
+   use :: ompi_mpifh_bindings, only : ompi_exscan_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
   INTEGER, INTENT(IN) :: count
--- a/ompi/mpi/fortran/use-mpi-f08/f_sync_reg_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/f_sync_reg_f08.F90
@ -4,12 +4,14 @@
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2012      University of Oregon.  All rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_F_sync_reg_f08(buf)
-   use :: mpi_f08, only : ompi_f_sync_reg_f
+   use :: ompi_mpifh_bindings, only : ompi_f_sync_reg_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
--- a/ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -10,7 +12,7 @@
 subroutine MPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, &
                                target_disp,op,win,ierror)
   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_fetch_and_op_f
+   use :: ompi_mpifh_bindings, only : ompi_fetch_and_op_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
--- a/ompi/mpi/fortran/use-mpi-f08/file_call_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_call_errhandler_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_call_errhandler_f08(fh,errorcode,ierror)
   use :: mpi_f08_types, only : MPI_File
-   use :: mpi_f08, only : ompi_file_call_errhandler_f
+   use :: ompi_mpifh_bindings, only : ompi_file_call_errhandler_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER, INTENT(IN) :: errorcode
--- a/ompi/mpi/fortran/use-mpi-f08/file_close_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_close_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_close_f08(fh,ierror)
   use :: mpi_f08_types, only : MPI_File
-   use :: mpi_f08, only : ompi_file_close_f
+   use :: ompi_mpifh_bindings, only : ompi_file_close_f
   implicit none
   TYPE(MPI_File), INTENT(INOUT) :: fh
   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
--- a/ompi/mpi/fortran/use-mpi-f08/file_create_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_create_errhandler_f08.F90
@ -3,6 +3,8 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
@ -11,7 +13,7 @@ subroutine MPI_File_create_errhandler_f08(file_errhandler_fn,errhandler,ierror)
   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
   use :: mpi_f08_types, only : MPI_Errhandler
   use :: mpi_f08_interfaces_callbacks, only : MPI_File_errhandler_function
-   use :: mpi_f08, only : ompi_file_create_errhandler_f
+   use :: ompi_mpifh_bindings, only : ompi_file_create_errhandler_f
   implicit none
   PROCEDURE(MPI_File_errhandler_function) :: file_errhandler_fn
   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
--- a/ompi/mpi/fortran/use-mpi-f08/file_delete_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_delete_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_delete_f08(filename,info,ierror)
   use :: mpi_f08_types, only : MPI_Info
-   use :: mpi_f08, only : ompi_file_delete_f
+   use :: ompi_mpifh_bindings, only : ompi_file_delete_f
   implicit none
   CHARACTER(LEN=*), INTENT(IN) :: filename
   TYPE(MPI_Info), INTENT(IN) :: info
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_amode_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_amode_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_amode_f08(fh,amode,ierror)
   use :: mpi_f08_types, only : MPI_File
-   use :: mpi_f08, only : ompi_file_get_amode_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_amode_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER, INTENT(OUT) :: amode
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_byte_offset_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_byte_offset_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_byte_offset_f08(fh,offset,disp,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_get_byte_offset_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_byte_offset_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_errhandler_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_errhandler_f08(file,errhandler,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Errhandler
-   use :: mpi_f08, only : ompi_file_get_errhandler_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_errhandler_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: file
   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_group_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_group_f08(fh,group,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Group
-   use :: mpi_f08, only : ompi_file_get_group_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_group_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   TYPE(MPI_Group), INTENT(OUT) :: group
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_info_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_info_f08(fh,info_used,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Info
-   use :: mpi_f08, only : ompi_file_get_info_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_info_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   TYPE(MPI_Info), INTENT(OUT) :: info_used
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_position_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_position_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_position_f08(fh,offset,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_get_position_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_position_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: offset
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_position_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_position_shared_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_position_shared_f08(fh,offset,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_get_position_shared_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_position_shared_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: offset
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_size_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_size_f08(fh,size,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_get_size_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_size_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: size
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_type_extent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_type_extent_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_type_extent_f08(fh,datatype,extent,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_ADDRESS_KIND
-   use :: mpi_f08, only : ompi_file_get_type_extent_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_type_extent_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   TYPE(MPI_Datatype), INTENT(IN) :: datatype
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_view_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_view_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_get_view_f08(fh,disp,etype,filetype,datarep,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_get_view_f
+   use :: ompi_mpifh_bindings, only : ompi_file_get_view_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: disp
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_all_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iread_all_f08(fh,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: mpi_f08, only : ompi_file_iread_all_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iread_all_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_at_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_at_all_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iread_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_iread_at_all_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iread_at_all_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_at_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_at_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iread_at_f08(fh,offset,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_iread_at_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iread_at_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iread_f08(fh,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: mpi_f08, only : ompi_file_iread_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iread_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_shared_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iread_shared_f08(fh,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: mpi_f08, only : ompi_file_iread_shared_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iread_shared_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_all_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iwrite_all_f08(fh,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: mpi_f08, only : ompi_file_iwrite_all_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_all_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_all_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iwrite_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_iwrite_at_all_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_at_all_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iwrite_at_f08(fh,offset,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: mpi_f08, only : ompi_file_iwrite_at_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_at_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iwrite_f08(fh,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: mpi_f08, only : ompi_file_iwrite_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_f
   implicit none
   TYPE(MPI_File), INTENT(IN) :: fh
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_f08.F90
@ -3,13 +3,15 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 subroutine MPI_File_iwrite_shared_f08(fh,buf,count,datatype,request,ierror)
   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: mpi_f08, only : ompi_file_iwrite_shared_f
+   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_shared_f
   implicit none
   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
   TYPE(MPI_File), INTENT(IN) :: fh
--- a/ompi/mpi/fortran/use-mpi-f08/file_open_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_open_f08.F90
@ -3,11 +3,13 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 subroutine MPI_File_open_f08(comm,filename,amode,info,fh,ierror)
   use :: mpi_f08_types, only : MPI_Comm, MPI_Info, MPI_File
-   use :: mpi_f08, only : ompi_file_open_f
+   use :: ompi_mpifh_bindings, only : ompi_file_open_f
   implicit none
   TYPE(MPI_Comm), INTENT(IN) :: comm
   CHARACTER(LEN=*), INTENT(IN) :: filename
--- a/Показать больше
+++ b/Показать больше