diff --git a/ompi/mpi/fortran/base/mpi-f08-interfaces.F90 b/ompi/mpi/fortran/base/mpi-f08-interfaces.F90 index 6546cb618d..4b98bbbe1d 100644 --- a/ompi/mpi/fortran/base/mpi-f08-interfaces.F90 +++ b/ompi/mpi/fortran/base/mpi-f08-interfaces.F90 @@ -1,6 +1,6 @@ ! -*- f90 -*- ! -! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. +! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2013 Los Alamos National Security, LLC. ! All rights reserved. ! Copyright (c) 2012 The University of Tennessee and The University @@ -1705,7 +1705,7 @@ end subroutine MPI_Comm_create_f08 end interface MPI_Comm_create interface MPI_Comm_create_group -subroutine MPI_Comm_create_group_f08(comm,group,newcomm,ierror & +subroutine MPI_Comm_create_group_f08(comm,group,tag,newcomm,ierror & ) OMPI_F08_INTERFACE_BIND_C("MPI_Comm_create_group_f08") use :: mpi_f08_types, only : MPI_Comm, MPI_Group implicit none @@ -1756,19 +1756,19 @@ end subroutine MPI_Comm_dup_f08 end interface MPI_Comm_dup interface MPI_Comm_dup_with_info -subroutine MPI_Comm_dup_with_info_f08(comm,newcomm,ierror & +subroutine MPI_Comm_dup_with_info_f08(comm,info,newcomm,ierror & ) OMPI_F08_INTERFACE_BIND_C("MPI_Comm_dup_with_info_f08") use :: mpi_f08_types, only : MPI_Comm, MPI_Info implicit none TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_INFO), INTENT(IN) :: info + TYPE(MPI_Info), INTENT(IN) :: info TYPE(MPI_Comm), INTENT(OUT) :: newcomm INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine MPI_Comm_dup_with_info_f08 end interface MPI_Comm_dup_with_info interface MPI_Comm_idup -subroutine MPI_Comm_idup_f08(comm,newcomm,ierror & +subroutine MPI_Comm_idup_f08(comm,newcomm,request,ierror & ) OMPI_F08_INTERFACE_BIND_C("MPI_Comm_idup_f08") use :: mpi_f08_types, only : MPI_Comm, MPI_Request implicit none diff --git a/ompi/mpi/fortran/base/pmpi-f08-interfaces.F90 b/ompi/mpi/fortran/base/pmpi-f08-interfaces.F90 index 7d58f0399d..a8a2e2f943 100644 --- a/ompi/mpi/fortran/base/pmpi-f08-interfaces.F90 +++ b/ompi/mpi/fortran/base/pmpi-f08-interfaces.F90 @@ -1,6 +1,6 @@ ! -*- f90 -*- ! -! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. +! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2013 Los Alamos National Security, LLC. ! All rights reserved. ! Copyright (c) 2012 The University of Tennessee and The University @@ -1705,7 +1705,7 @@ end subroutine PMPI_Comm_create_f08 end interface PMPI_Comm_create interface PMPI_Comm_create_group -subroutine PMPI_Comm_create_group_f08(comm,group,newcomm,ierror & +subroutine PMPI_Comm_create_group_f08(comm,group,tag,newcomm,ierror & ) OMPI_F08_INTERFACE_BIND_C("PMPI_Comm_create_group_f08") use :: mpi_f08_types, only : MPI_Comm, MPI_Group implicit none @@ -1756,19 +1756,19 @@ end subroutine PMPI_Comm_dup_f08 end interface PMPI_Comm_dup interface PMPI_Comm_dup_with_info -subroutine PMPI_Comm_dup_with_info_f08(comm,newcomm,ierror & +subroutine PMPI_Comm_dup_with_info_f08(comm,info,newcomm,ierror & ) OMPI_F08_INTERFACE_BIND_C("PMPI_Comm_dup_with_info_f08") use :: mpi_f08_types, only : MPI_Comm, MPI_Info implicit none TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_INFO), INTENT(IN) :: info + TYPE(MPI_Info), INTENT(IN) :: info TYPE(MPI_Comm), INTENT(OUT) :: newcomm INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine PMPI_Comm_dup_with_info_f08 end interface PMPI_Comm_dup_with_info interface PMPI_Comm_idup -subroutine PMPI_Comm_idup_f08(comm,newcomm,ierror & +subroutine PMPI_Comm_idup_f08(comm,newcomm,request,ierror & ) OMPI_F08_INTERFACE_BIND_C("PMPI_Comm_idup_f08") use :: mpi_f08_types, only : MPI_Comm, MPI_Request implicit none diff --git a/ompi/mpi/fortran/mpif-h/comm_create_group_f.c b/ompi/mpi/fortran/mpif-h/comm_create_group_f.c index 194f46a6eb..e7fb5263de 100644 --- a/ompi/mpi/fortran/mpif-h/comm_create_group_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_create_group_f.c @@ -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) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -30,8 +30,8 @@ #pragma weak pmpi_comm_create_group_ = ompi_comm_create_group_f #pragma weak pmpi_comm_create_group__ = ompi_comm_create_group_f -#pragma weak PMPI_comm_create_group_f = ompi_comm_create_group_f -#pragma weak PMPI_comm_create_group_f08 = ompi_comm_create_group_f +#pragma weak PMPI_Comm_create_group_f = ompi_comm_create_group_f +#pragma weak PMPI_Comm_create_group_f08 = ompi_comm_create_group_f #elif OMPI_PROFILE_LAYER OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CREATE_GROUP, pmpi_comm_create_group, @@ -48,8 +48,8 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CREATE_GROUP, #pragma weak mpi_comm_create_group_ = ompi_comm_create_group_f #pragma weak mpi_comm_create_group__ = ompi_comm_create_group_f -#pragma weak MPI_comm_create_group_f = ompi_comm_create_group_f -#pragma weak MPI_comm_create_group_f08 = ompi_comm_create_group_f +#pragma weak MPI_Comm_create_group_f = ompi_comm_create_group_f +#pragma weak MPI_Comm_create_group_f08 = ompi_comm_create_group_f #endif #if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER diff --git a/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c b/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c index 83159b0ba2..f17599eb80 100644 --- a/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_dup_with_info_f.c @@ -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) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -30,8 +30,8 @@ #pragma weak pmpi_comm_dup_with_info_ = ompi_comm_dup_with_info_f #pragma weak pmpi_comm_dup_with_info__ = ompi_comm_dup_with_info_f -#pragma weak PMPI_comm_dup_with_info_f = ompi_comm_dup_with_info_f -#pragma weak PMPI_comm_dup_with_info_f08 = ompi_comm_dup_with_info_f +#pragma weak PMPI_Comm_dup_with_info_f = ompi_comm_dup_with_info_f +#pragma weak PMPI_Comm_dup_with_info_f08 = ompi_comm_dup_with_info_f #elif OMPI_PROFILE_LAYER OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_DUP_WITH_INFO, pmpi_comm_dup_with_info, @@ -48,8 +48,8 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_DUP_WITH_INFO, #pragma weak mpi_comm_dup_with_info_ = ompi_comm_dup_with_info_f #pragma weak mpi_comm_dup_with_info__ = ompi_comm_dup_with_info_f -#pragma weak MPI_comm_dup_with_info_f = ompi_comm_dup_with_info_f -#pragma weak MPI_comm_dup_with_info_f08 = ompi_comm_dup_with_info_f +#pragma weak MPI_Comm_dup_with_info_f = ompi_comm_dup_with_info_f +#pragma weak MPI_Comm_dup_with_info_f08 = ompi_comm_dup_with_info_f #endif #if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER diff --git a/ompi/mpi/fortran/mpif-h/comm_idup_f.c b/ompi/mpi/fortran/mpif-h/comm_idup_f.c index a4679ace59..692a1d4247 100644 --- a/ompi/mpi/fortran/mpif-h/comm_idup_f.c +++ b/ompi/mpi/fortran/mpif-h/comm_idup_f.c @@ -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) 2011-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -30,8 +30,8 @@ #pragma weak pmpi_comm_idup_ = ompi_comm_idup_f #pragma weak pmpi_comm_idup__ = ompi_comm_idup_f -#pragma weak PMPI_comm_idup_f = ompi_comm_idup_f -#pragma weak PMPI_comm_idup_f08 = ompi_comm_idup_f +#pragma weak PMPI_Comm_idup_f = ompi_comm_idup_f +#pragma weak PMPI_Comm_idup_f08 = ompi_comm_idup_f #elif OMPI_PROFILE_LAYER OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_IDUP, pmpi_comm_idup, @@ -48,8 +48,8 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_IDUP, #pragma weak mpi_comm_idup_ = ompi_comm_idup_f #pragma weak mpi_comm_idup__ = ompi_comm_idup_f -#pragma weak MPI_comm_idup_f = ompi_comm_idup_f -#pragma weak MPI_comm_idup_f08 = ompi_comm_idup_f +#pragma weak MPI_Comm_idup_f = ompi_comm_idup_f +#pragma weak MPI_Comm_idup_f08 = ompi_comm_idup_f #endif #if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER diff --git a/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h b/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h index 6a0df652ee..c578e019ad 100644 --- a/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h +++ b/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h @@ -1182,6 +1182,16 @@ subroutine ompi_comm_create_f(comm,group,newcomm,ierror) & INTEGER, INTENT(OUT) :: ierror end subroutine ompi_comm_create_f +subroutine ompi_comm_create_group_f(comm, group, tag, newcomm, ierror) & + BIND(C, name="ompi_comm_create_group_f") + implicit none + integer, intent(in) :: comm + integer, intent(in) :: group + integer, intent(in) :: tag + integer, intent(out) :: newcomm + integer, intent(out) :: ierror +end subroutine ompi_comm_create_group_f + subroutine ompi_comm_create_keyval_f(comm_copy_attr_fn,comm_delete_attr_fn, & comm_keyval,extra_state,ierror) & BIND(C, name="ompi_comm_create_keyval_f") @@ -1212,6 +1222,15 @@ subroutine ompi_comm_dup_f(comm,newcomm,ierror) & INTEGER, INTENT(OUT) :: ierror end subroutine ompi_comm_dup_f +subroutine ompi_comm_dup_with_info_f(comm, info, newcomm, ierror) & + BIND(C, name="ompi_comm_dup_with_info_f") + implicit none + integer, intent(in) :: comm + integer, intent(in) :: info + integer, intent(out) :: newcomm + integer, intent(out) :: ierror +end subroutine ompi_comm_dup_with_info_f + subroutine ompi_comm_free_f(comm,ierror) & BIND(C, name="ompi_comm_free_f") implicit none @@ -1256,6 +1275,15 @@ subroutine ompi_comm_group_f(comm,group,ierror) & INTEGER, INTENT(OUT) :: ierror end subroutine ompi_comm_group_f +subroutine ompi_comm_idup_f(comm, newcomm, request, ierror) & + BIND(C, name="ompi_comm_idup_f") + implicit none + integer, intent(in) :: comm + integer, intent(out) :: newcomm + integer, intent(out) :: request + integer, intent(out) :: ierror +end subroutine ompi_comm_idup_f + subroutine ompi_comm_rank_f(comm,rank,ierror) & BIND(C, name="ompi_comm_rank_f") implicit none