Skip to content

Commit 1a1492a

Browse files
hjelmnhjelmn
committed
Merge pull request #3 from jsquyres/hjelmn-aint_math
mpi-f08: corrections to new MPI_Aint_* subroutines
2 parents 062de45 + 258d1aa commit 1a1492a

File tree

8 files changed

+43
-37
lines changed

8 files changed

+43
-37
lines changed

‎ompi/mpi/fortran/use-mpi-f08/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ mpi_api_files = \
9292
add_error_class_f08.F90 \
9393
add_error_code_f08.F90 \
9494
add_error_string_f08.F90 \
95+
aint_add_f08.F90 \
96+
aint_diff_f08.F90 \
9597
allgather_f08.F90 \
9698
allgatherv_f08.F90 \
9799
alloc_mem_f08.F90 \
@@ -444,6 +446,8 @@ pmpi_api_files = \
444446
profile/padd_error_class_f08.F90 \
445447
profile/padd_error_code_f08.F90 \
446448
profile/padd_error_string_f08.F90 \
449+
profile/paint_add_f08.F90 \
450+
profile/paint_diff_f08.F90 \
447451
profile/pallgather_f08.F90 \
448452
profile/pallgatherv_f08.F90 \
449453
profile/palloc_mem_f08.F90 \

‎ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
55
! All Rights reserved.
66
! $COPYRIGHT$
77

88
#include "ompi/mpi/fortran/configure-fortran-output.h"
99

10-
function MPI_Aint_add_f08(base,diff)
10+
function MPI_Aint_add_f08(addr1, addr2)
1111
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
1212
use :: mpi_f08, only : ompi_aint_add_f
1313
implicit none
14-
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base
15-
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: diff
16-
call ompi_aint_add_f (base, diff)
14+
INTEGER(MPI_ADDRESS_KIND) :: MPI_Aint_add_f08
15+
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
16+
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr2
17+
MPI_Aint_add_f08 = ompi_aint_add_f(addr1, addr2)
1718
end function MPI_Aint_add_f08

‎ompi/mpi/fortran/use-mpi-f08/aint_diff_f08.F90

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
55
! All Rights reserved.
66
! $COPYRIGHT$
77

88
#include "ompi/mpi/fortran/configure-fortran-output.h"
99

10-
function MPI_Aint_diff_f08(addr1,addr2)
10+
function MPI_Aint_diff_f08(addr1, addr2)
1111
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
12-
use :: mpi_f08, only ompi_aint_diff_f
12+
use :: mpi_f08, only : ompi_aint_diff_f
1313
implicit none
14+
INTEGER(MPI_ADDRESS_KIND) :: MPI_Aint_diff_f08
1415
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
1516
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr2
16-
call ompi_aint_diff_f (base, diff)
17+
MPI_Aint_diff_f08 = ompi_aint_diff_f(addr1, addr2)
1718
end function MPI_Aint_diff_f08

‎ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2012 The University of Tennessee and The University
@@ -1780,23 +1780,23 @@ function ompi_wtime_f() &
17801780
DOUBLE PRECISION :: ompi_wtime_f
17811781
end function ompi_wtime_f
17821782

1783-
function ompi_aint_add_f(base,diff) &
1783+
function ompi_aint_add_f(base,diff) &
17841784
BIND(C, name="ompi_aint_add_f")
17851785
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
17861786
implicit none
17871787
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base
17881788
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: diff
17891789
INTEGER(MPI_ADDRESS_KIND) :: ompi_aint_add_f
1790-
end function ompi_aint_add_f
1790+
end function ompi_aint_add_f
17911791

1792-
function ompi_aint_diff_f(addr1,addr2) &
1792+
function ompi_aint_diff_f(addr1,addr2) &
17931793
BIND(C, name="ompi_aint_diff_f")
17941794
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
17951795
implicit none
17961796
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
17971797
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr2
17981798
INTEGER(MPI_ADDRESS_KIND) :: ompi_aint_diff_f
1799-
end function ompi_aint_diff_f
1799+
end function ompi_aint_diff_f
18001800

18011801
subroutine ompi_abort_f(comm,errorcode,ierror) &
18021802
BIND(C, name="ompi_abort_f")

‎ompi/mpi/fortran/use-mpi-f08/pmpi-f-interfaces-bind.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2012 The University of Tennessee and The University
@@ -1615,23 +1615,23 @@ end subroutine pompi_topo_test_f
16151615
! DOUBLE PRECISION :: MPI_Wtime_f
16161616
!end function MPI_Wtime_f
16171617

