[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-189-gc2ea6af
Service Account
noreply at mpich.org
Sun Mar 1 13:56:50 CST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via c2ea6afcc5989b0810538fe92ae62c4afb022f32 (commit)
via 077346f64f44dbd48eb7b7127b91dfa6a449b3b1 (commit)
from 63ac36a4a1e08b97aa8c73640a3ecc144e02c613 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/c2ea6afcc5989b0810538fe92ae62c4afb022f32
commit c2ea6afcc5989b0810538fe92ae62c4afb022f32
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Fri Feb 27 12:42:21 2015 -0600
Enable MPI 3.1 MPI_Aint address arithmetic functs.
Move MPIX_Aint_add and MPIX_Aint_diff to MPI_ functions.
See MPI forum ticket #349:
http://svn.mpi-forum.org/trac/mpi-forum-web/ticket/349
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/src/binding/fortran/mpif_h/buildiface b/src/binding/fortran/mpif_h/buildiface
index ba75a71..180e3a7 100755
--- a/src/binding/fortran/mpif_h/buildiface
+++ b/src/binding/fortran/mpif_h/buildiface
@@ -4345,27 +4345,27 @@ sub build_specials {
}
$returnType = "void";
- # MPIX_Aint_add/diff do not have the ierror argument.
+ # MPI_Aint_add/diff do not have the ierror argument.
$OUTFD = "AINTADD";
$filename = "aint_addf.c";
open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n";
$files[$#files+1] = $filename;
$returnType = "MPI_Aint";
- &set_weak_decl( "MPIX_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
- &set_weak_decl( "PMPIX_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
- &print_header( "mpix_", "MPIX_Aint_add", "aint_add", "MPI_Aint *, MPI_Aint *");
- &print_routine_type_decl( $OUTFD, "mpix_", "aint_add" );
+ &set_weak_decl( "MPI_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
+ &set_weak_decl( "PMPI_Aint_add", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
+ &print_header( "mpi_", "MPI_Aint_add", "aint_add", "MPI_Aint *, MPI_Aint *");
+ &print_routine_type_decl( $OUTFD, "mpi_", "aint_add" );
print $OUTFD "(MPI_Aint *base, MPI_Aint *disp)\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";
close ($OUTFD);
&ReplaceIfDifferent( $filename, $filename . ".new" );
if ($build_prototypes) {
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_attr( PROTOFD, "mpix_"."aint_add_" );
+ &print_attr( PROTOFD, "mpi_"."aint_add_" );
print PROTOFD ";\n";
}
$returnType = "void";
@@ -4375,21 +4375,21 @@ sub build_specials {
open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n";
$files[$#files+1] = $filename;
$returnType = "MPI_Aint";
- &set_weak_decl( "MPIX_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
- &set_weak_decl( "PMPIX_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
- &print_header( "mpix_", "MPIX_Aint_diff", "aint_diff", "MPI_Aint *, MPI_Aint *");
- &print_routine_type_decl( $OUTFD, "mpix_", "aint_diff" );
+ &set_weak_decl( "MPI_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
+ &set_weak_decl( "PMPI_Aint_diff", "MPI_Aint *, MPI_Aint *", "MPI_Aint" );
+ &print_header( "mpi_", "MPI_Aint_diff", "aint_diff", "MPI_Aint *, MPI_Aint *");
+ &print_routine_type_decl( $OUTFD, "mpi_", "aint_diff" );
print $OUTFD "(MPI_Aint *addr1, MPI_Aint *addr2)\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";
close ($OUTFD);
&ReplaceIfDifferent( $filename, $filename . ".new" );
if ($build_prototypes) {
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_attr( PROTOFD, "mpix_"."aint_diff_" );
+ &print_attr( PROTOFD, "mpi_"."aint_diff_" );
print PROTOFD ";\n";
}
$returnType = "void";
diff --git a/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90 b/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90
index 38bfaf5..41ec748 100644
--- a/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90
+++ b/src/binding/fortran/use_mpi_f08/mpi_c_interface_nobuf.F90
@@ -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
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
implicit none
integer(MPI_ADDRESS_KIND), value, intent(in) :: base, disp
@@ -2532,7 +2532,7 @@ function MPIR_Aint_add_c(base, disp) &
end function MPIR_Aint_add_c
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
implicit none
integer(MPI_ADDRESS_KIND), value, intent(in) :: addr1, addr2
diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 b/src/binding/fortran/use_mpi_f08/mpi_f08.F90
index ccde0e9..338d0ce 100644
--- a/src/binding/fortran/use_mpi_f08/mpi_f08.F90
+++ b/src/binding/fortran/use_mpi_f08/mpi_f08.F90
@@ -4103,23 +4103,23 @@ interface MPI_Wtime
end function MPI_Wtime_f08
end interface MPI_Wtime
-interface MPIX_Aint_add
- function MPIX_Aint_add_f08(base, disp) result(res)
+interface MPI_Aint_add
+ function MPI_Aint_add_f08(base, disp) result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
implicit none
integer(MPI_ADDRESS_KIND), intent(in) :: base, disp
integer(MPI_ADDRESS_KIND) :: res
- end function MPIX_Aint_add_f08
-end interface MPIX_Aint_add
+ end function MPI_Aint_add_f08
+end interface MPI_Aint_add
-interface MPIX_Aint_diff
- function MPIX_Aint_diff_f08(addr1, addr2) result(res)
+interface MPI_Aint_diff
+ function MPI_Aint_diff_f08(addr1, addr2) result(res)
use :: mpi_f08_compile_constants, only : MPI_ADDRESS_KIND
implicit none
integer(MPI_ADDRESS_KIND), intent(in) :: addr1, addr2
integer(MPI_ADDRESS_KIND) :: res
- end function MPIX_Aint_diff_f08
-end interface MPIX_Aint_diff
+ end function MPI_Aint_diff_f08
+end interface MPI_Aint_diff
interface MPI_File_iread_all
subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90
index cf6ef8f..ade7aca 100644
--- a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90
+++ b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_add_f08ts.F90
@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory.
! 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_c_interface_nobuf, only : MPIR_Aint_add_c
implicit none
@@ -11,4 +11,4 @@ function MPIX_Aint_add_f08(base, disp) result(res)
integer(MPI_ADDRESS_KIND) :: res
res = MPIR_Aint_add_c(base, disp)
-end function MPIX_Aint_add_f08
\ No newline at end of file
+end function MPI_Aint_add_f08
\ No newline at end of file
diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90
index 7c20dec..a58ccee 100644
--- a/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90
+++ b/src/binding/fortran/use_mpi_f08/wrappers_f/aint_diff_f08ts.F90
@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory.
! 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_c_interface_nobuf, only : MPIR_Aint_diff_c
implicit none
@@ -11,4 +11,4 @@ function MPIX_Aint_diff_f08(addr1, addr2) result(res)
integer(MPI_ADDRESS_KIND) :: res
res = MPIR_Aint_diff_c(addr1, addr2)
-end function MPIX_Aint_diff_f08
+end function MPI_Aint_diff_f08
diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in
index c78ae17..0987a84 100644
--- a/src/include/mpi.h.in
+++ b/src/include/mpi.h.in
@@ -1547,8 +1547,8 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm);
int MPIX_Comm_agree(MPI_Comm comm, int *flag);
/* MPI_Aint addressing arithmetic */
-MPI_Aint MPIX_Aint_add(MPI_Aint base, MPI_Aint disp);
-MPI_Aint MPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2);
+MPI_Aint MPI_Aint_add(MPI_Aint base, MPI_Aint disp);
+MPI_Aint MPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2);
/* End Prototypes */
#endif /* MPICH_SUPPRESS_PROTOTYPES */
@@ -2193,8 +2193,8 @@ int PMPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm);
int PMPIX_Comm_agree(MPI_Comm comm, int *flag);
/* MPI_Aint addressing arithmetic */
-MPI_Aint PMPIX_Aint_add(MPI_Aint base, MPI_Aint disp);
-MPI_Aint PMPIX_Aint_diff(MPI_Aint addr1, MPI_Aint addr2);
+MPI_Aint PMPI_Aint_add(MPI_Aint base, MPI_Aint disp);
+MPI_Aint PMPI_Aint_diff(MPI_Aint addr1, MPI_Aint addr2);
#endif /* MPI_BUILD_PROFILING */
/* End of MPI bindings */
diff --git a/src/mpi/misc/aint_add.c b/src/mpi/misc/aint_add.c
index bcc8c82..8d42c19 100644
--- a/src/mpi/misc/aint_add.c
+++ b/src/mpi/misc/aint_add.c
@@ -7,31 +7,31 @@
#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)
-#pragma weak MPIX_Aint_add = PMPIX_Aint_add
+#pragma weak MPI_Aint_add = PMPI_Aint_add
#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)
-#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)
-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
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
-#undef MPIX_Aint_add
-#define MPIX_Aint_add PMPIX_Aint_add
+#undef MPI_Aint_add
+#define MPI_Aint_add PMPI_Aint_add
#endif
#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:
+ base - base address (integer)
@@ -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:
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;
- MPID_MPI_STATE_DECL(MPID_STATE_MPIX_AINT_ADD);
+ MPID_MPI_STATE_DECL(MPID_STATE_MPI_AINT_ADD);
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);
- MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_AINT_ADD);
+ MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_AINT_ADD);
return result;
}
diff --git a/src/mpi/misc/aint_diff.c b/src/mpi/misc/aint_diff.c
index 5c2e5cd..61147e4 100644
--- a/src/mpi/misc/aint_diff.c
+++ b/src/mpi/misc/aint_diff.c
@@ -7,31 +7,31 @@
#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)
-#pragma weak MPIX_Aint_diff = PMPIX_Aint_diff
+#pragma weak MPI_Aint_diff = PMPI_Aint_diff
#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)
-#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)
-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
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
-#undef MPIX_Aint_diff
-#define MPIX_Aint_diff PMPIX_Aint_diff
+#undef MPI_Aint_diff
+#define MPI_Aint_diff PMPI_Aint_diff
#endif
#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:
+ addr1 - minuend address (integer)
@@ -41,7 +41,7 @@ Return value:
Difference between addr1 and addr2
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
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
@@ -51,19 +51,19 @@ process that originally produced the addresses had called
(char *) addr1 - (char *) addr2
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;
- MPID_MPI_STATE_DECL(MPID_STATE_MPIX_AINT_DIFF);
+ MPID_MPI_STATE_DECL(MPID_STATE_MPI_AINT_DIFF);
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);
- MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_AINT_DIFF);
+ MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_AINT_DIFF);
return result;
}
diff --git a/test/mpi/f08/rma/aintf08.f90 b/test/mpi/f08/rma/aintf08.f90
index 96ddedd..cef75eb 100644
--- a/test/mpi/f08/rma/aintf08.f90
+++ b/test/mpi/f08/rma/aintf08.f90
@@ -52,10 +52,10 @@ program main
! Do MPI_Aint addressing arithmetic
if (rank == 0) then
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
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
! Get value and verify it
diff --git a/test/mpi/f08/rma/testlist.in b/test/mpi/f08/rma/testlist.in
index 3ae2013..a1f3d01 100644
--- a/test/mpi/f08/rma/testlist.in
+++ b/test/mpi/f08/rma/testlist.in
@@ -10,4 +10,4 @@ c2f2cwinf08 1
baseattrwinf08 1
winattrf08 1
winattr2f08 1
- at mpix@ aintf08 2 strict=false
+aintf08 2 strict=false
diff --git a/test/mpi/f77/rma/aintf.f b/test/mpi/f77/rma/aintf.f
index f7d67df..88739f6 100644
--- a/test/mpi/f77/rma/aintf.f
+++ b/test/mpi/f77/rma/aintf.f
@@ -21,8 +21,8 @@
integer :: win
integer :: intsize
- integer(kind=MPI_ADDRESS_KIND), external :: MPIX_Aint_add
- integer(kind=MPI_ADDRESS_KIND), external :: MPIX_Aint_diff
+ integer(kind=MPI_ADDRESS_KIND), external :: MPI_Aint_add
+ integer(kind=MPI_ADDRESS_KIND), external :: MPI_Aint_diff
errs = 0
call mtest_init(ierr);
@@ -60,10 +60,10 @@
! Do MPI_Aint addressing arithmetic
if (rank == 0) then
disp = intsize*511
- offset = MPIX_Aint_add(bases(1), disp)
+ offset = MPI_Aint_add(bases(1), disp)
else if (rank == 1) then
disp = intsize*512
- offset = MPIX_Aint_diff(bases(0), disp)
+ offset = MPI_Aint_diff(bases(0), disp)
endif
! Get value and verify it
diff --git a/test/mpi/f77/rma/testlist.in b/test/mpi/f77/rma/testlist.in
index 4884257..20112b8 100644
--- a/test/mpi/f77/rma/testlist.in
+++ b/test/mpi/f77/rma/testlist.in
@@ -10,4 +10,4 @@ c2f2cwinf 1
baseattrwinf 1
winattrf 1
winattr2f 1
- at mpix@ aintf 2 strict=false xfail=ticket1877
+aintf 2 strict=false xfail=ticket1877
diff --git a/test/mpi/rma/aint.c b/test/mpi/rma/aint.c
index 9eba621..888ecb4 100644
--- a/test/mpi/rma/aint.c
+++ b/test/mpi/rma/aint.c
@@ -55,10 +55,10 @@ int main(int argc, char **argv)
/* Do MPI_Aint addressing arithmetic */
if (rank == 0) {
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) {
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 */
diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in
index d7c8835..72ab28f 100644
--- a/test/mpi/rma/testlist.in
+++ b/test/mpi/rma/testlist.in
@@ -131,7 +131,7 @@ at_complete 2
atomic_rmw_fop 3
atomic_rmw_cas 3
atomic_rmw_gacc 3
- at mpix@ aint 2 strict=false
+aint 2 strict=false
## This test is not strictly correct. This was meant to test out the
## case when MPI_Test is not nonblocking. However, we ended up
http://git.mpich.org/mpich.git/commitdiff/077346f64f44dbd48eb7b7127b91dfa6a449b3b1
commit 077346f64f44dbd48eb7b7127b91dfa6a449b3b1
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Fri Feb 27 12:35:13 2015 -0600
Add Immediate versions of nonblocking coll. I/O
This commits moves the related internal MPIX_ names to MPI_ functions,
according to the new MPI 3.1 standard.
Functions affected:
MPI_File_iread_all
MPI_File_iwrite_all
MPI_File_iread_at_all
MPI_File_iwrite_at_all
See MPI forum ticket #273:
http://svn.mpi-forum.org/trac/mpi-forum-web/ticket/273
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08.F90 b/src/binding/fortran/use_mpi_f08/mpi_f08.F90
index de11fb2..ccde0e9 100644
--- a/src/binding/fortran/use_mpi_f08/mpi_f08.F90
+++ b/src/binding/fortran/use_mpi_f08/mpi_f08.F90
@@ -4121,8 +4121,8 @@ interface MPIX_Aint_diff
end function MPIX_Aint_diff_f08
end interface MPIX_Aint_diff
-interface MPIX_File_iread_all
- subroutine MPIX_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
+interface MPI_File_iread_all
+ subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
implicit none
type(MPI_File), intent(in) :: fh
@@ -4131,11 +4131,11 @@ interface MPIX_File_iread_all
type(MPI_Datatype), intent(in) :: datatype
type(MPI_Request), intent(out) :: request
integer, optional, intent(out) :: ierror
- end subroutine MPIX_File_iread_all_f08ts
-end interface MPIX_File_iread_all
+ end subroutine MPI_File_iread_all_f08ts
+end interface MPI_File_iread_all
-interface MPIX_File_iwrite_all
- subroutine MPIX_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
+interface MPI_File_iwrite_all
+ subroutine MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
implicit none
type(MPI_File), intent(in) :: fh
@@ -4144,11 +4144,11 @@ interface MPIX_File_iwrite_all
type(MPI_Datatype), intent(in) :: datatype
type(MPI_Request), intent(out) :: request
integer, optional, intent(out) :: ierror
- end subroutine MPIX_File_iwrite_all_f08ts
-end interface MPIX_File_iwrite_all
+ end subroutine MPI_File_iwrite_all_f08ts
+end interface MPI_File_iwrite_all
-interface MPIX_File_iread_at_all
- subroutine MPIX_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+interface MPI_File_iread_at_all
+ subroutine MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
use :: mpi_f08_compile_constants, only : MPI_OFFSET_KIND
implicit none
@@ -4159,11 +4159,11 @@ interface MPIX_File_iread_at_all
type(MPI_Datatype), intent(in) :: datatype
type(MPI_Request), intent(out) :: request
integer, optional, intent(out) :: ierror
- end subroutine MPIX_File_iread_at_all_f08ts
-end interface MPIX_File_iread_at_all
+ end subroutine MPI_File_iread_at_all_f08ts
+end interface MPI_File_iread_at_all
-interface MPIX_File_iwrite_at_all
- subroutine MPIX_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+interface MPI_File_iwrite_at_all
+ subroutine MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
use :: mpi_f08_compile_constants, only : MPI_OFFSET_KIND
implicit none
@@ -4174,7 +4174,7 @@ interface MPIX_File_iwrite_at_all
type(MPI_Datatype), intent(in) :: datatype
type(MPI_Request), intent(out) :: request
integer, optional, intent(out) :: ierror
- end subroutine MPIX_File_iwrite_at_all_f08ts
-end interface MPIX_File_iwrite_at_all
+ end subroutine MPI_File_iwrite_at_all_f08ts
+end interface MPI_File_iwrite_at_all
end module mpi_f08
diff --git a/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface b/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface
index f70e101..64425d6 100755
--- a/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface
+++ b/src/binding/fortran/use_mpi_f08/wrappers_c/buildiface
@@ -146,10 +146,10 @@ my %bufpos = (
"MPI_Win_attach" => [1, -1, -1],
"MPI_Win_create" => [0, -1, -1],
"MPI_Win_detach" => [1, -1, -1],
- "MPIX_File_iread_all" => [1, 2, 3],
- "MPIX_File_iread_at_all" => [2, 3, 4],
- "MPIX_File_iwrite_all" => [1, 2, 3],
- "MPIX_File_iwrite_at_all" => [2, 3, 4]
+ "MPI_File_iread_all" => [1, 2, 3],
+ "MPI_File_iread_at_all" => [2, 3, 4],
+ "MPI_File_iwrite_all" => [1, 2, 3],
+ "MPI_File_iwrite_at_all" => [2, 3, 4]
);
# Choice buffers in some functions can be passed in MPI_IN_PLACE. We store such
diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90
index 72c86b6..cbaa860 100644
--- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90
+++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_all_f08ts.F90
@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory.
! See COPYRIGHT in top-level directory.
!
-subroutine MPIX_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
+subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
use, intrinsic :: iso_c_binding, only : c_loc, c_associated
use, intrinsic :: iso_c_binding, only : c_int, c_ptr
use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request
@@ -39,4 +39,4 @@ subroutine MPIX_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
if (present(ierror)) ierror = ierror_c
-end subroutine MPIX_File_iread_all_f08ts
+end subroutine MPI_File_iread_all_f08ts
diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90
index fe68cfc..7e42c1a 100644
--- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90
+++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iread_at_all_f08ts.F90
@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory.
! See COPYRIGHT in top-level directory.
!
-subroutine MPIX_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+subroutine MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
use, intrinsic :: iso_c_binding, only : c_loc, c_associated
use, intrinsic :: iso_c_binding, only : c_int, c_ptr
use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request
@@ -43,4 +43,4 @@ subroutine MPIX_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, reques
if (present(ierror)) ierror = ierror_c
-end subroutine MPIX_File_iread_at_all_f08ts
+end subroutine MPI_File_iread_at_all_f08ts
diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90
index 469555a..b4b1893 100644
--- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90
+++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_all_f08ts.F90
@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory.
! See COPYRIGHT in top-level directory.
!
-subroutine MPIX_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
+subroutine MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
use, intrinsic :: iso_c_binding, only : c_loc, c_associated
use, intrinsic :: iso_c_binding, only : c_int, c_ptr
use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request
@@ -39,4 +39,4 @@ subroutine MPIX_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
if (present(ierror)) ierror = ierror_c
-end subroutine MPIX_File_iwrite_all_f08ts
+end subroutine MPI_File_iwrite_all_f08ts
diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90 b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90
index b5ed93f..0be29ac 100644
--- a/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90
+++ b/src/binding/fortran/use_mpi_f08/wrappers_f/file_iwrite_at_all_f08ts.F90
@@ -3,7 +3,7 @@
! (C) 2014 by Argonne National Laboratory.
! See COPYRIGHT in top-level directory.
!
-subroutine MPIX_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+subroutine MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
use, intrinsic :: iso_c_binding, only : c_loc, c_associated
use, intrinsic :: iso_c_binding, only : c_int, c_ptr
use :: mpi_f08, only : MPI_File, MPI_Datatype, MPI_Request
@@ -43,4 +43,4 @@ subroutine MPIX_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, reque
if (present(ierror)) ierror = ierror_c
-end subroutine MPIX_File_iwrite_at_all_f08ts
+end subroutine MPI_File_iwrite_at_all_f08ts
diff --git a/src/mpi/romio/include/mpio.h.in b/src/mpi/romio/include/mpio.h.in
index 2238f4b..1f3f382 100644
--- a/src/mpi/romio/include/mpio.h.in
+++ b/src/mpi/romio/include/mpio.h.in
@@ -239,16 +239,16 @@ int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler);
#endif
/* For MPI 3.1 */
-int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,
+int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,
MPI_Datatype datatype, MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5);
-int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
+int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
MPI_Datatype datatype, MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5);
-int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
+int MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4);
-int MPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
+int MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4);
/* End Prototypes */
@@ -468,16 +468,16 @@ int PMPI_File_get_errhandler( MPI_File, MPI_Errhandler * );
#endif
/* For MPI 3.1 */
-int PMPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,
+int PMPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,
MPI_Datatype datatype, MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5);
-int PMPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
+int PMPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
MPI_Datatype datatype, MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5);
-int PMPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
+int PMPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4);
-int PMPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
+int PMPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
MPI_Request *request)
MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4);
diff --git a/src/mpi/romio/mpi-io/iread_all.c b/src/mpi/romio/mpi-io/iread_all.c
index ba36161..4aa980b 100644
--- a/src/mpi/romio/mpi-io/iread_all.c
+++ b/src/mpi/romio/mpi-io/iread_all.c
@@ -9,16 +9,16 @@
#ifdef HAVE_WEAK_SYMBOLS
#if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPIX_File_iread_all = PMPIX_File_iread_all
+#pragma weak MPI_File_iread_all = PMPI_File_iread_all
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPIX_File_iread_all MPIX_File_iread_all
+#pragma _HP_SECONDARY_DEF PMPI_File_iread_all MPI_File_iread_all
#elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPIX_File_iread_all as PMPIX_File_iread_all
+#pragma _CRI duplicate MPI_File_iread_all as PMPI_File_iread_all
/* end of weak pragmas */
#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
+int MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
MPI_Request *request)
- __attribute__((weak,alias("PMPIX_File_iread_all")));
+ __attribute__((weak,alias("PMPI_File_iread_all")));
#endif
/* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype
#endif
/*@
- MPIX_File_iread_all - Nonblocking collective read using individual file pointer
+ MPI_File_iread_all - Nonblocking collective read using individual file pointer
Input Parameters:
. fh - file handle (handle)
@@ -44,11 +44,11 @@ Output Parameters:
.N fortran
@*/
-int MPIX_File_iread_all(MPI_File fh, void *buf, int count,
+int MPI_File_iread_all(MPI_File fh, void *buf, int count,
MPI_Datatype datatype, MPI_Request *request)
{
int error_code;
- static char myname[] = "MPIX_FILE_IREAD_ALL";
+ static char myname[] = "MPI_FILE_IREAD_ALL";
#ifdef MPI_hpux
int fl_xmpi;
@@ -72,7 +72,7 @@ int MPIX_File_iread_all(MPI_File fh, void *buf, int count,
return error_code;
}
-/* Note: MPIOI_File_iread_all also used by MPIX_File_iread_at_all */
+/* Note: MPIOI_File_iread_all also used by MPI_File_iread_at_all */
/* prevent multiple definitions of this routine */
#ifdef MPIO_BUILD_PROFILING
int MPIOI_File_iread_all(MPI_File fh,
diff --git a/src/mpi/romio/mpi-io/iread_atall.c b/src/mpi/romio/mpi-io/iread_atall.c
index 1a9d718..da9326a 100644
--- a/src/mpi/romio/mpi-io/iread_atall.c
+++ b/src/mpi/romio/mpi-io/iread_atall.c
@@ -9,16 +9,16 @@
#ifdef HAVE_WEAK_SYMBOLS
#if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPIX_File_iread_at_all = PMPIX_File_iread_at_all
+#pragma weak MPI_File_iread_at_all = PMPI_File_iread_at_all
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPIX_File_iread_at_all MPIX_File_iread_at_all
+#pragma _HP_SECONDARY_DEF PMPI_File_iread_at_all MPI_File_iread_at_all
#elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPIX_File_iread_at_all as PMPIX_File_iread_at_all
+#pragma _CRI duplicate MPI_File_iread_at_all as PMPI_File_iread_at_all
/* end of weak pragmas */
#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count,
+int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count,
MPI_Datatype datatype, MPI_Request *request)
- __attribute__((weak,alias("PMPIX_File_iread_at_all")));
+ __attribute__((weak,alias("PMPI_File_iread_at_all")));
#endif
/* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count
#endif
/*@
- MPIX_File_iread_at_all - Nonblocking collective read using explicit offset
+ MPI_File_iread_at_all - Nonblocking collective read using explicit offset
Input Parameters:
. fh - file handle (handle)
@@ -45,12 +45,12 @@ Output Parameters:
.N fortran
@*/
-int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf,
+int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf,
int count, MPI_Datatype datatype,
MPI_Request *request)
{
int error_code;
- static char myname[] = "MPIX_FILE_IREAD_AT_ALL";
+ static char myname[] = "MPI_FILE_IREAD_AT_ALL";
#ifdef MPI_hpux
int fl_xmpi;
diff --git a/src/mpi/romio/mpi-io/iwrite_all.c b/src/mpi/romio/mpi-io/iwrite_all.c
index aeed90d..81de3b5 100644
--- a/src/mpi/romio/mpi-io/iwrite_all.c
+++ b/src/mpi/romio/mpi-io/iwrite_all.c
@@ -9,16 +9,16 @@
#ifdef HAVE_WEAK_SYMBOLS
#if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPIX_File_iwrite_all = PMPIX_File_iwrite_all
+#pragma weak MPI_File_iwrite_all = PMPI_File_iwrite_all
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPIX_File_iwrite_all MPIX_File_iwrite_all
+#pragma _HP_SECONDARY_DEF PMPI_File_iwrite_all MPI_File_iwrite_all
#elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPIX_File_iwrite_all as PMPIX_File_iwrite_all
+#pragma _CRI duplicate MPI_File_iwrite_all as PMPI_File_iwrite_all
/* end of weak pragmas */
#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
+int MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
MPI_Request *request)
- __attribute__((weak,alias("PMPIX_File_iwrite_all")));
+ __attribute__((weak,alias("PMPI_File_iwrite_all")));
#endif
/* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype d
#endif
/*@
- MPIX_File_iwrite_all - Nonblocking collective write using individual file pointer
+ MPI_File_iwrite_all - Nonblocking collective write using individual file pointer
Input Parameters:
. fh - file handle (handle)
@@ -44,11 +44,11 @@ Output Parameters:
.N fortran
@*/
-int MPIX_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count,
+int MPI_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count,
MPI_Datatype datatype, MPI_Request *request)
{
int error_code;
- static char myname[] = "MPIX_FILE_IWRITE_ALL";
+ static char myname[] = "MPI_FILE_IWRITE_ALL";
#ifdef MPI_hpux
int fl_xmpi;
@@ -66,7 +66,7 @@ int MPIX_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count,
return error_code;
}
-/* Note: MPIOI_File_iwrite_all also used by MPIX_File_iwrite_at_all */
+/* Note: MPIOI_File_iwrite_all also used by MPI_File_iwrite_at_all */
/* prevent multiple definitions of this routine */
#ifdef MPIO_BUILD_PROFILING
int MPIOI_File_iwrite_all(MPI_File fh,
diff --git a/src/mpi/romio/mpi-io/iwrite_atall.c b/src/mpi/romio/mpi-io/iwrite_atall.c
index c5eba79..9c0564e 100644
--- a/src/mpi/romio/mpi-io/iwrite_atall.c
+++ b/src/mpi/romio/mpi-io/iwrite_atall.c
@@ -9,16 +9,16 @@
#ifdef HAVE_WEAK_SYMBOLS
#if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPIX_File_iwrite_at_all = PMPIX_File_iwrite_at_all
+#pragma weak MPI_File_iwrite_at_all = PMPI_File_iwrite_at_all
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPIX_File_iwrite_at_all MPIX_File_iwrite_at_all
+#pragma _HP_SECONDARY_DEF PMPI_File_iwrite_at_all MPI_File_iwrite_at_all
#elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPIX_File_iwrite_at_all as PMPIX_File_iwrite_at_all
+#pragma _CRI duplicate MPI_File_iwrite_at_all as PMPI_File_iwrite_at_all
/* end of weak pragmas */
#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
+int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
MPI_Datatype datatype, MPI_Request *request)
- __attribute__((weak,alias("PMPIX_File_iwrite_at_all")));
+ __attribute__((weak,alias("PMPI_File_iwrite_at_all")));
#endif
/* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int
#endif
/*@
- MPIX_File_iwrite_at_all - Nonblocking collective write using explicit offset
+ MPI_File_iwrite_at_all - Nonblocking collective write using explicit offset
Input Parameters:
. fh - file handle (handle)
@@ -45,12 +45,12 @@ Output Parameters:
.N fortran
@*/
-int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf,
+int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf,
int count, MPI_Datatype datatype,
MPI_Request *request)
{
int error_code;
- static char myname[] = "MPIX_FILE_IWRITE_AT_ALL";
+ static char myname[] = "MPI_FILE_IWRITE_AT_ALL";
#ifdef MPI_hpux
int fl_xmpi;
diff --git a/src/mpi/romio/mpi-io/mpioprof.h b/src/mpi/romio/mpi-io/mpioprof.h
index 15654ac..f3ee3b4 100644
--- a/src/mpi/romio/mpi-io/mpioprof.h
+++ b/src/mpi/romio/mpi-io/mpioprof.h
@@ -70,14 +70,14 @@
#undef MPI_File_get_byte_offset
#define MPI_File_get_byte_offset PMPI_File_get_byte_offset
-#undef MPIX_File_iread_at_all
-#define MPIX_File_iread_at_all PMPIX_File_iread_at_all
-#undef MPIX_File_iwrite_at_all
-#define MPIX_File_iwrite_at_all PMPIX_File_iwrite_at_all
-#undef MPIX_File_iread_all
-#define MPIX_File_iread_all PMPIX_File_iread_all
-#undef MPIX_File_iwrite_all
-#define MPIX_File_iwrite_all PMPIX_File_iwrite_all
+#undef MPI_File_iread_at_all
+#define MPI_File_iread_at_all PMPI_File_iread_at_all
+#undef MPI_File_iwrite_at_all
+#define MPI_File_iwrite_at_all PMPI_File_iwrite_at_all
+#undef MPI_File_iread_all
+#define MPI_File_iread_all PMPI_File_iread_all
+#undef MPI_File_iwrite_all
+#define MPI_File_iwrite_all PMPI_File_iwrite_all
#undef MPI_File_read_shared
#define MPI_File_read_shared PMPI_File_read_shared
diff --git a/test/mpi/f08/io/i_fcoll_test.f90 b/test/mpi/f08/io/i_fcoll_test.f90
index 29bc82a..cdf53d2 100644
--- a/test/mpi/f08/io/i_fcoll_test.f90
+++ b/test/mpi/f08/io/i_fcoll_test.f90
@@ -108,7 +108,7 @@ call MPI_FILE_OPEN(MPI_COMM_WORLD, str, MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_
disp = 0
call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", MPI_INFO_NULL, ierr)
-call MPIX_FILE_IWRITE_ALL(fh, writebuf, bufcount, MPI_INTEGER, request, ierr)
+call MPI_FILE_IWRITE_ALL(fh, writebuf, bufcount, MPI_INTEGER, request, ierr)
call MPI_WAIT(request, status, ierr)
call MPI_FILE_CLOSE(fh, ierr)
@@ -117,7 +117,7 @@ call MPI_FILE_CLOSE(fh, ierr)
call MPI_FILE_OPEN(MPI_COMM_WORLD, str, MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr)
call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", MPI_INFO_NULL, ierr)
-call MPIX_FILE_IREAD_ALL(fh, readbuf, bufcount, MPI_INTEGER, request, ierr)
+call MPI_FILE_IREAD_ALL(fh, readbuf, bufcount, MPI_INTEGER, request, ierr)
call MPI_WAIT(request, status, ierr)
call MPI_FILE_CLOSE(fh, ierr)
diff --git a/test/mpi/f08/io/ioharness.defn b/test/mpi/f08/io/ioharness.defn
index 5a7d756..1a38ef8 100644
--- a/test/mpi/f08/io/ioharness.defn
+++ b/test/mpi/f08/io/ioharness.defn
@@ -258,7 +258,7 @@ integer (kind=MPI_OFFSET_KIND)offset
do k=1, b
<setContigBuffer/>
<findOffset/>
- call MPIX_File_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+ call MPI_File_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
call MPI_Wait(request, status, ierr)
<checkErr/>
enddo
@@ -270,7 +270,7 @@ enddo
do k=1, b
<clearContigBuffer/>
<findOffset/>
- call MPIX_File_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+ call MPI_File_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
call MPI_Wait(request, status, ierr)
<checkErr/>
<checkContigBuffer/>
diff --git a/test/mpi/f08/io/testlist.in b/test/mpi/f08/io/testlist.in
index d2dd57d..7395025 100644
--- a/test/mpi/f08/io/testlist.in
+++ b/test/mpi/f08/io/testlist.in
@@ -18,5 +18,5 @@ miscfilef90 4
setviewcurf90 4
c2f2ciof90 1
c2f90multio 1
- at mpix@ i_fcoll_test 4
- at mpix@ iwriteatallf90 4
+i_fcoll_test 4
+iwriteatallf90 4
diff --git a/test/mpi/f77/io/i_setviewcurf.f b/test/mpi/f77/io/i_setviewcurf.f
index 15b222e..1f672d3 100644
--- a/test/mpi/f77/io/i_setviewcurf.f
+++ b/test/mpi/f77/io/i_setviewcurf.f
@@ -37,7 +37,7 @@ C using a combination of collective and ordered writes
endif
buf(1) = size
- call MPIX_File_iwrite_all( fh, buf, 1, MPI_INTEGER, request, ierr)
+ call MPI_File_iwrite_all( fh, buf, 1, MPI_INTEGER, request, ierr)
if (ierr .ne. MPI_SUCCESS) then
errs = errs + 1
call MTestPrintErrorMsg( "iwrite_all", ierr )
diff --git a/test/mpi/f77/io/ioharness.defn b/test/mpi/f77/io/ioharness.defn
index 22d143c..2fd0863 100644
--- a/test/mpi/f77/io/ioharness.defn
+++ b/test/mpi/f77/io/ioharness.defn
@@ -258,7 +258,7 @@ include 'iooffset.h'
do k=1, b
<setContigBuffer/>
<findOffset/>
- call mpix_file_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+ call mpi_file_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
call mpi_wait(request, status, ierr)
<checkErr/>
enddo
@@ -270,7 +270,7 @@ enddo
do k=1, b
<clearContigBuffer/>
<findOffset/>
- call mpix_file_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+ call mpi_file_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
call mpi_wait(request, status, ierr)
<checkErr/>
<checkContigBuffer/>
diff --git a/test/mpi/f77/io/testlist.in b/test/mpi/f77/io/testlist.in
index 51646b1..c14cd52 100644
--- a/test/mpi/f77/io/testlist.in
+++ b/test/mpi/f77/io/testlist.in
@@ -18,5 +18,5 @@ miscfilef 4
setviewcurf 4
c2f2ciof 1
c2fmultio 1
- at mpix@ i_setviewcurf 4
- at mpix@ iwriteatallf 4
+i_setviewcurf 4
+iwriteatallf 4
diff --git a/test/mpi/io/i_aggregation1.c b/test/mpi/io/i_aggregation1.c
index d36d821..67d39f0 100644
--- a/test/mpi/io/i_aggregation1.c
+++ b/test/mpi/io/i_aggregation1.c
@@ -112,7 +112,7 @@ static void write_file(char *target, int rank, MPI_Info *info)
buffer[i] = (char *)malloc(OBJ_SIZE);
fill_buffer(buffer[i], OBJ_SIZE, rank, offset);
if (debug) printf("%s", buffer[i]);
- if ((mpi_ret = MPIX_File_iwrite_at_all(wfh, offset, buffer[i], OBJ_SIZE,
+ if ((mpi_ret = MPI_File_iwrite_at_all(wfh, offset, buffer[i], OBJ_SIZE,
MPI_CHAR, &request[i]))
!= MPI_SUCCESS) {
fatal_error(mpi_ret, NULL, "write");
@@ -176,7 +176,7 @@ static void read_file(char *target, int rank, MPI_Info *info, int *corrupt_block
verify_buf[i] = (char *)malloc(OBJ_SIZE);
fill_buffer(verify_buf[i], OBJ_SIZE, rank, offset[i]);
if (debug) printf("Expecting %s", verify_buf[i]);
- if ((mpi_ret = MPIX_File_iread_at_all(rfh, offset[i], buffer[i],
+ if ((mpi_ret = MPI_File_iread_at_all(rfh, offset[i], buffer[i],
OBJ_SIZE, MPI_CHAR, &request[i]))
!= MPI_SUCCESS) {
fatal_error(mpi_ret, NULL, "read");
diff --git a/test/mpi/io/i_aggregation2.c b/test/mpi/io/i_aggregation2.c
index 0ead78e..99b0be4 100644
--- a/test/mpi/io/i_aggregation2.c
+++ b/test/mpi/io/i_aggregation2.c
@@ -60,9 +60,9 @@ int main(int argc, char **argv)
errcode = MPI_File_open(MPI_COMM_WORLD, filename,
MPI_MODE_WRONLY | MPI_MODE_CREATE, info, &fh);
if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_open");
- errcode = MPIX_File_iwrite_at_all(fh, off, buffer, BUFSIZE, MPI_INT,
+ errcode = MPI_File_iwrite_at_all(fh, off, buffer, BUFSIZE, MPI_INT,
&request);
- if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iwrite_at_all");
+ if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iwrite_at_all");
MPI_Wait(&request, &status);
errcode = MPI_File_close(&fh);
if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_close");
@@ -70,9 +70,9 @@ int main(int argc, char **argv)
errcode = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info,
&fh);
if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_open");
- errcode = MPIX_File_iread_at_all(fh, off, buf2, BUFSIZE, MPI_INT,
+ errcode = MPI_File_iread_at_all(fh, off, buf2, BUFSIZE, MPI_INT,
&request);
- if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iread_at_all");
+ if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iread_at_all");
MPI_Wait(&request, &status);
errcode = MPI_File_close(&fh);
if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_close");
diff --git a/test/mpi/io/i_bigtype.c b/test/mpi/io/i_bigtype.c
index 301b54c..a5968a9 100644
--- a/test/mpi/io/i_bigtype.c
+++ b/test/mpi/io/i_bigtype.c
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
}
/* write everything */
- rc = MPIX_File_iwrite_at_all(fh, 0, buf_write, 1, mem_type, &request);
+ rc = MPI_File_iwrite_at_all(fh, 0, buf_write, 1, mem_type, &request);
if (rc != MPI_SUCCESS) {
printf("%d ERROR IWRITE AT ALL\n", rc);
exit(1);
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
}
/* read everything */
- rc = MPIX_File_iread_at_all(fh, 0, buf_read, 1, mem_type, &request);
+ rc = MPI_File_iread_at_all(fh, 0, buf_read, 1, mem_type, &request);
if (rc != MPI_SUCCESS) {
printf("%d ERROR IREAD AT ALL\n", rc);
exit(1);
diff --git a/test/mpi/io/i_coll_test.c b/test/mpi/io/i_coll_test.c
index 982f4e5..5f65cc5 100644
--- a/test/mpi/io/i_coll_test.c
+++ b/test/mpi/io/i_coll_test.c
@@ -122,8 +122,8 @@ int main(int argc, char **argv)
errcode = MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", info);
if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_set_view");
- errcode = MPIX_File_iwrite_all(fh, writebuf, bufcount, MPI_INT, &request);
- if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iwrite_all");
+ errcode = MPI_File_iwrite_all(fh, writebuf, bufcount, MPI_INT, &request);
+ if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iwrite_all");
MPI_Wait(&request, &status);
errcode = MPI_File_close(&fh);
@@ -163,8 +163,8 @@ int main(int argc, char **argv)
errcode = MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", info);
if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_set_view");
- errcode = MPIX_File_iread_all(fh, readbuf, bufcount, MPI_INT, &request);
- if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iread_all");
+ errcode = MPI_File_iread_all(fh, readbuf, bufcount, MPI_INT, &request);
+ if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iread_all");
MPI_Wait(&request, &status);
errcode = MPI_File_close(&fh);
if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_close");
diff --git a/test/mpi/io/i_darray_read.c b/test/mpi/io/i_darray_read.c
index dccb660..8fc970d 100644
--- a/test/mpi/io/i_darray_read.c
+++ b/test/mpi/io/i_darray_read.c
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
MPI_INFO_NULL, &mpi_fh));
CHECK(MPI_File_set_view(mpi_fh, 0, MPI_DOUBLE, darray, "native",
MPI_INFO_NULL));
- CHECK(MPIX_File_iread_all(mpi_fh, ldata, nelem, MPI_DOUBLE, &request));
+ CHECK(MPI_File_iread_all(mpi_fh, ldata, nelem, MPI_DOUBLE, &request));
CHECK(MPI_Wait(&request, &status));
CHECK(MPI_File_close(&mpi_fh));
diff --git a/test/mpi/io/i_hindexed.c b/test/mpi/io/i_hindexed.c
index f8523ed..93471eb 100644
--- a/test/mpi/io/i_hindexed.c
+++ b/test/mpi/io/i_hindexed.c
@@ -174,7 +174,7 @@ int main(int argc, char **argv)
offset = i * global_array_size;
/* set the file view */
MPI_File_set_view(fh, offset, MPI_BYTE, ftype, "native", MPI_INFO_NULL);
- MPIX_File_iwrite_all(fh, buf, ftype_size, MPI_CHAR, &request[i]);
+ MPI_File_iwrite_all(fh, buf, ftype_size, MPI_CHAR, &request[i]);
}
MPI_Waitall(num_io, request, statuses);
MPI_File_close(&fh);
diff --git a/test/mpi/io/i_hindexed_io.c b/test/mpi/io/i_hindexed_io.c
index 5b17819..40e9f99 100644
--- a/test/mpi/io/i_hindexed_io.c
+++ b/test/mpi/io/i_hindexed_io.c
@@ -71,13 +71,13 @@ int main(int argc, char **argv)
MPI_INFO_NULL));
/* write everything */
- CHECK(MPIX_File_iwrite_at_all(fh, 0, data, 1, mem_type, &request));
+ CHECK(MPI_File_iwrite_at_all(fh, 0, data, 1, mem_type, &request));
MPI_Wait(&request, &status);
/* verify */
CHECK(MPI_File_set_view(fh, 0, MPI_BYTE, MPI_BYTE, "native",
MPI_INFO_NULL));
- CHECK(MPIX_File_iread_at_all(fh, 0,
+ CHECK(MPI_File_iread_at_all(fh, 0,
verify, (HEADER + PAD + BLK_COUNT * DATA_SIZE) / sizeof(int),
MPI_INT, &request));
MPI_Wait(&request, &status);
diff --git a/test/mpi/io/i_noncontig_coll.c b/test/mpi/io/i_noncontig_coll.c
index f625e9b..474023d 100644
--- a/test/mpi/io/i_noncontig_coll.c
+++ b/test/mpi/io/i_noncontig_coll.c
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
for (i = 0; i < SIZE; i++)
buf[i] = i + mynod * SIZE;
- MPIX_File_iwrite_all(fh, buf, 1, newtype, &request);
+ MPI_File_iwrite_all(fh, buf, 1, newtype, &request);
MPI_Barrier(MPI_COMM_WORLD);
MPI_Wait(&request, &status);
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
for (i = 0; i < SIZE; i++)
buf[i] = -1;
- MPIX_File_iread_at_all(fh, 0, buf, 1, newtype, &request);
+ MPI_File_iread_at_all(fh, 0, buf, 1, newtype, &request);
MPI_Wait(&request, &status);
for (i = 0; i < SIZE; i++) {
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
MPI_INFO_NULL, &fh);
for (i = 0; i < SIZE; i++) buf[i] = i + mynod * SIZE;
- MPIX_File_iwrite_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1,
+ MPI_File_iwrite_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1,
newtype, &request);
MPI_Barrier(MPI_COMM_WORLD);
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
for (i = 0; i < SIZE; i++) buf[i] = -1;
- MPIX_File_iread_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1,
+ MPI_File_iread_at_all(fh, mynod * (SIZE / 2) * sizeof(int), buf, 1,
newtype, &request);
MPI_Wait(&request, &status);
@@ -192,7 +192,7 @@ int main(int argc, char **argv)
MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", MPI_INFO_NULL);
for (i = 0; i < SIZE; i++) buf[i] = i + mynod * SIZE;
- MPIX_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request);
+ MPI_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request);
MPI_Barrier(MPI_COMM_WORLD);
MPI_Wait(&request, &status);
@@ -200,7 +200,7 @@ int main(int argc, char **argv)
for (i = 0; i < SIZE; i++)
buf[i] = -1;
- MPIX_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request);
+ MPI_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request);
MPI_Wait(&request, &status);
for (i = 0; i < SIZE; i++) {
diff --git a/test/mpi/io/i_noncontig_coll2.c b/test/mpi/io/i_noncontig_coll2.c
index 83d8ab8..3b97f24 100644
--- a/test/mpi/io/i_noncontig_coll2.c
+++ b/test/mpi/io/i_noncontig_coll2.c
@@ -402,9 +402,9 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts,
MPI_File_set_view(fh, 0, MPI_INT, newtype, "native", info);
for (i = 0; i < SIZE; i++) buf[i] = SEEDER(mynod, i, SIZE);
- errcode = MPIX_File_iwrite_all(fh, buf, 1, newtype, &request);
+ errcode = MPI_File_iwrite_all(fh, buf, 1, newtype, &request);
if (errcode != MPI_SUCCESS) {
- handle_error(errcode, "nc mem - nc file: MPIX_File_iwrite_all");
+ handle_error(errcode, "nc mem - nc file: MPI_File_iwrite_all");
}
MPI_Barrier(MPI_COMM_WORLD);
@@ -412,9 +412,9 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts,
for (i = 0; i < SIZE; i++) buf[i] = -1;
- errcode = MPIX_File_iread_at_all(fh, 0, buf, 1, newtype, &request);
+ errcode = MPI_File_iread_at_all(fh, 0, buf, 1, newtype, &request);
if (errcode != MPI_SUCCESS) {
- handle_error(errcode, "nc mem - nc file: MPIX_File_iread_at_all");
+ handle_error(errcode, "nc mem - nc file: MPI_File_iread_at_all");
}
MPI_Wait(&request, &status);
@@ -467,10 +467,10 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts,
info, &fh);
for (i = 0; i < SIZE; i++) buf[i] = SEEDER(mynod, i, SIZE);
- errcode = MPIX_File_iwrite_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int),
+ errcode = MPI_File_iwrite_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int),
buf, 1, newtype, &request);
if (errcode != MPI_SUCCESS)
- handle_error(errcode, "nc mem - c file: MPIX_File_iwrite_at_all");
+ handle_error(errcode, "nc mem - c file: MPI_File_iwrite_at_all");
MPI_Barrier(MPI_COMM_WORLD);
MPI_Wait(&request, &status);
@@ -478,10 +478,10 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts,
for (i = 0; i < SIZE; i++)
buf[i] = -1;
- errcode = MPIX_File_iread_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int),
+ errcode = MPI_File_iread_at_all(fh, mynod * (SIZE / nprocs) * sizeof(int),
buf, 1, newtype, &request);
if (errcode != MPI_SUCCESS)
- handle_error(errcode, "nc mem - c file: MPIX_File_iread_at_all");
+ handle_error(errcode, "nc mem - c file: MPI_File_iread_at_all");
MPI_Wait(&request, &status);
/* just like as above */
@@ -527,18 +527,18 @@ int test_file(char *filename, int mynod, int nprocs, char *cb_hosts,
for (i = 0; i < SIZE; i++)
buf[i] = SEEDER(mynod, i, SIZE);
- errcode = MPIX_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request);
+ errcode = MPI_File_iwrite_all(fh, buf, SIZE, MPI_INT, &request);
if (errcode != MPI_SUCCESS)
- handle_error(errcode, "c mem - nc file: MPIX_File_iwrite_all");
+ handle_error(errcode, "c mem - nc file: MPI_File_iwrite_all");
MPI_Barrier(MPI_COMM_WORLD);
MPI_Wait(&request, &status);
for (i = 0; i < SIZE; i++) buf[i] = -1;
- errcode = MPIX_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request);
+ errcode = MPI_File_iread_at_all(fh, 0, buf, SIZE, MPI_INT, &request);
if (errcode != MPI_SUCCESS)
- handle_error(errcode, "c mem - nc file: MPIX_File_iread_at_all");
+ handle_error(errcode, "c mem - nc file: MPI_File_iread_at_all");
MPI_Wait(&request, &status);
/* same crazy checking */
diff --git a/test/mpi/io/i_rdwrord.c b/test/mpi/io/i_rdwrord.c
index ca4d625..eed3f7b 100644
--- a/test/mpi/io/i_rdwrord.c
+++ b/test/mpi/io/i_rdwrord.c
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
/* Set the individual pointer to 0, since we want to use a iread_all */
MPI_File_seek(fh, 0, MPI_SEEK_SET);
- rc = MPIX_File_iread_all(fh, buf, size, MPI_INT, &request);
+ rc = MPI_File_iread_all(fh, buf, size, MPI_INT, &request);
if (rc != MPI_SUCCESS) {
MTestPrintErrorMsg("File_iread_all", rc);
errs++;
diff --git a/test/mpi/io/i_setviewcur.c b/test/mpi/io/i_setviewcur.c
index c696628..61e1558 100644
--- a/test/mpi/io/i_setviewcur.c
+++ b/test/mpi/io/i_setviewcur.c
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
MPI_Comm_rank(comm, &rank);
buf = (int *) malloc(size * sizeof(int));
buf[0] = size;
- err = MPIX_File_iwrite_all(fh, buf, 1, MPI_INT, &request);
+ err = MPI_File_iwrite_all(fh, buf, 1, MPI_INT, &request);
if (err) {
errs++;
MTestPrintErrorMsg("Iwrite_all", err);
diff --git a/test/mpi/io/i_types_with_zeros.c b/test/mpi/io/i_types_with_zeros.c
index 3f32030..d18b065 100644
--- a/test/mpi/io/i_types_with_zeros.c
+++ b/test/mpi/io/i_types_with_zeros.c
@@ -100,8 +100,8 @@ static int test_indexed_with_zeros(char *filename, int testcase)
if (err != MPI_SUCCESS) handle_error(err, "MPI_File_open");
err = MPI_File_set_view(fh, 0, MPI_INT, filetype, "native", MPI_INFO_NULL);
if (err != MPI_SUCCESS) handle_error(err, "MPI_File_set_view");
- err = MPIX_File_iwrite_all(fh, buf, buflen, MPI_INT, &request);
- if (err != MPI_SUCCESS) handle_error(err, "MPIX_File_iwrite_all");
+ err = MPI_File_iwrite_all(fh, buf, buflen, MPI_INT, &request);
+ if (err != MPI_SUCCESS) handle_error(err, "MPI_File_iwrite_all");
err = MPI_Wait(&request, &status);
if (err != MPI_SUCCESS) handle_error(err, "MPI_Wait");
MPI_Type_free(&filetype);
diff --git a/test/mpi/io/testlist.in b/test/mpi/io/testlist.in
index 89ccf48..28ae25b 100644
--- a/test/mpi/io/testlist.in
+++ b/test/mpi/io/testlist.in
@@ -11,15 +11,15 @@ resized 1
resized2 1 xfail=ticket2088
bigtype 1
hindexed_io 1
- at mpix@ i_bigtype 1
- at mpix@ i_hindexed_io 1
- at mpix@ i_rdwrord 4
- at mpix@ i_setviewcur 4
- at mpix@ i_aggregation1 4
- at mpix@ i_aggregation2 4
- at mpix@ i_coll_test 4
- at mpix@ i_darray_read 4
- at mpix@ i_hindexed 4
- at mpix@ i_noncontig_coll 2
- at mpix@ i_noncontig_coll2 4
- at mpix@ i_types_with_zeros 2
+i_bigtype 1
+i_hindexed_io 1
+i_rdwrord 4
+i_setviewcur 4
+i_aggregation1 4
+i_aggregation2 4
+i_coll_test 4
+i_darray_read 4
+i_hindexed 4
+i_noncontig_coll 2
+i_noncontig_coll2 4
+i_types_with_zeros 2
-----------------------------------------------------------------------
Summary of changes:
src/binding/fortran/mpif_h/buildiface | 30 ++++++------
.../fortran/use_mpi_f08/mpi_c_interface_nobuf.F90 | 4 +-
src/binding/fortran/use_mpi_f08/mpi_f08.F90 | 48 ++++++++++----------
.../fortran/use_mpi_f08/wrappers_c/buildiface | 8 ++--
.../use_mpi_f08/wrappers_f/aint_add_f08ts.F90 | 4 +-
.../use_mpi_f08/wrappers_f/aint_diff_f08ts.F90 | 4 +-
.../wrappers_f/file_iread_all_f08ts.F90 | 4 +-
.../wrappers_f/file_iread_at_all_f08ts.F90 | 4 +-
.../wrappers_f/file_iwrite_all_f08ts.F90 | 4 +-
.../wrappers_f/file_iwrite_at_all_f08ts.F90 | 4 +-
src/include/mpi.h.in | 8 ++--
src/mpi/misc/aint_add.c | 28 ++++++------
src/mpi/misc/aint_diff.c | 30 ++++++------
src/mpi/romio/include/mpio.h.in | 16 +++---
src/mpi/romio/mpi-io/iread_all.c | 18 ++++----
src/mpi/romio/mpi-io/iread_atall.c | 16 +++---
src/mpi/romio/mpi-io/iwrite_all.c | 18 ++++----
src/mpi/romio/mpi-io/iwrite_atall.c | 16 +++---
src/mpi/romio/mpi-io/mpioprof.h | 16 +++---
test/mpi/f08/io/i_fcoll_test.f90 | 4 +-
test/mpi/f08/io/ioharness.defn | 4 +-
test/mpi/f08/io/testlist.in | 4 +-
test/mpi/f08/rma/aintf08.f90 | 4 +-
test/mpi/f08/rma/testlist.in | 2 +-
test/mpi/f77/io/i_setviewcurf.f | 2 +-
test/mpi/f77/io/ioharness.defn | 4 +-
test/mpi/f77/io/testlist.in | 4 +-
test/mpi/f77/rma/aintf.f | 8 ++--
test/mpi/f77/rma/testlist.in | 2 +-
test/mpi/io/i_aggregation1.c | 4 +-
test/mpi/io/i_aggregation2.c | 8 ++--
test/mpi/io/i_bigtype.c | 4 +-
test/mpi/io/i_coll_test.c | 8 ++--
test/mpi/io/i_darray_read.c | 2 +-
test/mpi/io/i_hindexed.c | 2 +-
test/mpi/io/i_hindexed_io.c | 4 +-
test/mpi/io/i_noncontig_coll.c | 12 +++---
test/mpi/io/i_noncontig_coll2.c | 24 +++++-----
test/mpi/io/i_rdwrord.c | 2 +-
test/mpi/io/i_setviewcur.c | 2 +-
test/mpi/io/i_types_with_zeros.c | 4 +-
test/mpi/io/testlist.in | 24 +++++-----
test/mpi/rma/aint.c | 4 +-
test/mpi/rma/testlist.in | 2 +-
44 files changed, 212 insertions(+), 212 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list