From 9632da676a9b45c4e9ee87bcf775f4f6e0364830 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 23 May 2023 11:57:53 +0900 Subject: [PATCH] Fix parameter name in MPI_Intercomm_merge() Name it newintracomm instead of newintercomm Thanks Yan Wu for reporting this. Signed-off-by: Gilles Gouaillardet (cherry picked from commit e07dd3c54b613ff1073ae1d27c943662ff340b69) --- ompi/include/mpi.h.in | 4 ++-- ompi/mpi/fortran/mpif-h/intercomm_merge_f.c | 12 ++++++------ ompi/mpi/fortran/mpif-h/prototypes_mpi.h | 4 ++-- .../mpi-ignore-tkr-interfaces.h.in | 6 +++--- ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in index af8a9415e99..c8b8435d294 100644 --- a/ompi/include/mpi.h.in +++ b/ompi/include/mpi.h.in @@ -17,7 +17,7 @@ * reserved. * Copyright (c) 2011-2013 INRIA. All rights reserved. * Copyright (c) 2015 University of Houston. All rights reserved. - * Copyright (c) 2015-2021 Research Organization for Information Science + * Copyright (c) 2015-2023 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. @@ -1770,7 +1770,7 @@ OMPI_DECLSPEC int MPI_Intercomm_create_from_groups (MPI_Group local_group, int int remote_leader, const char *tag, MPI_Info info, MPI_Errhandler errhandler, MPI_Comm *newintercomm); OMPI_DECLSPEC int MPI_Intercomm_merge(MPI_Comm intercomm, int high, - MPI_Comm *newintercomm); + MPI_Comm *newintracomm); OMPI_DECLSPEC int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, MPI_Status *status); OMPI_DECLSPEC int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, diff --git a/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c b/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c index 6c07c66580b..865350280e1 100644 --- a/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c +++ b/ompi/mpi/fortran/mpif-h/intercomm_merge_f.c @@ -10,8 +10,8 @@ * 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) 2015 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2015-2023 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,8 +38,8 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_INTERCOMM_MERGE, pmpi_intercomm_merge_, pmpi_intercomm_merge__, pompi_intercomm_merge_f, - (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintercomm, MPI_Fint *ierr), - (intercomm, high, newintercomm, ierr) ) + (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintracomm, MPI_Fint *ierr), + (intercomm, high, newintracomm, ierr) ) #endif #endif @@ -58,8 +58,8 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_MERGE, mpi_intercomm_merge_, mpi_intercomm_merge__, ompi_intercomm_merge_f, - (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintercomm, MPI_Fint *ierr), - (intercomm, high, newintercomm, ierr) ) + (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintracomm, MPI_Fint *ierr), + (intercomm, high, newintracomm, ierr) ) #else #define ompi_intercomm_merge_f pompi_intercomm_merge_f #endif diff --git a/ompi/mpi/fortran/mpif-h/prototypes_mpi.h b/ompi/mpi/fortran/mpif-h/prototypes_mpi.h index f5d06f85592..5d089fc57ef 100644 --- a/ompi/mpi/fortran/mpif-h/prototypes_mpi.h +++ b/ompi/mpi/fortran/mpif-h/prototypes_mpi.h @@ -14,7 +14,7 @@ * Copyright (c) 2011-2013 Universite Bordeaux 1 * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2020 Research Organization for Information Science + * Copyright (c) 2016-2023 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2019-2022 Triad National Security, LLC. All rights * reserved. @@ -318,7 +318,7 @@ PN2(void, MPI_Initialized, mpi_initialized, MPI_INITIALIZED, (ompi_fortran_logic PN2(void, MPI_Init_thread, mpi_init_thread, MPI_INIT_THREAD, (MPI_Fint *required, MPI_Fint *provided, MPI_Fint *ierr)); PN2(void, MPI_Intercomm_create, mpi_intercomm_create, MPI_INTERCOMM_CREATE, (MPI_Fint *local_comm, MPI_Fint *local_leader, MPI_Fint *bridge_comm, MPI_Fint *remote_leader, MPI_Fint *tag, MPI_Fint *newintercomm, MPI_Fint *ierr)); PN2(void, MPI_Intercomm_create_from_groups, mpi_intercomm_create_from_groups, MPI_INTERCOMM_CREATE_FROM_GROUPS, (MPI_Fint *local_group, MPI_Fint *local_leader, MPI_Fint *remote_group, MPI_Fint *remote_leader, char *stringtag, MPI_Fint *info, MPI_Fint *errhandler, MPI_Fint *newintercomm, MPI_Fint *ierr, int name_len)); -PN2(void, MPI_Intercomm_merge, mpi_intercomm_merge, MPI_INTERCOMM_MERGE, (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintercomm, MPI_Fint *ierr)); +PN2(void, MPI_Intercomm_merge, mpi_intercomm_merge, MPI_INTERCOMM_MERGE, (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintracomm, MPI_Fint *ierr)); PN2(void, MPI_Iprobe, mpi_iprobe, MPI_IPROBE, (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr)); PN2(void, MPI_Irecv, mpi_irecv, MPI_IRECV, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)); PN2(void, MPI_Irsend, mpi_irsend, MPI_IRSEND, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)); diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in index c08c98a91f8..b257988a13d 100644 --- a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in +++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in @@ -9,7 +9,7 @@ ! Copyright (c) 2012 Inria. All rights reserved. ! Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights ! reserved. -! Copyright (c) 2015-2020 Research Organization for Information Science +! Copyright (c) 2015-2023 Research Organization for Information Science ! and Technology (RIST). All rights reserved. ! Copyright (c) 2019-2022 Triad National Security, LLC. All rights ! reserved. @@ -2343,10 +2343,10 @@ end interface interface -subroutine MPI_Intercomm_merge(intercomm, high, newintercomm, ierror) +subroutine MPI_Intercomm_merge(intercomm, high, newintracomm, ierror) integer, intent(in) :: intercomm logical, intent(in) :: high - integer, intent(out) :: newintercomm + integer, intent(out) :: newintracomm integer, intent(out) :: ierror end subroutine MPI_Intercomm_merge diff --git a/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h b/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h index c59ca473a6b..044d7d5fa23 100644 --- a/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h +++ b/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h @@ -1168,10 +1168,10 @@ end interface interface -subroutine MPI_Intercomm_merge(intercomm, high, newintercomm, ierror) +subroutine MPI_Intercomm_merge(intercomm, high, newintracomm, ierror) integer, intent(in) :: intercomm logical, intent(in) :: high - integer, intent(out) :: newintercomm + integer, intent(out) :: newintracomm integer, intent(out) :: ierror end subroutine MPI_Intercomm_merge