1618-
function pompi_aint_add_f(base,diff) &
1618+
function pompi_aint_add_f(base,diff) &
16191619
BIND(C, name="pompi_aint_add_f")
16201620
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
16211621
implicit none
16221622
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base
16231623
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: diff
16241624
INTEGER(MPI_ADDRESS_KIND) :: pompi_aint_add_f
1625-
end function pompi_aint_add_f
1625+
end function pompi_aint_add_f
16261626

1627-
function pompi_aint_diff_f(addr1,addr2) &
1627+
function pompi_aint_diff_f(addr1,addr2) &
16281628
BIND(C, name="pompi_aint_diff_f")
16291629
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
16301630
implicit none
16311631
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
16321632
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr2
16331633
INTEGER(MPI_ADDRESS_KIND) :: pompi_aint_diff_f
1634-
end function pompi_aint_diff_f
1634+
end function pompi_aint_diff_f
16351635

16361636
subroutine pompi_abort_f(comm,errorcode,ierror) &
16371637
BIND(C, name="pompi_abort_f")

‎ompi/mpi/fortran/use-mpi-f08/pmpi-f08-interfaces.F90

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2012 The University of Tennessee and The University
@@ -2431,23 +2431,21 @@ end function PMPI_Wtime_f08
24312431
end interface PMPI_Wtime
24322432

24332433
interface PMPI_Aint_add
2434-
function PMPI_Aint_add_f08(base,diff)
2434+
subroutine PMPI_Aint_add_f08(base,diff)
24352435
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
24362436
implicit none
24372437
INTEGER(MPI_ADDRESS_KIND) :: base
24382438
INTEGER(MPI_ADDRESS_KIND) :: diff
2439-
INTEGER(MPI_ADDRESS_KIND) :: PMPI_Aint_add_f08
2440-
end function PMPI_Aint_add_f08
2439+
end subroutine PMPI_Aint_add_f08
24412440
end interface PMPI_Aint_add
24422441

24432442
interface PMPI_Aint_diff
2444-
function PMPI_Aint_diff_f08(addr1,addr2)
2443+
subroutine PMPI_Aint_diff_f08(addr1,addr2)
24452444
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
24462445
implicit none
24472446
INTEGER(MPI_ADDRESS_KIND) :: addr1
24482447
INTEGER(MPI_ADDRESS_KIND) :: addr2
2449-
INTEGER(MPI_ADDRESS_KIND) :: PMPI_Aint_diff_f08
2450-
end function PMPI_Aint_diff_f08
2448+
end subroutine PMPI_Aint_diff_f08
24512449
end interface PMPI_Aint_diff
24522450

24532451
interface PMPI_Abort

‎ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
55
! All Rights reserved.
66
! $COPYRIGHT$
77

88
#include "ompi/mpi/fortran/configure-fortran-output.h"
99

10-
function PMPI_Aint_add_f08(base,diff)
10+
function PMPI_Aint_add_f08(base, diff)
1111
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
12-
use :: mpi_f08, only ompi_aint_add_f
12+
use :: mpi_f08, only : ompi_aint_add_f
1313
implicit none
14+
INTEGER(MPI_ADDRESS_KIND) :: PMPI_Aint_add_f08
1415
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base
1516
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: diff
16-
call ompi_aint_add_f (base, diff)
17+
PMPI_Aint_add_f08 = ompi_aint_add_f(base, diff)
1718
end function PMPI_Aint_add_f08

‎ompi/mpi/fortran/use-mpi-f08/profile/paint_diff_f08.F90

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
55
! All Rights reserved.
66
! $COPYRIGHT$
77

88
#include "ompi/mpi/fortran/configure-fortran-output.h"
99

10-
function PMPI_Aint_add_f08(base,diff)
10+
function PMPI_Aint_diff_f08(addr1, addr2)
1111
use :: mpi_f08_types, only : MPI_ADDRESS_KIND
12-
use :: mpi_f08, only ompi_aint_add_f
12+
use :: mpi_f08, only : ompi_aint_diff_f
1313
implicit none
14-
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base
15-
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: diff
16-
call ompi_aint_add_f (base, diff)
17-
end function PMPI_Aint_add_f08
14+
INTEGER(MPI_ADDRESS_KIND) :: PMPI_Aint_diff_f08
15+
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
16+
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr2
17+
PMPI_Aint_diff_f08 = ompi_aint_diff_f(addr1, addr2)
18+
end function PMPI_Aint_diff_f08

0 commit comments

Comments
 (0)