pmodels · hzhou · Aug 17, 2026 · Aug 14, 2026 · Aug 14, 2026 · Aug 14, 2026
diff --git a/examples/.codingcheck b/examples/.codingcheck
diff --git a/maint/local_python/binding_c.py b/maint/local_python/binding_c.py
@@ -237,8 +237,8 @@ def dump_mpir_io_impl_h(f):
         print("#ifndef HAVE_ROMIO", file=Out)
         print("#define MPIO_Err_return_file(fh, errorcode) MPIR_Err_return_comm((void *)0, __func__, errorcode)", file=Out)
         print("#else", file=Out)
-        print("MPI_Fint MPIR_File_c2f_impl(MPI_File fh);", file=Out)
-        print("MPI_File MPIR_File_f2c_impl(MPI_Fint fh);", file=Out)
+        print("int MPIR_File_toint_impl(MPI_File fh);", file=Out)
+        print("MPI_File MPIR_File_fromint_impl(int fh);", file=Out)
         print("int MPIO_Err_return_file(MPI_File fh, int errorcode);", file=Out)
         print("#endif", file=Out)
         print("", file=Out)

diff --git a/src/binding/c/io_api.txt b/src/binding/c/io_api.txt
@@ -7,7 +7,7 @@ MPI_File_c2f:
 #ifndef HAVE_ROMIO
     return 0;
 #else
-    return MPIR_File_c2f_impl(file);
+    return MPIR_File_toint_impl(file);
 #endif
 }
 
@@ -18,7 +18,7 @@ MPI_File_f2c:
 #ifndef HAVE_ROMIO
     return 0;
 #else
-    return MPIR_File_f2c_impl(file);
+    return MPIR_File_fromint_impl(file);
 #endif
 }
 
@@ -31,7 +31,7 @@ MPI_File_toint:
 #ifndef HAVE_ROMIO
     return 0;
 #else
-    return (int) MPIR_File_c2f_impl(file);
+    return MPIR_File_toint_impl(file);
 #endif
 }
 
@@ -44,7 +44,7 @@ MPI_File_fromint:
 #ifndef HAVE_ROMIO
     return 0;
 #else
-    return MPIR_File_f2c_impl(file);
+    return MPIR_File_fromint_impl(file);
 #endif
 }
 

diff --git a/src/mpi/romio/.codingcheck b/src/mpi/romio/.codingcheck
diff --git a/src/mpi/romio/adio/ad_xfs/ad_xfs.h b/src/mpi/romio/adio/ad_xfs/ad_xfs.h
@@ -11,14 +11,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#if defined(MPISGI)
-#include "xfs/xfs_fs.h"
-#ifndef  __USE_LARGEFILE64
-#define  __USE_LARGEFILE64
-#endif
-typedef struct aiocb64 aiocb64_t;
-#endif
-
 void ADIOI_XFS_Open(ADIO_File fd, int *error_code);
 void ADIOI_XFS_Close(ADIO_File fd, int *error_code);
 void ADIOI_XFS_ReadContig(ADIO_File fd, void *buf, MPI_Aint count,

diff --git a/src/mpi/romio/adio/ad_xfs/ad_xfs_fcntl.c b/src/mpi/romio/adio/ad_xfs/ad_xfs_fcntl.c
@@ -14,11 +14,7 @@
 void ADIOI_XFS_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t * fcntl_struct, int *error_code)
 {
     int i, err;
-#if defined(LINUX) && defined(MPISGI)
-    struct xfs_flock64 fl;
-#else
     struct flock64 fl;
-#endif
     static char myname[] = "ADIOI_XFS_FCNTL";
 
     switch (flag) {
@@ -39,11 +35,7 @@ void ADIOI_XFS_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t * fcntl_struct, int *e
             fl.l_whence = SEEK_SET;
             fl.l_len = fcntl_struct->diskspace;
 
-#if defined(LINUX) && defined(MPISGI)
-            err = ioctl(fd->fd_sys, XFS_IOC_RESVSP64, &fl);
-#else
             err = fcntl(fd->fd_sys, F_RESVSP64, &fl);
-#endif
 
             if (err)
                 i = 1;

diff --git a/src/mpi/romio/adio/ad_xfs/ad_xfs_open.c b/src/mpi/romio/adio/ad_xfs/ad_xfs_open.c
@@ -51,11 +51,7 @@ void ADIOI_XFS_Open(ADIO_File fd, int *error_code)
     fd->fd_direct = open(fd->filename, amode_direct, perm);
     if (fd->fd_direct != -1) {
 
-#if defined(MPISGI)
-        ioctl(fd->fd_direct, XFS_IOC_DIOINFO, &st);
-#else
         fcntl(fd->fd_direct, F_DIOINFO, &st);
-#endif
 
         fd->d_mem = st.d_mem;
         fd->d_miniosz = st.d_miniosz;

diff --git a/src/mpi/romio/adio/common/ad_end.c b/src/mpi/romio/adio/common/ad_end.c
@@ -19,10 +19,6 @@ void ADIO_End(int *error_code)
 /* free file and info tables used for Fortran interface */
     if (ADIOI_Ftable)
         ADIOI_Free(ADIOI_Ftable);
-#ifndef HAVE_MPI_INFO
-    if (MPIR_Infotable)
-        ADIOI_Free(MPIR_Infotable);
-#endif
 
 
 /* free the memory allocated for a new data representation, if any */

diff --git a/src/mpi/romio/adio/common/ad_init.c b/src/mpi/romio/adio/common/ad_init.c
@@ -14,10 +14,6 @@ ADIO_File *ADIOI_Ftable = NULL;
 int ADIOI_Ftable_ptr = 0, ADIOI_Ftable_max = 0;
 ADIO_Request *ADIOI_Reqtable = NULL;
 int ADIOI_Reqtable_ptr = 0, ADIOI_Reqtable_max = 0;
-#ifndef HAVE_MPI_INFO
-MPI_Info *MPIR_Infotable = NULL;
-int MPIR_Infotable_ptr = 0, MPIR_Infotable_max = 0;
-#endif
 
 MPI_Info ADIOI_syshints = MPI_INFO_NULL;
 

diff --git a/src/mpi/romio/adio/common/iscontig.c b/src/mpi/romio/adio/common/iscontig.c
@@ -23,32 +23,6 @@ void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag)
     }
 }
 
