Revert "Add Immediate versions of nonblocking coll. I/O"

This reverts commit 077346f6

.
Signed-off-by: Wesley Bland <wbland@anl.gov>

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 MPI_File_iread_all
-    subroutine MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
+interface MPIX_File_iread_all
+    subroutine MPIX_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 MPI_File_iread_all
         type(MPI_Datatype), intent(in) :: datatype
         type(MPI_Request), intent(out) :: request
         integer, optional, intent(out) :: ierror
-    end subroutine MPI_File_iread_all_f08ts
-end interface MPI_File_iread_all
+    end subroutine MPIX_File_iread_all_f08ts
+end interface MPIX_File_iread_all
 
-interface MPI_File_iwrite_all
-    subroutine MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
+interface MPIX_File_iwrite_all
+    subroutine MPIX_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 MPI_File_iwrite_all
         type(MPI_Datatype), intent(in) :: datatype
         type(MPI_Request), intent(out) :: request
         integer, optional, intent(out) :: ierror
-    end subroutine MPI_File_iwrite_all_f08ts
-end interface MPI_File_iwrite_all
+    end subroutine MPIX_File_iwrite_all_f08ts
+end interface MPIX_File_iwrite_all
 
-interface MPI_File_iread_at_all
-    subroutine MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+interface MPIX_File_iread_at_all
+    subroutine MPIX_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 MPI_File_iread_at_all
         type(MPI_Datatype), intent(in) :: datatype
         type(MPI_Request), intent(out) :: request
         integer, optional, intent(out) :: ierror
-    end subroutine MPI_File_iread_at_all_f08ts
-end interface MPI_File_iread_at_all
+    end subroutine MPIX_File_iread_at_all_f08ts
+end interface MPIX_File_iread_at_all
 
-interface MPI_File_iwrite_at_all
-    subroutine MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+interface MPIX_File_iwrite_at_all
+    subroutine MPIX_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 MPI_File_iwrite_at_all
         type(MPI_Datatype), intent(in) :: datatype
         type(MPI_Request), intent(out) :: request
         integer, optional, intent(out) :: ierror
-    end subroutine MPI_File_iwrite_at_all_f08ts
-end interface MPI_File_iwrite_at_all
+    end subroutine MPIX_File_iwrite_at_all_f08ts
+end interface MPIX_File_iwrite_at_all
 
 end module mpi_f08

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],
-    "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]
+    "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]
 );
 
 # Choice buffers in some functions can be passed in MPI_IN_PLACE. We store such

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 MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
+subroutine MPIX_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 MPI_File_iread_all_f08ts(fh, buf, count, datatype, request, ierror)
 
     if (present(ierror)) ierror = ierror_c
 
-end subroutine MPI_File_iread_all_f08ts
+end subroutine MPIX_File_iread_all_f08ts

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 MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+subroutine MPIX_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 MPI_File_iread_at_all_f08ts(fh, offset, buf, count, datatype, request
 
     if (present(ierror)) ierror = ierror_c
 
-end subroutine MPI_File_iread_at_all_f08ts
+end subroutine MPIX_File_iread_at_all_f08ts

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 MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
+subroutine MPIX_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 MPI_File_iwrite_all_f08ts(fh, buf, count, datatype, request, ierror)
 
     if (present(ierror)) ierror = ierror_c
 
-end subroutine MPI_File_iwrite_all_f08ts
+end subroutine MPIX_File_iwrite_all_f08ts

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 MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, request, ierror)
+subroutine MPIX_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 MPI_File_iwrite_at_all_f08ts(fh, offset, buf, count, datatype, reques
 
     if (present(ierror)) ierror = ierror_c
 
-end subroutine MPI_File_iwrite_at_all_f08ts
+end subroutine MPIX_File_iwrite_at_all_f08ts

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 MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,
+int MPIX_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 MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
+int MPIX_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 MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
+int MPIX_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 MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
+int MPIX_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 PMPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,
+int PMPIX_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 PMPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
+int PMPIX_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 PMPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
+int PMPIX_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 PMPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
+int PMPIX_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);
 

src/mpi/romio/mpi-io/iread_all.c

@@ -9,16 +9,16 @@
 #ifdef HAVE_WEAK_SYMBOLS
 
 #if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPI_File_iread_all = PMPI_File_iread_all
+#pragma weak MPIX_File_iread_all = PMPIX_File_iread_all
 #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPI_File_iread_all MPI_File_iread_all
+#pragma _HP_SECONDARY_DEF PMPIX_File_iread_all MPIX_File_iread_all
 #elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPI_File_iread_all as PMPI_File_iread_all
+#pragma _CRI duplicate MPIX_File_iread_all as PMPIX_File_iread_all
 /* end of weak pragmas */
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
+int MPIX_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
                        MPI_Request *request)
