Commit 2fe6a58e authored by Junchao Zhang's avatar Junchao Zhang Committed by Kenneth Raffenetti
Browse files

Replace MPIX_Aint_ with MPI_Aint_ for MPI-3.1


Signed-off-by: Kenneth Raffenetti's avatarKen Raffenetti <raffenet@mcs.anl.gov>
parent 1188e6b9
...@@ -4338,27 +4338,27 @@ sub build_specials { ...@@ -4338,27 +4338,27 @@ sub build_specials {
} }
$returnType = "void"; $returnType = "void";
# MPIX_Aint_add/diff do not have the ierror argument. # MPI_Aint_add/diff do not have the ierror argument.
$OUTFD = "AINTADD"; $OUTFD = "AINTADD";
$filename = "aint_addf.c"; $filename = "aint_addf.c";
open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n"; open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n";
$files[$#files+1] = $filename; $files[$#files+1] = $filename;
$returnType = "MPI_Aint"; $returnType = "MPI_Aint";
&set_weak_decl( "MPIX_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); &set_weak_decl( "MPI_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
&set_weak_decl( "PMPIX_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); &set_weak_decl( "PMPI_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
&print_header( "mpix_", "MPIX_Aint_add", "aint_add", "MPI_Aint *, MPI_Aint *"); &print_header( "mpi_", "MPI_Aint_add", "aint_add", "MPI_Aint *, MPI_Aint *");
&print_routine_type_decl( $OUTFD, "mpix_", "aint_add" ); &print_routine_type_decl( $OUTFD, "mpi_", "aint_add" );
print $OUTFD "(MPI_Aint *base, MPI_Aint *disp)\n"; print $OUTFD "(MPI_Aint *base, MPI_Aint *disp)\n";
print $OUTFD "{\n"; print $OUTFD "{\n";
print $OUTFD " return MPIX_Aint_add(*base, *disp);\n"; print $OUTFD " return MPI_Aint_add(*base, *disp);\n";
print $OUTFD "}\n"; print $OUTFD "}\n";
close ($OUTFD); close ($OUTFD);
&ReplaceIfDifferent( $filename, $filename . ".new" ); &ReplaceIfDifferent( $filename, $filename . ".new" );
if ($build_prototypes) { if ($build_prototypes) {
print PROTOFD "extern "; print PROTOFD "extern ";
&print_routine_type_decl( PROTOFD, "mpix_", "aint_add" ); &print_routine_type_decl( PROTOFD, "mpi_", "aint_add" );
print PROTOFD "( MPI_Aint *, MPI_Aint * )"; print PROTOFD "( MPI_Aint *, MPI_Aint * )";
&print_attr( PROTOFD, "mpix_"."aint_add_" ); &print_attr( PROTOFD, "mpi_"."aint_add_" );
print PROTOFD ";\n"; print PROTOFD ";\n";
} }
$returnType = "void"; $returnType = "void";
...@@ -4368,21 +4368,21 @@ sub build_specials { ...@@ -4368,21 +4368,21 @@ sub build_specials {
open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n"; open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n";
$files[$#files+1] = $filename; $files[$#files+1] = $filename;
$returnType = "MPI_Aint"; $returnType = "MPI_Aint";
&set_weak_decl( "MPIX_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); &set_weak_decl( "MPI_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
&set_weak_decl( "PMPIX_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" ); &set_weak_decl( "PMPI_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
&print_header( "mpix_", "MPIX_Aint_diff", "aint_diff", "MPI_Aint *, MPI_Aint *"); &print_header( "mpi_", "MPI_Aint_diff", "aint_diff", "MPI_Aint *, MPI_Aint *");
&print_routine_type_decl( $OUTFD, "mpix_", "aint_diff" ); &print_routine_type_decl( $OUTFD, "mpi_", "aint_diff" );
print $OUTFD "(MPI_Aint *addr1, MPI_Aint *addr2)\n"; print $OUTFD "(MPI_Aint *addr1, MPI_Aint *addr2)\n";
print $OUTFD "{\n"; print $OUTFD "{\n";
print $OUTFD " return MPIX_Aint_diff(*addr1, *addr2);\n"; print $OUTFD " return MPI_Aint_diff(*addr1, *addr2);\n";
print $OUTFD "}\n"; print $OUTFD "}\n";
close ($OUTFD); close ($OUTFD);
&ReplaceIfDifferent( $filename, $filename . ".new" ); &ReplaceIfDifferent( $filename, $filename . ".new" );
if ($build_prototypes) { if ($build_prototypes) {
print PROTOFD "extern "; print PROTOFD "extern ";
&print_routine_type_decl( PROTOFD, "mpix_", "aint_diff" ); &print_routine_type_decl( PROTOFD, "mpi_", "aint_diff" );
print PROTOFD "( MPI_Aint *, MPI_Aint * )"; print PROTOFD "( MPI_Aint *, MPI_Aint * )";
&print_attr( PROTOFD, "mpix_"."aint_diff_" ); &print_attr( PROTOFD, "mpi_"."aint_diff_" );
print PROTOFD ";\n"; print PROTOFD ";\n";
} }
$returnType = "void"; $returnType = "void";
......
...@@ -2524,7 +2524,7 @@ function MPIR_Comm_spawn_multiple_c(count, array_of_commands, array_of_argv, arr ...@@ -2524,7 +2524,7 @@ function MPIR_Comm_spawn_multiple_c(count, array_of_commands, array_of_argv, arr
end function MPIR_Comm_spawn_multiple_c end function MPIR_Comm_spawn_multiple_c
function MPIR_Aint_add_c(base, disp) & function MPIR_Aint_add_c(base, disp) &
bind(C, name="PMPIX_Aint_add") result(res) bind(C, name="PMPI_Aint_add") result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
implicit none implicit none
integer(MPI_ADDRESS_KIND), value, intent(in) :: base, disp integer(MPI_ADDRESS_KIND), value, intent(in) :: base, disp
...@@ -2532,7 +2532,7 @@ function MPIR_Aint_add_c(base, disp) & ...@@ -2532,7 +2532,7 @@ function MPIR_Aint_add_c(base, disp) &
end function MPIR_Aint_add_c end function MPIR_Aint_add_c
function MPIR_Aint_diff_c(addr1, addr2) & function MPIR_Aint_diff_c(addr1, addr2) &
bind(C, name="PMPIX_Aint_diff") result(res) bind(C, name="PMPI_Aint_diff") result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
implicit none implicit none
integer(MPI_ADDRESS_KIND), value, intent(in) :: addr1, addr2 integer(MPI_ADDRESS_KIND), value, intent(in) :: addr1, addr2
......
...@@ -4103,23 +4103,23 @@ interface MPI_Wtime ...@@ -4103,23 +4103,23 @@ interface MPI_Wtime
end function MPI_Wtime_f08 end function MPI_Wtime_f08
end interface MPI_Wtime end interface MPI_Wtime
interface MPIX_Aint_add interface MPI_Aint_add
function MPIX_Aint_add_f08(base, disp) result(res) function MPI_Aint_add_f08(base, disp) result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
implicit none implicit none
integer(MPI_ADDRESS_KIND), intent(in) :: base, disp integer(MPI_ADDRESS_KIND), intent(in) :: base, disp
integer(MPI_ADDRESS_KIND) :: res integer(MPI_ADDRESS_KIND) :: res
end function MPIX_Aint_add_f08 end function MPI_Aint_add_f08
end interface MPIX_Aint_add end interface MPI_Aint_add
interface MPIX_Aint_diff interface MPI_Aint_diff
function MPIX_Aint_diff_f08(addr1, addr2) result(res) function MPI_Aint_diff_f08(addr1, addr2) result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
implicit none implicit none
integer(MPI_ADDRESS_KIND), intent(in) :: addr1, addr2 integer(MPI_ADDRESS_KIND), intent(in) :: addr1, addr2
integer(MPI_ADDRESS_KIND) :: res integer(MPI_ADDRESS_KIND) :: res
end function MPIX_Aint_diff_f08 end function MPI_Aint_diff_f08
end interface MPIX_Aint_diff end interface MPI_Aint_diff
interface MPIX_File_iread_all interface MPIX_File_iread_all
subroutine MPIX_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror) subroutine MPIX_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory. ! (C) 2014 by Argonne National Laboratory.
! See COPYRIGHT in top-level directory. ! See COPYRIGHT in top-level directory.
! !
function MPIX_Aint_add_f08(base, disp) result(res) function MPI_Aint_add_f08(base, disp) result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
use :: mpi_c_interface_nobuf, only : MPIR_Aint_add_c use :: mpi_c_interface_nobuf, only : MPIR_Aint_add_c
implicit none implicit none
...@@ -11,4 +11,4 @@ function MPIX_Aint_add_f08(base, disp) result(res) ...@@ -11,4 +11,4 @@ function MPIX_Aint_add_f08(base, disp) result(res)
integer(MPI_ADDRESS_KIND) :: res integer(MPI_ADDRESS_KIND) :: res
res = MPIR_Aint_add_c(base, disp) res = MPIR_Aint_add_c(base, disp)
end function MPIX_Aint_add_f08 end function MPI_Aint_add_f08
\ No newline at end of file \ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory. ! (C) 2014 by Argonne National Laboratory.
! See COPYRIGHT in top-level directory. ! See COPYRIGHT in top-level directory.
! !
function MPIX_Aint_diff_f08(addr1, addr2) result(res) function MPI_Aint_diff_f08(addr1, addr2) result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
use :: mpi_c_interface_nobuf, only : MPIR_Aint_diff_c use :: mpi_c_interface_nobuf, only : MPIR_Aint_diff_c
implicit none implicit none
...@@ -11,4 +11,4 @@ function MPIX_Aint_diff_f08(addr1, addr2) result(res) ...@@ -11,4 +11,4 @@ function MPIX_Aint_diff_f08(addr1, addr2) result(res)
integer(MPI_ADDRESS_KIND) :: res integer(MPI_ADDRESS_KIND) :: res
res = MPIR_Aint_diff_c(addr1, addr2) res = MPIR_Aint_diff_c(addr1, addr2)
end function MPIX_Aint_diff_f08 end function MPI_Aint_diff_f08
...@@ -1547,8 +1547,8 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm); ...@@ -1547,8 +1547,8 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm);
int MPIX_Comm_agree(MPI_Comm comm, int *flag); int MPIX_Comm_agree(MPI_Comm comm, int *flag);
/* MPI_Aint addressing arithmetic */ /* MPI_Aint addressing arithmetic */
MPI_Aint MPIX_Aint_add(MPI_Aint base, MPI_Aint disp); MPI_Aint MPI_Aint_add(MPI_Aint base, MPI_Aint disp);
MPI_Aint MPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); MPI_Aint MPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2);
/* End Prototypes */ /* End Prototypes */
#endif /* MPICH_SUPPRESS_PROTOTYPES */ #endif /* MPICH_SUPPRESS_PROTOTYPES */
...@@ -2193,8 +2193,8 @@ int PMPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm); ...@@ -2193,8 +2193,8 @@ int PMPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm);
int PMPIX_Comm_agree(MPI_Comm comm, int *flag); int PMPIX_Comm_agree(MPI_Comm comm, int *flag);
/* MPI_Aint addressing arithmetic */ /* MPI_Aint addressing arithmetic */
MPI_Aint PMPIX_Aint_add(MPI_Aint base, MPI_Aint disp); MPI_Aint PMPI_Aint_add(MPI_Aint base, MPI_Aint disp);
MPI_Aint PMPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); MPI_Aint PMPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2);
#endif /* MPI_BUILD_PROFILING */ #endif /* MPI_BUILD_PROFILING */
/* End of MPI bindings */ /* End of MPI bindings */
......
...@@ -7,31 +7,31 @@ ...@@ -7,31 +7,31 @@
#include "mpiimpl.h" #include "mpiimpl.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Aint_add */ /* -- Begin Profiling Symbol Block for routine MPI_Aint_add */
#if defined(HAVE_PRAGMA_WEAK) #if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Aint_add = PMPIX_Aint_add #pragma weak MPI_Aint_add = PMPI_Aint_add
#elif defined(HAVE_PRAGMA_HP_SEC_DEF) #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Aint_add MPIX_Aint_add #pragma _HP_SECONDARY_DEF PMPI_Aint_add MPI_Aint_add
#elif defined(HAVE_PRAGMA_CRI_DUP) #elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Aint_add as PMPIX_Aint_add #pragma _CRI duplicate MPI_Aint_add as PMPI_Aint_add
#elif defined(HAVE_WEAK_ATTRIBUTE) #elif defined(HAVE_WEAK_ATTRIBUTE)
MPI_Aint MPIX_Aint_add(MPI_Aint base, MPI_Aint disp) __attribute__((weak,alias("PMPIX_Aint_add"))); MPI_Aint MPI_Aint_add(MPI_Aint base, MPI_Aint disp) __attribute__((weak,alias("PMPI_Aint_add")));
#endif #endif
/* -- End Profiling Symbol Block */ /* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */ the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI #ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Aint_add #undef MPI_Aint_add
#define MPIX_Aint_add PMPIX_Aint_add #define MPI_Aint_add PMPI_Aint_add
#endif #endif
#undef FUNCNAME #undef FUNCNAME
#define FUNCNAME MPIX_Aint_add #define FUNCNAME MPI_Aint_add
/*@ /*@
MPIX_Aint_add - Returns the sum of base and disp MPI_Aint_add - Returns the sum of base and disp
Input Parameters: Input Parameters:
+ base - base address (integer) + base - base address (integer)
...@@ -41,7 +41,7 @@ Return value: ...@@ -41,7 +41,7 @@ Return value:
Sum of the base and disp argument Sum of the base and disp argument
Notes: Notes:
MPIX_Aint_Add produces a new MPI_Aint value that is equivalent to the sum of the MPI_Aint_Add produces a new MPI_Aint value that is equivalent to the sum of the
base and disp arguments, where base represents a base address returned by a call base and disp arguments, where base represents a base address returned by a call
to MPI_GET_ADDRESS and disp represents a signed integer displacement. The resulting to MPI_GET_ADDRESS and disp represents a signed integer displacement. The resulting
address is valid only at the process that generated base, and it must correspond address is valid only at the process that generated base, and it must correspond
...@@ -50,19 +50,19 @@ a manner that results in the correct MPI_Aint representation of the output addre ...@@ -50,19 +50,19 @@ a manner that results in the correct MPI_Aint representation of the output addre
as if the process that originally produced base had called: as if the process that originally produced base had called:
MPI_Get_address((char *) base + disp, &result) MPI_Get_address((char *) base + disp, &result)
.seealso: MPIX_Aint_diff .seealso: MPI_Aint_diff
@*/ @*/
MPI_Aint MPIX_Aint_add(MPI_Aint base, MPI_Aint disp) MPI_Aint MPI_Aint_add(MPI_Aint base, MPI_Aint disp)
{ {
MPI_Aint result; MPI_Aint result;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_AINT_ADD); MPID_MPI_STATE_DECL(MPID_STATE_MPI_AINT_ADD);
MPIR_ERRTEST_INITIALIZED_ORDIE(); MPIR_ERRTEST_INITIALIZED_ORDIE();
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_AINT_ADD); MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_AINT_ADD);
result = MPID_Aint_add(base, disp); result = MPID_Aint_add(base, disp);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_AINT_ADD); MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_AINT_ADD);
return result; return result;
} }
...@@ -7,31 +7,31 @@ ...@@ -7,31 +7,31 @@
#include "mpiimpl.h" #include "mpiimpl.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Aint_diff */ /* -- Begin Profiling Symbol Block for routine MPI_Aint_diff */
#if defined(HAVE_PRAGMA_WEAK) #if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Aint_diff = PMPIX_Aint_diff #pragma weak MPI_Aint_diff = PMPI_Aint_diff
#elif defined(HAVE_PRAGMA_HP_SEC_DEF) #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Aint_diff MPIX_Aint_diff #pragma _HP_SECONDARY_DEF PMPI_Aint_diff MPI_Aint_diff
#elif defined(HAVE_PRAGMA_CRI_DUP) #elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Aint_diff as PMPIX_Aint_diff #pragma _CRI duplicate MPI_Aint_diff as PMPI_Aint_diff
#elif defined(HAVE_WEAK_ATTRIBUTE) #elif defined(HAVE_WEAK_ATTRIBUTE)
MPI_Aint MPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2) __attribute__((weak,alias("PMPIX_Aint_diff"))); MPI_Aint MPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2) __attribute__((weak,alias("PMPI_Aint_diff")));
#endif #endif
/* -- End Profiling Symbol Block */ /* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */ the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI #ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Aint_diff #undef MPI_Aint_diff
#define MPIX_Aint_diff PMPIX_Aint_diff #define MPI_Aint_diff PMPI_Aint_diff
#endif #endif
#undef FUNCNAME #undef FUNCNAME
#define FUNCNAME MPIX_Aint_diff #define FUNCNAME MPI_Aint_diff
/*@ /*@
MPIX_Aint_diff - Returns the difference between addr1 and addr2 MPI_Aint_diff - Returns the difference between addr1 and addr2
Input Parameters: Input Parameters:
+ addr1 - minuend address (integer) + addr1 - minuend address (integer)
...@@ -41,7 +41,7 @@ Return value: ...@@ -41,7 +41,7 @@ Return value:
Difference between addr1 and addr2 Difference between addr1 and addr2
Notes: Notes:
MPIX_Aint_diff produces a new MPI_Aint value that is equivalent to the difference MPI_Aint_diff produces a new MPI_Aint value that is equivalent to the difference
between addr1 and addr2 arguments, where addr1 and addr2 represent addresses between addr1 and addr2 arguments, where addr1 and addr2 represent addresses
returned by calls to MPI_GET_ADDRESS. The resulting address is valid only at the returned by calls to MPI_GET_ADDRESS. The resulting address is valid only at the
process that generated addr1 and addr2, and addr1 and addr2 must correspond to process that generated addr1 and addr2, and addr1 and addr2 must correspond to
...@@ -51,19 +51,19 @@ process that originally produced the addresses had called ...@@ -51,19 +51,19 @@ process that originally produced the addresses had called
(char *) addr1 - (char *) addr2 (char *) addr1 - (char *) addr2
on the addresses initially passed to MPI_GET_ADDRESS. on the addresses initially passed to MPI_GET_ADDRESS.
.seealso: MPIX_Aint_add .seealso: MPI_Aint_add
@*/ @*/
MPI_Aint MPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2) MPI_Aint MPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2)
{ {
MPI_Aint result; MPI_Aint result;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_AINT_DIFF); MPID_MPI_STATE_DECL(MPID_STATE_MPI_AINT_DIFF);
MPIR_ERRTEST_INITIALIZED_ORDIE(); MPIR_ERRTEST_INITIALIZED_ORDIE();
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_AINT_DIFF); MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_AINT_DIFF);
result = MPID_Aint_diff(addr1, addr2); result = MPID_Aint_diff(addr1, addr2);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_AINT_DIFF); MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_AINT_DIFF);
return result; return result;
} }
...@@ -52,10 +52,10 @@ program main ...@@ -52,10 +52,10 @@ program main
! Do MPI_Aint addressing arithmetic ! Do MPI_Aint addressing arithmetic
if (rank == 0) then if (rank == 0) then
disp = intsize*511 disp = intsize*511
offset = MPIX_Aint_add(bases(1), disp) ! offset points to array(1023) offset = MPI_Aint_add(bases(1), disp) ! offset points to array(1023)
else if (rank == 1) then else if (rank == 1) then
disp = intsize*512 disp = intsize*512
offset = MPIX_Aint_diff(bases(0), disp) ! offset points to array(0) offset = MPI_Aint_diff(bases(0), disp) ! offset points to array(0)
endif endif
! Get value and verify it ! Get value and verify it
......
...@@ -10,4 +10,4 @@ c2f2cwinf08 1 ...@@ -10,4 +10,4 @@ c2f2cwinf08 1
baseattrwinf08 1 baseattrwinf08 1
winattrf08 1 winattrf08 1
winattr2f08 1 winattr2f08 1
@mpix@aintf08 2 strict=false aintf08 2 mpiversion=3.1
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
integer :: win integer :: win
integer :: intsize integer :: intsize
integer(kind=MPI_ADDRESS_KIND), external :: MPIX_Aint_add integer(kind=MPI_ADDRESS_KIND), external :: MPI_Aint_add
integer(kind=MPI_ADDRESS_KIND), external :: MPIX_Aint_diff integer(kind=MPI_ADDRESS_KIND), external :: MPI_Aint_diff
errs = 0 errs = 0
call mtest_init(ierr); call mtest_init(ierr);
...@@ -60,10 +60,10 @@ ...@@ -60,10 +60,10 @@
! Do MPI_Aint addressing arithmetic ! Do MPI_Aint addressing arithmetic
if (rank == 0) then if (rank == 0) then
disp = intsize*511 disp = intsize*511
offset = MPIX_Aint_add(bases(1), disp) offset = MPI_Aint_add(bases(1), disp)
else if (rank == 1) then else if (rank == 1) then
disp = intsize*512 disp = intsize*512
offset = MPIX_Aint_diff(bases(0), disp) offset = MPI_Aint_diff(bases(0), disp)
endif endif
! Get value and verify it ! Get value and verify it
......
...@@ -10,4 +10,4 @@ c2f2cwinf 1 ...@@ -10,4 +10,4 @@ c2f2cwinf 1
baseattrwinf 1 baseattrwinf 1
winattrf 1 winattrf 1
winattr2f 1 winattr2f 1
@mpix@aintf 2 strict=false aintf 2 mpiversion=3.1
...@@ -55,10 +55,10 @@ int main(int argc, char **argv) ...@@ -55,10 +55,10 @@ int main(int argc, char **argv)
/* Do MPI_Aint addressing arithmetic */ /* Do MPI_Aint addressing arithmetic */
if (rank == 0) { if (rank == 0) {
disp = sizeof(int)*511; disp = sizeof(int)*511;
offset = MPIX_Aint_add(bases[1], disp); /* offset points to array[1023]*/ offset = MPI_Aint_add(bases[1], disp); /* offset points to array[1023]*/
} else if (rank == 1) { } else if (rank == 1) {
disp = sizeof(int)*512; disp = sizeof(int)*512;
offset = MPIX_Aint_diff(bases[0], disp); /* offset points to array[0] */ offset = MPI_Aint_diff(bases[0], disp); /* offset points to array[0] */
} }
/* Get val and verify it */ /* Get val and verify it */
......
...@@ -131,7 +131,7 @@ at_complete 2 ...@@ -131,7 +131,7 @@ at_complete 2
atomic_rmw_fop 3 atomic_rmw_fop 3
atomic_rmw_cas 3 atomic_rmw_cas 3
atomic_rmw_gacc 3 atomic_rmw_gacc 3
@mpix@aint 2 strict=false aint 2 mpiversion=3.1
acc-pairtype 2 acc-pairtype 2
manyget 2 xfail=ticket2264 manyget 2 xfail=ticket2264
derived-acc-flush_local 3 mpiversion=3.0 derived-acc-flush_local 3 mpiversion=3.0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment