io/romio: do not use removed functions

This commit attempts to update the romio io component to not use
functions removed in MPI-3.0 (2012). This is a first cut and will
probably need to be reviewed for correctness.

Signed-off-by: Nathan Hjelm <[email protected]>

Author: hjelmn

ompi/mca/io/romio314/romio/adio/ad_nfs/ad_nfs_read.c

@@ -164,7 +164,7 @@ void ADIOI_NFS_ReadStrided(ADIO_File fd, void *buf, int count,
     ADIO_Offset abs_off_in_filetype=0;
     int req_len, partial_read;
     MPI_Count filetype_size, etype_size, buftype_size;
-    MPI_Aint filetype_extent, buftype_extent;
+    MPI_Aint filetype_extent, buftype_extent, lb;
     int buf_count, buftype_is_contig, filetype_is_contig;
     ADIO_Offset userbuf_off;
     ADIO_Offset off, req_off, disp, end_offset=0, readbuf_off, start_off;
@@ -187,9 +187,9 @@ void ADIOI_NFS_ReadStrided(ADIO_File fd, void *buf, int count,
 	return;
     }
 
-    MPI_Type_extent(fd->filetype, &filetype_extent);
+    MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
     MPI_Type_size_x(datatype, &buftype_size);
-    MPI_Type_extent(datatype, &buftype_extent);
+    MPI_Type_get_extent(datatype, &lb, &buftype_extent);
     etype_size = fd->etype_size;
 
     bufsize = buftype_size * count;

ompi/mca/io/romio314/romio/adio/ad_nfs/ad_nfs_write.c

@@ -267,7 +267,7 @@ void ADIOI_NFS_WriteStrided(ADIO_File fd, const void *buf, int count,
     ADIO_Offset abs_off_in_filetype=0;
     int req_len;
     MPI_Count filetype_size, etype_size, buftype_size;
-    MPI_Aint filetype_extent, buftype_extent;
+    MPI_Aint filetype_extent, buftype_extent, lb;
     int buf_count, buftype_is_contig, filetype_is_contig;
     ADIO_Offset userbuf_off;
     ADIO_Offset off, req_off, disp, end_offset=0, writebuf_off, start_off;
@@ -289,9 +289,9 @@ void ADIOI_NFS_WriteStrided(ADIO_File fd, const void *buf, int count,
 	return;
     }
 
-    MPI_Type_extent(fd->filetype, &filetype_extent);
+    MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
     MPI_Type_size_x(datatype, &buftype_size);
-    MPI_Type_extent(datatype, &buftype_extent);
+    MPI_Type_get_extent(datatype, &lb, &buftype_extent);
     etype_size = fd->etype_size;
 
     bufsize = buftype_size * count;

ompi/mca/io/romio314/romio/adio/ad_testfs/ad_testfs_seek.c

@@ -30,7 +30,7 @@ ADIO_Offset ADIOI_TESTFS_SeekIndividual(ADIO_File fd, ADIO_Offset offset,
     int size_in_filetype;
     int filetype_is_contig;
     MPI_Count filetype_size;
-    MPI_Aint etype_size, filetype_extent;
+    MPI_Aint etype_size, filetype_extent, lb;
 
     *error_code = MPI_SUCCESS;
 
@@ -47,7 +47,7 @@ ADIO_Offset ADIOI_TESTFS_SeekIndividual(ADIO_File fd, ADIO_Offset offset,
         flat_file = ADIOI_Flatlist;
         while (flat_file->type != fd->filetype) flat_file = flat_file->next;
 
-	MPI_Type_extent(fd->filetype, &filetype_extent);
+	MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
 	MPI_Type_size_x(fd->filetype, &filetype_size);
 	if ( ! filetype_size ) {
 	    *error_code = MPI_SUCCESS;

ompi/mca/io/romio314/romio/adio/common/ad_aggregate_new.c

@@ -237,18 +237,18 @@ void ADIOI_Calc_file_realms_fsize (ADIO_File fd, int nprocs_for_coll,
 void ADIOI_Create_fr_simpletype (int size, int nprocs_for_coll,
 			      MPI_Datatype *simpletype)
 {
-    int count=2, blocklens[2];
-    MPI_Aint indices[2];
-    MPI_Datatype old_types[2];
+    int count=1, blocklens[1];
+    MPI_Aint indices[1];
+    MPI_Datatype old_types[1];
+    MPI_Datatype inttype;
 
     blocklens[0] = size;
-    blocklens[1] = 1;
     indices[0]   = 0;
-    indices[1]   = size*nprocs_for_coll;
     old_types[0] = MPI_BYTE;
-    old_types[1] = MPI_UB;
 
-    MPI_Type_struct (count, blocklens, indices, old_types, simpletype);
+    MPI_Type_create_struct (count, blocklens, indices, old_types, &inttype);
+    MPI_Type_create_resized (inttype, 0, size*nprocs_for_coll, simpletype);
+    MPI_Type_free (&inttype);
 
     MPI_Type_commit (simpletype);
 }

ompi/mca/io/romio314/romio/adio/common/ad_coll_build_req_new.c

@@ -279,7 +279,7 @@ static inline int get_next_fr_off(ADIO_File fd,
 				  ADIO_Offset *fr_next_off_p,
 				  ADIO_Offset *fr_max_len_p)
 {
-    MPI_Aint fr_extent = -1;
+    MPI_Aint fr_extent = -1, lb;
     ADIO_Offset tmp_off, off_rem;
     ADIOI_Flatlist_node *fr_node_p = ADIOI_Flatlist;
     int i = -1, fr_dtype_ct = 0;
@@ -299,7 +299,7 @@ static inline int get_next_fr_off(ADIO_File fd,
 
     /* Calculate how many times to loop through the fr_type
      * and where the next fr_off is. */
-    MPI_Type_extent(*fr_type_p, &fr_extent);
+    MPI_Type_get_extent(*fr_type_p, &lb, &fr_extent);
     tmp_off = off - fr_st_off;
     fr_dtype_ct = tmp_off / fr_extent;
     off_rem = tmp_off % fr_extent;

ompi/mca/io/romio314/romio/adio/common/ad_coll_exch_new.c

@@ -127,7 +127,7 @@ void ADIOI_Exch_file_views(int myrank, int nprocs, int file_ptr_type,
     MPI_Request *send_req_arr = NULL, *recv_req_arr = NULL;
     MPI_Status *statuses = NULL;
     ADIO_Offset disp_off_sz_ext_typesz[6];
-    MPI_Aint memtype_extent, filetype_extent;
+    MPI_Aint memtype_extent, filetype_extent, lb;
     int ret = -1;
 
     /* parameters for datatypes */
@@ -143,7 +143,7 @@ void ADIOI_Exch_file_views(int myrank, int nprocs, int file_ptr_type,
      * freed in the close and should have been flattened in the file
      * view. */
     MPI_Type_size_x(datatype, &memtype_sz);
-    MPI_Type_extent(datatype, &memtype_extent);
+    MPI_Type_get_extent(datatype, &lb, &memtype_extent);
     if (memtype_sz == memtype_extent) {
 	memtype_is_contig = 1;
 	flat_mem_p = ADIOI_Add_contig_flattened(datatype);
@@ -156,7 +156,7 @@ void ADIOI_Exch_file_views(int myrank, int nprocs, int file_ptr_type,
             flat_mem_p = flat_mem_p->next;
     }
 
-    MPI_Type_extent(fd->filetype, &filetype_extent);
+    MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
     MPI_Type_size_x(fd->filetype, &filetype_sz);
     if (filetype_extent == filetype_sz) {
 	flat_file_p = ADIOI_Add_contig_flattened(fd->filetype);

ompi/mca/io/romio314/romio/adio/common/ad_darray.c

@@ -24,11 +24,11 @@ int ADIO_Type_create_darray(int size, int rank, int ndims,
 			    int order, MPI_Datatype oldtype,
 			    MPI_Datatype *newtype)
 {
-    MPI_Datatype type_old, type_new=MPI_DATATYPE_NULL, types[3];
-    int procs, tmp_rank, i, tmp_size, blklens[3], *coords;
-    MPI_Aint *st_offsets, orig_extent, disps[3];
+    MPI_Datatype type_old, type_new=MPI_DATATYPE_NULL, inttype;
+    int procs, tmp_rank, i, tmp_size, blklen, *coords;
+    MPI_Aint *st_offsets, orig_extent, disp, ub, lb;
 
-    MPI_Type_extent(oldtype, &orig_extent);
+    MPI_Type_get_extent(oldtype, &lb, &orig_extent);
 
 /* calculate position in Cartesian grid as MPI would (row-major
    ordering) */
@@ -77,11 +77,11 @@ int ADIO_Type_create_darray(int size, int rank, int ndims,
 	}
 
 	/* add displacement and UB */
-	disps[1] = st_offsets[0];
+	disp = st_offsets[0];
 	tmp_size = 1;
 	for (i=1; i<ndims; i++) {
 	    tmp_size *= array_of_gsizes[i-1];
-	    disps[1] += (MPI_Aint)tmp_size*st_offsets[i];
+	    disp += (MPI_Aint)tmp_size*st_offsets[i];
 	}
         /* rest done below for both Fortran and C order */
     }
@@ -115,26 +115,24 @@ int ADIO_Type_create_darray(int size, int rank, int ndims,
 	}
 
 	/* add displacement and UB */
-	disps[1] = st_offsets[ndims-1];
+	disp = st_offsets[ndims-1];
 	tmp_size = 1;
 	for (i=ndims-2; i>=0; i--) {
 	    tmp_size *= array_of_gsizes[i+1];
-	    disps[1] += (MPI_Aint)tmp_size*st_offsets[i];
+	    disp += (MPI_Aint)tmp_size*st_offsets[i];
 	}
     }
 
-    disps[1] *= orig_extent;
+    disp *= orig_extent;
 
-    disps[2] = orig_extent;
-    for (i=0; i<ndims; i++) disps[2] *= (MPI_Aint)array_of_gsizes[i];
+    ub = orig_extent;
+    for (i=0; i<ndims; i++) ub *= (MPI_Aint)array_of_gsizes[i];
 
-    disps[0] = 0;
-    blklens[0] = blklens[1] = blklens[2] = 1;
-    types[0] = MPI_LB;
-    types[1] = type_new;
-    types[2] = MPI_UB;
+    blklen = 1;
 
-    MPI_Type_struct(3, blklens, disps, types, newtype);
+    MPI_Type_create_struct(1, &blklen, &disp, &type_new, &inttype);
+    MPI_Type_create_resized (inttype, 0, ub, newtype);
+    MPI_Type_free (&inttype);
 
     MPI_Type_free(&type_new);
     ADIOI_Free(st_offsets);
@@ -184,15 +182,15 @@ static int MPIOI_Type_block(int *array_of_gsizes, int dim, int ndims, int nprocs
 	    MPI_Type_contiguous(mysize, type_old, type_new);
 	else {
 	    for (i=0; i<dim; i++) stride *= (MPI_Aint)array_of_gsizes[i];
-	    MPI_Type_hvector(mysize, 1, stride, type_old, type_new);
+	    MPI_Type_create_hvector(mysize, 1, stride, type_old, type_new);
 	}
     }
     else {
 	if (dim == ndims-1)
 	    MPI_Type_contiguous(mysize, type_old, type_new);
 	else {
 	    for (i=ndims-1; i>dim; i--) stride *= (MPI_Aint)array_of_gsizes[i];
-	    MPI_Type_hvector(mysize, 1, stride, type_old, type_new);
+	    MPI_Type_create_hvector(mysize, 1, stride, type_old, type_new);
 	}
 
     }
@@ -217,7 +215,7 @@ static int MPIOI_Type_cyclic(int *array_of_gsizes, int dim, int ndims, int nproc
    rank = coordinate of this process in dimension dim */
     int blksize, i, blklens[3], st_index, end_index, local_size, rem, count;
     MPI_Aint stride, disps[3];
-    MPI_Datatype type_tmp, types[3];
+    MPI_Datatype type_tmp, type_tmp1, types[3];
 
     if (darg == MPI_DISTRIBUTE_DFLT_DARG) blksize = 1;
     else blksize = darg;
@@ -246,7 +244,7 @@ static int MPIOI_Type_cyclic(int *array_of_gsizes, int dim, int ndims, int nproc
 	for (i=0; i<dim; i++) stride *= (MPI_Aint)array_of_gsizes[i];
     else for (i=ndims-1; i>dim; i--) stride *= (MPI_Aint)array_of_gsizes[i];
 
-    MPI_Type_hvector(count, blksize, stride, type_old, type_new);
+    MPI_Type_create_hvector(count, blksize, stride, type_old, type_new);
 
     if (rem) {
 	/* if the last block is of size less than blksize, include
@@ -259,7 +257,7 @@ static int MPIOI_Type_cyclic(int *array_of_gsizes, int dim, int ndims, int nproc
 	blklens[0] = 1;
 	blklens[1] = rem;
 
-	MPI_Type_struct(2, blklens, disps, types, &type_tmp);
+	MPI_Type_create_struct(2, blklens, disps, types, &type_tmp);
 
 	MPI_Type_free(type_new);
 	*type_new = type_tmp;
@@ -269,14 +267,12 @@ static int MPIOI_Type_cyclic(int *array_of_gsizes, int dim, int ndims, int nproc
        dimension correctly. */
     if ( ((order == MPI_ORDER_FORTRAN) && (dim == 0)) ||
          ((order == MPI_ORDER_C) && (dim == ndims-1)) ) {
-        types[0] = MPI_LB;
-        disps[0] = 0;
-        types[1] = *type_new;
-        disps[1] = (MPI_Aint)rank * (MPI_Aint)blksize * orig_extent;
-        types[2] = MPI_UB;
-        disps[2] = orig_extent * (MPI_Aint)array_of_gsizes[dim];
-        blklens[0] = blklens[1] = blklens[2] = 1;
-        MPI_Type_struct(3, blklens, disps, types, &type_tmp);
+        types[0] = *type_new;
+        disps[0] = (MPI_Aint)rank * (MPI_Aint)blksize * orig_extent;
+        blklens[0] = 1;
+        MPI_Type_create_struct(1, blklens, disps, types, &type_tmp1);
+        MPI_Type_create_resized (type_tmp1, 0, orig_extent * (MPI_Aint)array_of_gsizes[dim], &type_tmp);
+        MPI_Type_free(&type_tmp1);
         MPI_Type_free(type_new);
         *type_new = type_tmp;
 

ompi/mca/io/romio314/romio/adio/common/ad_end.c

@@ -72,13 +72,13 @@ int ADIOI_End_call(MPI_Comm comm, int keyval, void *attribute_val, void
     ADIOI_UNREFERENCED_ARG(attribute_val);
     ADIOI_UNREFERENCED_ARG(extra_state);
 
-    MPI_Keyval_free(&keyval);
+    MPI_Comm_free_keyval (&keyval);
 
     /* The end call will be called after all possible uses of this keyval, even
      * if a file was opened with MPI_COMM_SELF.  Note, this assumes LIFO
      * MPI_COMM_SELF attribute destruction behavior mandated by MPI-2.2. */
     if (ADIOI_cb_config_list_keyval != MPI_KEYVAL_INVALID)
-        MPI_Keyval_free(&ADIOI_cb_config_list_keyval);
+        MPI_Comm_free_keyval (&ADIOI_cb_config_list_keyval);
 
     ADIO_End(&error_code);
     return error_code;

ompi/mca/io/romio314/romio/adio/common/ad_io_coll.c

@@ -54,7 +54,7 @@ void ADIOI_IOStridedColl (ADIO_File fd, void *buf, int count, int rdwr,
     int interleave_count = 0, i, nprocs, myrank, nprocs_for_coll;
     int cb_enable;
     ADIO_Offset bufsize;
-    MPI_Aint extent;
+    MPI_Aint extent, lb;
 #ifdef DEBUG2
     MPI_Aint bufextent;
 #endif
@@ -191,7 +191,7 @@ void ADIOI_IOStridedColl (ADIO_File fd, void *buf, int count, int rdwr,
 	return;
     }
 
-    MPI_Type_extent(datatype, &extent);
+    MPI_Type_get_extent(datatype, &lb, &extent);
 #ifdef DEBUG2
     bufextent = extent * count;
 #endif
@@ -702,7 +702,7 @@ void ADIOI_Calc_bounds (ADIO_File fd, int count, MPI_Datatype buftype,
 {
     MPI_Count filetype_size, buftype_size, etype_size;
     int sum;
-    MPI_Aint filetype_extent;
+    MPI_Aint filetype_extent, lb;
     ADIO_Offset total_io;
     int filetype_is_contig;
     ADIO_Offset i, remainder;
@@ -726,7 +726,7 @@ void ADIOI_Calc_bounds (ADIO_File fd, int count, MPI_Datatype buftype,
     ADIOI_Datatype_iscontig (fd->filetype, &filetype_is_contig);
 
     MPI_Type_size_x (fd->filetype, &filetype_size);
-    MPI_Type_extent (fd->filetype, &filetype_extent);
+    MPI_Type_get_extent (fd->filetype, &lb, &filetype_extent);
     MPI_Type_size_x (fd->etype, &etype_size);
     MPI_Type_size_x (buftype, &buftype_size);
 
@@ -884,7 +884,7 @@ void ADIOI_IOFiletype(ADIO_File fd, void *buf, int count,
     int user_ind_rd_buffer_size;
     int f_is_contig, m_is_contig;
     int user_ds_read, user_ds_write;
-    MPI_Aint f_extent;
+    MPI_Aint f_extent, lb;
     MPI_Count f_size;
     int f_ds_percent; /* size/extent */
 
@@ -894,7 +894,7 @@ void ADIOI_IOFiletype(ADIO_File fd, void *buf, int count,
     else
 	MPE_Log_event(5008, 0, NULL);
 #endif
-    MPI_Type_extent(custom_ftype, &f_extent);
+    MPI_Type_get_extent(custom_ftype, &lb, &f_extent);
     MPI_Type_size_x(custom_ftype, &f_size);
     f_ds_percent = 100 * f_size / f_extent;
 

ompi/mca/io/romio314/romio/adio/common/ad_read_coll.c

@@ -307,8 +307,7 @@ void ADIOI_Calc_my_off_len(ADIO_File fd, int bufcount, MPI_Datatype
     ADIOI_Datatype_iscontig(fd->filetype, &filetype_is_contig);
 
     MPI_Type_size_x(fd->filetype, &filetype_size);
-    MPI_Type_extent(fd->filetype, &filetype_extent);
-    MPI_Type_lb(fd->filetype, &filetype_lb);
+    MPI_Type_get_extent(fd->filetype, &filetype_lb, &filetype_extent);
     MPI_Type_size_x(datatype, &buftype_size);
     etype_size = fd->etype_size;
 
@@ -524,7 +523,7 @@ static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
     int req_len, flag, rank;
     MPI_Status status;
     ADIOI_Flatlist_node *flat_buf=NULL;
-    MPI_Aint buftype_extent;
+    MPI_Aint buftype_extent, lb;
     int coll_bufsize;
 
     *error_code = MPI_SUCCESS;  /* changed below if error */
@@ -605,7 +604,7 @@ static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
 	flat_buf = ADIOI_Flatlist;
         while (flat_buf->type != datatype) flat_buf = flat_buf->next;
     }
-    MPI_Type_extent(datatype, &buftype_extent);
+    MPI_Type_get_extent(datatype, &lb, &buftype_extent);
 
     done = 0;
     off = st_loc;
@@ -685,7 +684,7 @@ static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
 		    if (req_off < real_off + real_size) {
 			count[i]++;
       ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)read_buf)+req_off-real_off) == (ADIO_Offset)(MPIR_Upint)(read_buf+req_off-real_off));
-			MPI_Address(read_buf+req_off-real_off,
+			MPI_Get_address(read_buf+req_off-real_off,
                                &(others_req[i].mem_ptrs[j]));
       ADIOI_Assert((real_off + real_size - req_off) == (int)(real_off + real_size - req_off));
 			send_size[i] += (int)(ADIOI_MIN(real_off + real_size - req_off,