-#elif (defined(MPIHP) && defined(HAVE_MPI_INFO))
-/* i.e. HPMPI 1.4 only */
-
-int hpmp_dtiscontig(MPI_Datatype datatype);
-
-void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag)
-{
-    *flag = hpmp_dtiscontig(datatype);
-}
-
-#elif (defined(MPISGI) && !defined(NO_MPI_SGI_type_is_contig))
-
-int MPI_SGI_type_is_contig(MPI_Datatype datatype);
-
-void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag)
-{
-    MPI_Aint displacement, extent;
-    MPI_Type_get_extent(datatype, &distplacement, &extent);
-
-    /* SGI's MPI_SGI_type_is_contig() returns true for indexed
-     * datatypes with holes at the beginning, which causes
-     * problems with ROMIO's use of this function.
-     */
-    *flag = MPI_SGI_type_is_contig(datatype) && (displacement == 0);
-}
-
 #elif defined(OMPI_BUILDING) && OMPI_BUILDING
 
 /* void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag) is defined

diff --git a/src/mpi/romio/adio/include/adio.h b/src/mpi/romio/adio/include/adio.h
@@ -96,67 +96,10 @@
 #endif
 
 typedef MPI_Offset ADIO_Offset;
-#ifdef MPI_OFFSET_IS_INT
-#define ADIO_OFFSET MPI_INT
-#elif defined(HAVE_LONG_LONG_64)
-#ifdef HAVE_MPI_LONG_LONG_INT
-#define ADIO_OFFSET MPI_LONG_LONG_INT
-#else
-#define ADIO_OFFSET MPI_DOUBLE
-#endif
-#elif defined(HAVE_INT64)
-#define ADIO_OFFSET MPI_DOUBLE
-#else
-#define ADIO_OFFSET MPI_LONG
-#endif
+#define ADIO_OFFSET MPI_OFFSET
 
 #define ADIO_Status MPI_Status
 
-#ifndef MPIO_INCLUDE
-#ifdef NEEDS_MPI_FINT
-typedef int MPI_Fint;
-#endif
-#endif
-
-#if (!defined(HAVE_MPI_INFO) && !defined(MPIO_INCLUDE))
-typedef struct MPIR_Info *MPI_Info;
-#define MPI_INFO_NULL 0
-#define MPI_MAX_INFO_VAL      1024
-
-int MPI_Info_create(MPI_Info * info);
-int MPI_Info_set(MPI_Info info, char *key, char *value);
-int MPI_Info_delete(MPI_Info info, char *key);
-int MPI_Info_get(MPI_Info info, char *key, int valuelen, char *value, int *flag);
-int MPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen, int *flag);
-int MPI_Info_get_nkeys(MPI_Info info, int *nkeys);
-int MPI_Info_get_nthkey(MPI_Info info, int n, char *key);
-int MPI_Info_dup(MPI_Info info, MPI_Info * newinfo);
-int MPI_Info_free(MPI_Info * info);
-
-#ifdef MPI_Info_f2c
-#undef MPI_Info_f2c
-#endif
-#ifdef MPI_Info_c2f
-#undef MPI_Info_c2f
-#endif
-/* above needed for some versions of mpi.h in MPICH!! */
-MPI_Fint MPI_Info_c2f(MPI_Info info);
-MPI_Info MPI_Info_f2c(MPI_Fint info);
-
-int PMPI_Info_create(MPI_Info * info);
-int PMPI_Info_set(MPI_Info info, char *key, char *value);
-int PMPI_Info_delete(MPI_Info info, char *key);
-int PMPI_Info_get(MPI_Info info, char *key, int valuelen, char *value, int *flag);
-int PMPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen, int *flag);
-int PMPI_Info_get_nkeys(MPI_Info info, int *nkeys);
-int PMPI_Info_get_nthkey(MPI_Info info, int n, char *key);
-int PMPI_Info_dup(MPI_Info info, MPI_Info * newinfo);
-int PMPI_Info_free(MPI_Info * info);
-
-MPI_Fint PMPI_Info_c2f(MPI_Info info);
-MPI_Info PMPI_Info_f2c(MPI_Fint info);
-
-#endif
 
 /* style: allow:strdup:1 sig:0 */
 
