Skip to content

Commit fd2e445

Browse files
bosilcabosilca
authored
Merge pull request #10043 from bosilca/fix/session_profiling_API
Fix the profiling API for the newly added session functions.
2 parents c06bb8a + 08a72f6 commit fd2e445

8 files changed

+21
-22
lines changed

‎ompi/mpi/fortran/mpif-h/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
180180
comm_create_f.c \
181181
comm_create_from_group_f.c \
182182
comm_create_group_f.c \
183-
comm_create_from_group_f.c \
184183
comm_create_keyval_f.c \
185184
comm_delete_attr_f.c \
186185
comm_disconnect_f.c \

‎ompi/mpi/fortran/mpif-h/comm_create_from_group_f.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CREATE_FROM_GROUP,
4747
pmpi_comm_create_from_group,
4848
pmpi_comm_create_from_group_,
4949
pmpi_comm_create_from_group__,
50-
pmpi_comm_create_from_group_f,
51-
(MPI_Fint *goup, char *stringtag, MPI_Fint *info, MPI_Fint *errhandler, MPI_Fint *newcomm, MPI_Fint *ierr, int name_len),
50+
pompi_comm_create_from_group_f,
51+
(MPI_Fint *group, char *stringtag, MPI_Fint *info, MPI_Fint *errhandler, MPI_Fint *newcomm, MPI_Fint *ierr, int name_len),
5252
(group, stringtag, info, errhandler, newcomm, ierr, name_len) )
5353
#endif
5454
#endif
@@ -68,7 +68,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_FROM_GROUP,
6868
mpi_comm_create_from_group_,
6969
mpi_comm_create_from_group__,
7070
ompi_comm_create_from_group_f,
71-
(MPI_Fint *goup, char *stringtag, MPI_Fint *info, MPI_Fint *errhandler, MPI_Fint *newcomm, MPI_Fint *ierr, int name_len),
71+
(MPI_Fint *group, char *stringtag, MPI_Fint *info, MPI_Fint *errhandler, MPI_Fint *newcomm, MPI_Fint *ierr, int name_len),
7272
(group, stringtag, info, errhandler, newcomm, ierr, name_len) )
7373
#else
7474
#define ompi_comm_create_from_group_f pompi_comm_create_from_group_f

‎ompi/mpi/fortran/mpif-h/group_from_session_pset_f.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_GROUP_FROM_SESSION_PSET,
4646
pmpi_group_from_session_pset,
4747
pmpi_group_from_session_pset_,
4848
pmpi_group_from_session_pset__,
49-
pmpi_group_from_session_pset_f,
50-
(MPI_Fint *session, char *pset_name, MPI_Fint *newgroup, MPI_Fint *ierr),
51-
(session, pset_name, newgroup, ierr) )
49+
pompi_group_from_session_pset_f,
50+
(MPI_Fint *session, char *pset_name, MPI_Fint *newgroup, MPI_Fint *ierr, int name_len),
51+
(session, pset_name, newgroup, ierr, name_len) )
5252
#endif
5353
#endif
5454

@@ -67,8 +67,8 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_FROM_SESSION_PSET,
6767
mpi_group_from_session_pset_,
6868
mpi_group_from_session_pset__,
6969
ompi_group_from_session_pset_f,
70-
(MPI_Fint *session, char *pset_name, MPI_Fint *newgroup, MPI_Fint *ierr),
71-
(session, pset_name, newgroup, ierr) )
70+
(MPI_Fint *session, char *pset_name, MPI_Fint *newgroup, MPI_Fint *ierr, int name_len),
71+
(session, pset_name, newgroup, ierr, name_len) )
7272
#else
7373
#define ompi_group_from_session_pset_f pompi_group_from_session_pset_f
7474
#endif

‎ompi/mpi/fortran/mpif-h/intercomm_create_from_groups_f.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_INTERCOMM_CREATE_FROM_GROUPS,
4747
pmpi_intercomm_create_from_groups,
4848
pmpi_intercomm_create_from_groups_,
4949
pmpi_intercomm_create_from_groups__,
50-
pmpi_intercomm_create_from_groups_f,
50+
pompi_intercomm_create_from_groups_f,
5151
(MPI_Fint *local_group, MPI_Fint *local_leader, MPI_Fint *remote_group,
5252
MPI_Fint *remote_leader, char *stringtag, MPI_Fint *info, MPI_Fint *errhandler,
53-
MPI_Fint *internewcom, MPI_Fint *ierr, int name_len),
53+
MPI_Fint *internewcomm, MPI_Fint *ierr, int name_len),
5454
(local_group, local_leader, remote_group,
5555
remote_leader, stringtag, info, errhandler, internewcomm, ierr, name_len) )
5656