-    __attribute__((weak,alias("PMPI_File_iread_all")));
+    __attribute__((weak,alias("PMPIX_File_iread_all")));
 #endif
 
 /* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPI_File_iread_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype,
 #endif
 
 /*@
-    MPI_File_iread_all - Nonblocking collective read using individual file pointer
+    MPIX_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 MPI_File_iread_all(MPI_File fh, void *buf, int count,
+int MPIX_File_iread_all(MPI_File fh, void *buf, int count,
                        MPI_Datatype datatype, MPI_Request *request)
 {
     int error_code;
-    static char myname[] = "MPI_FILE_IREAD_ALL";
+    static char myname[] = "MPIX_FILE_IREAD_ALL";
 #ifdef MPI_hpux
     int fl_xmpi;
 
@@ -72,7 +72,7 @@ int MPI_File_iread_all(MPI_File fh, void *buf, int count,
     return error_code;
 }
 
-/* Note: MPIOI_File_iread_all also used by MPI_File_iread_at_all */
+/* Note: MPIOI_File_iread_all also used by MPIX_File_iread_at_all */
 /* prevent multiple definitions of this routine */
 #ifdef MPIO_BUILD_PROFILING
 int MPIOI_File_iread_all(MPI_File fh,

src/mpi/romio/mpi-io/iread_atall.c

@@ -9,16 +9,16 @@
 #ifdef HAVE_WEAK_SYMBOLS
 
 #if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPI_File_iread_at_all = PMPI_File_iread_at_all
+#pragma weak MPIX_File_iread_at_all = PMPIX_File_iread_at_all
 #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPI_File_iread_at_all MPI_File_iread_at_all
+#pragma _HP_SECONDARY_DEF PMPIX_File_iread_at_all MPIX_File_iread_at_all
 #elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPI_File_iread_at_all as PMPI_File_iread_at_all
+#pragma _CRI duplicate MPIX_File_iread_at_all as PMPIX_File_iread_at_all
 /* end of weak pragmas */
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count,
+int MPIX_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count,
                           MPI_Datatype datatype, MPI_Request *request)
-    __attribute__((weak,alias("PMPI_File_iread_at_all")));
+    __attribute__((weak,alias("PMPIX_File_iread_at_all")));
 #endif
 
 /* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count,
 #endif
 
 /*@
-    MPI_File_iread_at_all - Nonblocking collective read using explicit offset
+    MPIX_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 MPI_File_iread_at_all(MPI_File fh, MPI_Offset offset, void *buf,
+int MPIX_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[] = "MPI_FILE_IREAD_AT_ALL";
+    static char myname[] = "MPIX_FILE_IREAD_AT_ALL";
 #ifdef MPI_hpux
     int fl_xmpi;
 

src/mpi/romio/mpi-io/iwrite_all.c

@@ -9,16 +9,16 @@
 #ifdef HAVE_WEAK_SYMBOLS
 
 #if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPI_File_iwrite_all = PMPI_File_iwrite_all
+#pragma weak MPIX_File_iwrite_all = PMPIX_File_iwrite_all
 #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPI_File_iwrite_all MPI_File_iwrite_all
+#pragma _HP_SECONDARY_DEF PMPIX_File_iwrite_all MPIX_File_iwrite_all
 #elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPI_File_iwrite_all as PMPI_File_iwrite_all
+#pragma _CRI duplicate MPIX_File_iwrite_all as PMPIX_File_iwrite_all
 /* end of weak pragmas */
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
+int MPIX_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype,
                         MPI_Request *request)
-    __attribute__((weak,alias("PMPI_File_iwrite_all")));
+    __attribute__((weak,alias("PMPIX_File_iwrite_all")));
 #endif
 
 /* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype da
 #endif
 
 /*@
-    MPI_File_iwrite_all - Nonblocking collective write using individual file pointer
+    MPIX_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 MPI_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count,
+int MPIX_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count,
                         MPI_Datatype datatype, MPI_Request *request)
 {
     int error_code;
-    static char myname[] = "MPI_FILE_IWRITE_ALL";
+    static char myname[] = "MPIX_FILE_IWRITE_ALL";
 #ifdef MPI_hpux
     int fl_xmpi;
 
@@ -66,7 +66,7 @@ int MPI_File_iwrite_all(MPI_File fh, ROMIO_CONST void *buf, int count,
     return error_code;
 }
 
-/* Note: MPIOI_File_iwrite_all also used by MPI_File_iwrite_at_all */
+/* Note: MPIOI_File_iwrite_all also used by MPIX_File_iwrite_at_all */
 /* prevent multiple definitions of this routine */
 #ifdef MPIO_BUILD_PROFILING
 int MPIOI_File_iwrite_all(MPI_File fh,

src/mpi/romio/mpi-io/iwrite_atall.c

@@ -9,16 +9,16 @@
 #ifdef HAVE_WEAK_SYMBOLS
 
 #if defined(HAVE_PRAGMA_WEAK)
-#pragma weak MPI_File_iwrite_at_all = PMPI_File_iwrite_at_all
+#pragma weak MPIX_File_iwrite_at_all = PMPIX_File_iwrite_at_all
 #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPI_File_iwrite_at_all MPI_File_iwrite_at_all
+#pragma _HP_SECONDARY_DEF PMPIX_File_iwrite_at_all MPIX_File_iwrite_at_all
 #elif defined(HAVE_PRAGMA_CRI_DUP)
-#pragma _CRI duplicate MPI_File_iwrite_at_all as PMPI_File_iwrite_at_all
+#pragma _CRI duplicate MPIX_File_iwrite_at_all as PMPIX_File_iwrite_at_all
 /* end of weak pragmas */
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
+int MPIX_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,
                            MPI_Datatype datatype, MPI_Request *request)