@@ -453,8 +396,8 @@ int ADIO_Type_create_darray(int size, int rank, int ndims,
 MPI_File MPIO_File_create(int size);
 ADIO_File MPIO_File_resolve(MPI_File mpi_fh);
 void MPIO_File_free(MPI_File * mpi_fh);
-MPI_File MPIO_File_f2c(MPI_Fint fh);
-MPI_Fint MPIO_File_c2f(MPI_File fh);
+MPI_File MPIO_File_fromint(int fh);
+int MPIO_File_toint(MPI_File fh);
 int MPIO_Err_create_code(int lastcode, int fatal, const char fcname[],
                          int line, int error_class, const char generic_msg[],
                          const char specific_msg[], ...);

diff --git a/src/mpi/romio/adio/include/adio_extern.h b/src/mpi/romio/adio/include/adio_extern.h
@@ -13,10 +13,6 @@ extern ADIO_File *ADIOI_Ftable;
 extern int ADIOI_Ftable_ptr, ADIOI_Ftable_max;
 extern ADIO_Request *ADIOI_Reqtable;
 extern int ADIOI_Reqtable_ptr, ADIOI_Reqtable_max;
-#ifndef HAVE_MPI_INFO
-extern MPI_Info *MPIR_Infotable;
-extern int MPIR_Infotable_ptr, MPIR_Infotable_max;
-#endif
 #if defined(ROMIO_XFS) || defined(ROMIO_LUSTRE)
 extern int ADIOI_Direct_read, ADIOI_Direct_write;
 #endif

diff --git a/src/mpi/romio/adio/include/mpipr.h b/src/mpi/romio/adio/include/mpipr.h
@@ -478,7 +478,6 @@
 #undef MPI_Status_set_elements_x
 #define MPI_Status_set_elements_x PMPI_Status_set_elements_x
 
-#ifndef HAVE_MPI_INFO_SRC       /* everywhere except in info source directory */
 #undef MPI_Info_create
 #define MPI_Info_create PMPI_Info_create
 #undef MPI_Info_set
@@ -497,12 +496,6 @@
 #define MPI_Info_dup PMPI_Info_dup
 #undef MPI_Info_free
 #define MPI_Info_free PMPI_Info_free
-/* #undef MPI_Info_c2f
-#define MPI_Info_c2f PMPI_Info_c2f
-#undef MPI_Info_f2c
-#define MPI_Info_f2c PMPI_Info_f2c
-*/
-#endif
 #undef MPI_Grequest_start
 #define MPI_Grequest_start PMPI_Grequest_start
 #undef MPI_Grequest_complete
@@ -515,12 +508,6 @@
 #undef MPIX_Grequest_class_allocate
 #define MPIX_Grequest_class_allocate PMPIX_Grequest_class_allocate
 
-#ifdef MPIO_FORTRAN_SRC /* only in MPI-IO Fortran source directory */
-#undef MPI_File_c2f
-#define MPI_File_c2f PMPI_File_c2f
-#undef MPI_File_f2c
-#define MPI_File_f2c PMPI_File_f2c
-#endif
 
 #undef MPI_Type_get_attr
 #define MPI_Type_get_attr PMPI_Type_get_attr