@@ -74,7 +74,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_CREATE_FROM_GROUPS,
7474
ompi_intercomm_create_from_groups_f,
7575
(MPI_Fint *local_group, MPI_Fint *local_leader, MPI_Fint *remote_group,
7676
MPI_Fint *remote_leader, char *stringtag, MPI_Fint *info, MPI_Fint *errhandler,
77-
MPI_Fint *internewcom, MPI_Fint *ierr, int name_len),
77+
MPI_Fint *internewcomm, MPI_Fint *ierr, int name_len),
7878
(local_group, local_leader, remote_group,
7979
remote_leader, stringtag, info, errhandler, internewcomm, ierr, name_len) )
8080
#else

‎ompi/mpi/fortran/mpif-h/session_get_info_f.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_SESSION_GET_INFO,
4343
pmpi_session_get_info,
4444
pmpi_session_get_info_,
4545
pmpi_session_get_info__,
46-
pmpi_session_get_info_f,
46+
pompi_session_get_info_f,
4747
(MPI_Fint *session, MPI_Fint *npset_names, MPI_Fint *ierr),
4848
(session, npset_names, ierr) )
4949
#endif

‎ompi/mpi/fortran/mpif-h/session_get_nth_pset_f.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_SESSION_GET_NTH_PSET,
4545
pmpi_session_get_nth_pset,
4646
pmpi_session_get_nth_pset_,
4747
pmpi_session_get_nth_pset__,
48-
pmpi_session_get_nth_pset_f,
49-
(MPI_Fint *session, MPI_Fint *info, MPI_Fint *npset_names, MPI_Fint *ierr),
50-
(session, npset_names, ierr) )
48+
pompi_session_get_nth_pset_f,
49+
(MPI_Fint *session, MPI_Fint *info, MPI_Fint *n, MPI_Fint *pset_len, char *pset_name, MPI_Fint *ierr),
50+
(session, info, n, pset_len, pset_name, ierr))
5151
#endif
5252
#endif
5353

@@ -66,8 +66,8 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SESSION_GET_NTH_PSET,
6666
mpi_session_get_nth_pset_,
6767
mpi_session_get_nth_pset__,
6868
ompi_session_get_nth_pset_f,
69-
(MPI_Fint *session, MPI_Fint *info, MPI_Fint *npset_names, MPI_Fint *ierr),
70-
(session, npset_names, ierr) )
69+
(MPI_Fint *session, MPI_Fint *info, MPI_Fint *n, MPI_Fint *pset_len, char *pset_name, MPI_Fint *ierr),
70+
(session, info, n, pset_len, pset_name, ierr))
7171
#else
7272
#define ompi_session_get_nth_pset_f pompi_session_get_nth_pset_f
7373
#endif

‎ompi/mpi/fortran/mpif-h/session_get_num_psets_f.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_SESSION_GET_NUM_PSETS,
4242
pmpi_session_get_num_psets,
4343
pmpi_session_get_num_psets_,
4444
pmpi_session_get_num_psets__,
45-
pmpi_session_get_num_psets_f,
45+
pompi_session_get_num_psets_f,
4646
(MPI_Fint *session, MPI_Fint *info, MPI_Fint *npset_names, MPI_Fint *ierr),
47-
(session, npset_names, ierr) )
47+
(session, info, npset_names, ierr) )
4848
#endif
4949
#endif
5050

@@ -64,7 +64,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SESSION_GET_NUM_PSETS,
6464
mpi_session_get_num_psets__,
6565
ompi_session_get_num_psets_f,
6666
(MPI_Fint *session, MPI_Fint *info, MPI_Fint *npset_names, MPI_Fint *ierr),
67-
(session, npset_names, ierr) )
67+
(session, info, npset_names, ierr) )
6868
#else
6969
#define ompi_session_get_num_psets_f pompi_session_get_num_psets_f
7070
#endif

‎ompi/mpi/fortran/mpif-h/session_get_pset_info_f.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_SESSION_GET_PSET_INFO,
4646
pmpi_session_get_pset_info,
4747
pmpi_session_get_pset_info_,
4848
pmpi_session_get_pset_info__,
49-
pmpi_session_get_pset_info_f,
49+
pompi_session_get_pset_info_f,
5050
(MPI_Fint *session, char *pset_name, MPI_Fint *info, MPI_Fint *ierr, int name_len),
5151
(session, pset_name, info, ierr, name_len) )
5252
#endif

0 commit comments

Comments
 (0)