-    __attribute__((weak,alias("PMPI_File_iwrite_at_all")));
+    __attribute__((weak,alias("PMPIX_File_iwrite_at_all")));
 #endif
 
 /* Include mapping from MPI->PMPI */
@@ -31,7 +31,7 @@ int MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int
 #endif
 
 /*@
-    MPI_File_iwrite_at_all - Nonblocking collective write using explicit offset
+    MPIX_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 MPI_File_iwrite_at_all(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf,
+int MPIX_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[] = "MPI_FILE_IWRITE_AT_ALL";
+    static char myname[] = "MPIX_FILE_IWRITE_AT_ALL";
 #ifdef MPI_hpux
     int fl_xmpi;
 

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 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 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_read_shared
 #define MPI_File_read_shared PMPI_File_read_shared

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 MPI_FILE_IWRITE_ALL(fh, writebuf, bufcount, MPI_INTEGER, request, ierr)
+call MPIX_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 MPI_FILE_IREAD_ALL(fh, readbuf, bufcount, MPI_INTEGER, request, ierr)
+call MPIX_FILE_IREAD_ALL(fh, readbuf, bufcount, MPI_INTEGER, request, ierr)
 call MPI_WAIT(request, status, ierr)
 call MPI_FILE_CLOSE(fh, ierr)
 

test/mpi/f08/io/ioharness.defn

@@ -258,7 +258,7 @@ integer (kind=MPI_OFFSET_KIND)offset
 do k=1, b
    <setContigBuffer/>
    <findOffset/>
-   call MPI_File_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+   call MPIX_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 MPI_File_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+   call MPIX_File_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
    call MPI_Wait(request, status, ierr)
    <checkErr/>
    <checkContigBuffer/>

test/mpi/f08/io/testlist.in

@@ -18,5 +18,5 @@ miscfilef90 4
 setviewcurf90 4
 c2f2ciof90 1
 c2f90multio 1
-i_fcoll_test 4
-iwriteatallf90 4
+@mpix@ i_fcoll_test 4
+@mpix@ iwriteatallf90 4

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 MPI_File_iwrite_all( fh, buf, 1, MPI_INTEGER, request, ierr)
+      call MPIX_File_iwrite_all( fh, buf, 1, MPI_INTEGER, request, ierr)
       if (ierr .ne. MPI_SUCCESS) then
          errs = errs + 1
          call MTestPrintErrorMsg( "iwrite_all", ierr )

test/mpi/f77/io/ioharness.defn

@@ -258,7 +258,7 @@ include 'iooffset.h'
 do k=1, b
    <setContigBuffer/>
    <findOffset/>
-   call mpi_file_iwrite_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+   call mpix_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 mpi_file_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
+   call mpix_file_iread_at_all( fh, offset, buf, n, MPI_INTEGER, request, ierr )
    call mpi_wait(request, status, ierr)
    <checkErr/>
    <checkContigBuffer/>

test/mpi/f77/io/testlist.in

@@ -18,5 +18,5 @@ miscfilef 4
 setviewcurf 4
 c2f2ciof 1
 c2fmultio 1
-i_setviewcurf 4
-iwriteatallf 4 xfail=2201
+@mpix@ i_setviewcurf 4
+@mpix@ iwriteatallf 4 xfail=2201

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 = MPI_File_iwrite_at_all(wfh, offset, buffer[i], OBJ_SIZE,
+        if ((mpi_ret = MPIX_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 = MPI_File_iread_at_all(rfh, offset[i], buffer[i],
+        if ((mpi_ret = MPIX_File_iread_at_all(rfh, offset[i], buffer[i],
                                              OBJ_SIZE, MPI_CHAR, &request[i]))
             != MPI_SUCCESS) {
             fatal_error(mpi_ret, NULL, "read");

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 = MPI_File_iwrite_at_all(fh, off, buffer, BUFSIZE, MPI_INT,
+    errcode = MPIX_File_iwrite_at_all(fh, off, buffer, BUFSIZE, MPI_INT,
                                      &request);
-    if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iwrite_at_all");
+    if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_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 = MPI_File_iread_at_all(fh, off, buf2, BUFSIZE, MPI_INT,
+    errcode = MPIX_File_iread_at_all(fh, off, buf2, BUFSIZE, MPI_INT,
                                      &request);
-    if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_iread_at_all");
+    if (errcode != MPI_SUCCESS) handle_error(errcode, "MPIX_File_iread_at_all");
     MPI_Wait(&request, &status);
     errcode = MPI_File_close(&fh);
     if (errcode != MPI_SUCCESS) handle_error(errcode, "MPI_File_close");