ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #1096 from kawashima-fj/pr/fortran-var-type-fix

Просмотр исходного кода 
Fix Fortran variable types
Этот коммит содержится в:
Nathan Hjelm 2015-11-05 14:27:40 -07:00
родитель e0a291812d 384f4b51d1
Коммит fda5daf453
4 изменённых файлов: 18 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
ompi/include/mpif-sentinels.h
Просмотреть файл

@ -26,8 +26,7 @@
!
! - the "mpi" module bindings
! - the "mpi_f08" module bindings
! - ompi/mpi/fortran/base/constants.h
! - ompi/mpi/runtime/ompi_init.c
! - ompi/mpi/fortran/base/gen-mpi-mangling.pl
!
! MPI_BOTTOM is only used where choice buffers can be used (meaning
@ -41,7 +40,7 @@
! don't need another interface for MPI_COMM_SPAWN.
character MPI_ARGV_NULL(1)
! Ditto for MPI_ARGVS_NULL / MPI_COMM_SPAWN_MULTIPLE.
character MPI_ARGVS_NULL(1)
character MPI_ARGVS_NULL(1, 1)
! MPI_ERRCODES_IGNORE has similar rationale to MPI_ARGV_NULL. The
! F77 functions are all smart enough to check that the errcodes
! parameter is not ERRCODES_IGNORE before assigning values into it
@ -53,8 +52,10 @@
integer MPI_STATUS_IGNORE(MPI_STATUS_SIZE)
! Ditto for MPI_STATUSES_IGNORE
integer MPI_STATUSES_IGNORE(MPI_STATUS_SIZE, 1)
integer MPI_UNWEIGHTED
integer MPI_WEIGHTS_EMPTY
! Ditto for MPI_UNWEIGHTED
integer MPI_UNWEIGHTED(1)
! Ditto for MPI_WEIGHTS_EMPTY
integer MPI_WEIGHTS_EMPTY(1)
common/mpi_fortran_bottom/MPI_BOTTOM
common/mpi_fortran_in_place/MPI_IN_PLACE

4
ompi/mpi/fortran/base/gen-mpi-mangling.pl
Просмотреть файл

@ -62,13 +62,13 @@ $fortran->{in_place} = {
f_name => "MPI_IN_PLACE",
};
$fortran->{unweighted} = {
c_type => "int",
c_type => "int *",
c_name => "mpi_fortran_unweighted",
f_type => "integer",
f_name => "MPI_UNWEIGHTED",
};
$fortran->{weights_empty} = {
c_type => "int",
c_type => "int *",
c_name => "mpi_fortran_weights_empty",
f_type => "integer",
f_name => "MPI_WEIGHTS_EMPTY",

16
ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in
Просмотреть файл

@ -3636,12 +3636,12 @@ subroutine MPI_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recv
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
integer, dimension(*), intent(in) :: sendcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
integer, dimension(*), intent(in) :: sendtypes
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
integer, dimension(*), intent(in) :: recvcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
integer, dimension(*), intent(in) :: recvtypes
integer, intent(in) :: comm
integer, intent(out) :: request
@ -3658,12 +3658,12 @@ subroutine PMPI_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, rec
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
integer, dimension(*), intent(in) :: sendcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
integer, dimension(*), intent(in) :: sendtypes
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
integer, dimension(*), intent(in) :: recvcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
integer, dimension(*), intent(in) :: recvtypes
integer, intent(in) :: comm
integer, intent(out) :: request
@ -4698,12 +4698,12 @@ subroutine MPI_Neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvb
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
integer, dimension(*), intent(in) :: sendcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
integer, dimension(*), intent(in) :: sendtypes
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
integer, dimension(*), intent(in) :: recvcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
integer, dimension(*), intent(in) :: recvtypes
integer, intent(in) :: comm
integer, intent(out) :: ierror
@ -4719,12 +4719,12 @@ subroutine PMPI_Neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recv
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
integer, dimension(*), intent(in) :: sendcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
integer, dimension(*), intent(in) :: sendtypes
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
integer, dimension(*), intent(in) :: recvcounts
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
integer, dimension(*), intent(in) :: recvtypes
integer, intent(in) :: comm
integer, intent(out) :: ierror

4
ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h
Просмотреть файл

@ -3379,7 +3379,7 @@ subroutine MPI_Dist_graph_create(comm_old, n, sources, degrees, destinations, &
integer, dimension(n), intent(in) :: degrees
integer, dimension(n), intent(in) :: destinations
integer, dimension(n), intent(in) :: weights
logical, intent(in) :: info
integer, intent(in) :: info
logical, intent(in) :: reorder
integer, intent(out) :: comm_dist_graph
integer, intent(out) :: ierror
@ -3400,7 +3400,7 @@ subroutine MPI_Dist_graph_create_adjacent(comm_old, indegree, sources, sourcewei
integer, intent(in) :: outdegree
integer, dimension(outdegree), intent(in) :: destinations
integer, dimension(outdegree), intent(in) :: destweights
logical, intent(in) :: info
integer, intent(in) :: info
logical, intent(in) :: reorder
integer, intent(out) :: comm_dist_graph
integer, intent(out) :: ierror