Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v5.0.x: Fix parameter name in MPI_Intercomm_merge() #11727

Merged
merged 1 commit into from
Jun 1, 2023
Merged

v5.0.x: Fix parameter name in MPI_Intercomm_merge() #11727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ompi/include/mpi.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions ompi/mpi/fortran/mpif-h/intercomm_merge_f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ompi/mpi/fortran/mpif-h/prototypes_mpi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down