1
1

Add profiling versions of dist_graph functions into the library

Also fix the interfaces that have logical parameters (the
non-profiling versions were added/fixed a long time ago; it looks like
the profiling versions were inadvertantly skipped).

cmr=v1.7.4:ticket=4162

This commit was SVN r30377.

The following Trac tickets were found above:
  Ticket 4162 --> https://svn.open-mpi.org/trac/ompi/ticket/4162
Этот коммит содержится в:
Jeff Squyres 2014-01-23 01:24:54 +00:00
родитель 5aa75d0ed9
Коммит 19617394f0
5 изменённых файлов: 22 добавлений и 12 удалений

Просмотреть файл

@ -432,6 +432,10 @@ pmpi_api_files = \
profile/pcomm_split_f08.F90 \
profile/pcomm_test_inter_f08.F90 \
profile/pdims_create_f08.F90 \
profile/pdist_graph_create_adjacent_f08.F90 \
profile/pdist_graph_create_f08.F90 \
profile/pdist_graph_neighbors_count_f08.F90 \
profile/pdist_graph_neighbors_f08.F90 \
profile/perrhandler_free_f08.F90 \
profile/perror_class_f08.F90 \
profile/perror_string_f08.F90 \

Просмотреть файл

@ -1,6 +1,6 @@
! -*- f90 -*-
!
! Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
! All rights reserved.
! $COPYRIGHT$
@ -9,7 +9,9 @@ subroutine PMPI_Dist_graph_create_adjacent_f08(comm_old,indegree,sources,sourcew
outdegree,destinations,destweights,info,&
reorder,comm_dist_graph,ierror)
use :: mpi_f08_types, only : MPI_Comm, MPI_Info
use :: mpi_f08, only : ompi_dist_graph_create_adjacent_f
! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
! call a PMPI_* subroutine below.
use :: mpi, only : PMPI_Dist_graph_create_adjacent
implicit none
TYPE(MPI_Comm), INTENT(IN) :: comm_old
INTEGER, INTENT(IN) :: indegree, outdegree
@ -20,10 +22,9 @@ subroutine PMPI_Dist_graph_create_adjacent_f08(comm_old,indegree,sources,sourcew
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
integer :: c_ierror
call ompi_dist_graph_create_adjacent_f(comm_old%MPI_VAL,indegree,sources,&
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)
if (present(ierror)) ierror = c_ierror
end subroutine PMPI_Dist_graph_create_adjacent_f08

Просмотреть файл

@ -1,6 +1,6 @@
! -*- f90 -*-
!
! Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
! All rights reserved.
! $COPYRIGHT$
@ -8,7 +8,9 @@
subroutine PMPI_Dist_graph_create_f08(comm_old,n,sources,degrees,destinations,&
weights,info,reorder,comm_dist_graph,ierror)
use :: mpi_f08_types, only : MPI_Comm, MPI_Info
use :: mpi_f08, only : ompi_dist_graph_create_f
! See note in ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90 about why
! we "use mpi" here.
use :: mpi, only : PMPI_Dist_graph_create
implicit none
TYPE(MPI_Comm), INTENT(IN) :: comm_old
INTEGER, INTENT(IN) :: n
@ -19,7 +21,9 @@ subroutine PMPI_Dist_graph_create_f08(comm_old,n,sources,degrees,destinations,&
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
integer :: c_ierror
call ompi_dist_graph_create_f(comm_old%MPI_VAL,n,sources,degrees,destinations,&
! See note in ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90 about why
! we call a PMPI_* subroutine here
call PMPI_Dist_graph_create(comm_old%MPI_VAL,n,sources,degrees,destinations,&
weights,info%MPI_VAL,reorder,comm_dist_graph%MPI_VAL,&
c_ierror)
if (present(ierror)) ierror = c_ierror

Просмотреть файл

@ -1,13 +1,15 @@
! -*- f90 -*-
!
! Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
! All rights reserved.
! $COPYRIGHT$
subroutine PMPI_Dist_graph_neighbors_count_f08(comm,indegree,outdegree,weighted,ierror)
use :: mpi_f08_types, only : MPI_Comm
use :: mpi_f08, only : ompi_dist_graph_neighbors_count_f
! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
! call a PMPI_* subroutine below.
use :: mpi, only : PMPI_Dist_graph_neighbors_count
implicit none
TYPE(MPI_Comm), INTENT(IN) :: comm
INTEGER, INTENT(OUT) :: indegree, outdegree
@ -15,7 +17,6 @@ subroutine PMPI_Dist_graph_neighbors_count_f08(comm,indegree,outdegree,weighted,
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
integer :: c_ierror
call ompi_dist_graph_neighbors_count_f(comm%MPI_VAL,indegree,outdegree,weighted,c_ierror)
call PMPI_Dist_graph_neighbors_count(comm%MPI_VAL,indegree,outdegree,weighted,c_ierror)
if (present(ierror)) ierror = c_ierror
end subroutine PMPI_Dist_graph_neighbors_count_f08

Просмотреть файл

@ -6,7 +6,7 @@
! $COPYRIGHT$
subroutine PMPI_Dist_graph_neighbors_f08(comm,maxindegree,sources,sourceweights,&
maxoutdegree,destinations,destweights,ierror)
maxoutdegree,destinations,destweights,ierror)
use :: mpi_f08_types, only : MPI_Comm
use :: mpi_f08, only : ompi_dist_graph_neighbors_f
implicit none