Skip to content

Commit 7d1dce8

Browse files
ggouaillardetggouaillardet
committed
romio341: modernize MPICH 3.4.1 romio
Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent ae95358 commit 7d1dce8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+195
-195
lines changed

‎3rd-party/romio341/adio/ad_gpfs/ad_gpfs_rdcoll.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
476476
int req_len, flag, rank;
477477
MPI_Status status;
478478
ADIOI_Flatlist_node *flat_buf = NULL;
479-
MPI_Aint buftype_extent;
479+
MPI_Aint lb, buftype_extent;
480480
int coll_bufsize;
481481
#ifdef RDCOLL_DEBUG
482482
int iii;
@@ -556,7 +556,7 @@ static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
556556
if (!buftype_is_contig) {
557557
flat_buf = ADIOI_Flatten_and_find(datatype);
558558
}
559-
MPI_Type_extent(datatype, &buftype_extent);
559+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
560560

561561
done = 0;
562562
off = st_loc;
@@ -641,7 +641,7 @@ static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
641641
count[i]++;
642642
ADIOI_Assert((((ADIO_Offset) (uintptr_t) read_buf) + req_off - real_off) ==
643643
(ADIO_Offset) (uintptr_t) (read_buf + req_off - real_off));
644-
MPI_Address(read_buf + req_off - real_off, &(others_req[i].mem_ptrs[j]));
644+
MPI_Get_address(read_buf + req_off - real_off, &(others_req[i].mem_ptrs[j]));
645645
ADIOI_Assert((real_off + real_size - req_off) ==
646646
(int) (real_off + real_size - req_off));
647647
send_size[i] +=

‎3rd-party/romio341/adio/ad_gpfs/ad_gpfs_wrcoll.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ static void ADIOI_Exch_and_write(ADIO_File fd, const void *buf, MPI_Datatype
603603
int *send_buf_idx, *curr_to_proc, *done_to_proc;
604604
MPI_Status status;
605605
ADIOI_Flatlist_node *flat_buf = NULL;
606-
MPI_Aint buftype_extent;
606+
MPI_Aint lb, buftype_extent;
607607
int info_flag, coll_bufsize;
608608
char *value;
609609
static char myname[] = "ADIOI_EXCH_AND_WRITE";
@@ -716,7 +716,7 @@ static void ADIOI_Exch_and_write(ADIO_File fd, const void *buf, MPI_Datatype
716716
if (!buftype_is_contig) {
717717
flat_buf = ADIOI_Flatten_and_find(datatype);
718718
}
719-
MPI_Type_extent(datatype, &buftype_extent);
719+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
720720

721721

722722
/* I need to check if there are any outstanding nonblocking writes to
@@ -787,7 +787,7 @@ static void ADIOI_Exch_and_write(ADIO_File fd, const void *buf, MPI_Datatype
787787
count[i]++;
788788
ADIOI_Assert((((ADIO_Offset) (uintptr_t) write_buf) + req_off - off) ==
789789
(ADIO_Offset) (uintptr_t) (write_buf + req_off - off));
790-
MPI_Address(write_buf + req_off - off, &(others_req[i].mem_ptrs[j]));
790+
MPI_Get_address(write_buf + req_off - off, &(others_req[i].mem_ptrs[j]));
791791
ADIOI_Assert((off + size - req_off) == (int) (off + size - req_off));
792792
recv_size[i] += (int) (MPL_MIN(off + size - req_off, (unsigned) req_len));
793793

‎3rd-party/romio341/adio/ad_lustre/ad_lustre_wrcoll.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ static void ADIOI_LUSTRE_Exch_and_write(ADIO_File fd, const void *buf,
399399
char *write_buf = NULL;
400400
MPI_Status status;
401401
ADIOI_Flatlist_node *flat_buf = NULL;
402-
MPI_Aint buftype_extent;
402+
MPI_Aint lb, buftype_extent;
403403
int stripe_size = striping_info[0], avail_cb_nodes = striping_info[2];
404404
int data_sieving = 0;
405405
ADIO_Offset *srt_off = NULL;
@@ -499,7 +499,7 @@ static void ADIOI_LUSTRE_Exch_and_write(ADIO_File fd, const void *buf,
499499
if (!buftype_is_contig) {
500500
flat_buf = ADIOI_Flatten_and_find(datatype);
501501
}
502-
MPI_Type_extent(datatype, &buftype_extent);
502+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
503503
/* I need to check if there are any outstanding nonblocking writes to
504504
* the file, which could potentially interfere with the writes taking
505505
* place in this collective write call. Since this is not likely to be
@@ -579,7 +579,7 @@ static void ADIOI_LUSTRE_Exch_and_write(ADIO_File fd, const void *buf,
579579
recv_count[i]++;
580580
ADIOI_Assert((((ADIO_Offset) (uintptr_t) write_buf) + req_off - off) ==
581581
(ADIO_Offset) (uintptr_t) (write_buf + req_off - off));
582-
MPI_Address(write_buf + req_off - off, &(others_req[i].mem_ptrs[j]));
582+
MPI_Get_address(write_buf + req_off - off, &(others_req[i].mem_ptrs[j]));
583583
recv_size[i] += req_len;
584584
} else {
585585
break;

‎3rd-party/romio341/adio/ad_lustre/ad_lustre_wrstr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void ADIOI_LUSTRE_WriteStrided(ADIO_File fd, const void *buf, int count,
151151
ADIO_Offset num, size, n_filetypes, etype_in_filetype, st_n_filetypes;
152152
ADIO_Offset abs_off_in_filetype = 0;
153153
MPI_Count filetype_size, etype_size, buftype_size;
154-
MPI_Aint filetype_extent, buftype_extent;
154+
MPI_Aint lb, filetype_extent, buftype_extent;
155155
int buf_count, buftype_is_contig, filetype_is_contig;
156156
ADIO_Offset userbuf_off;
157157
ADIO_Offset off, req_off, disp, end_offset = 0, writebuf_off, start_off;
@@ -186,9 +186,9 @@ void ADIOI_LUSTRE_WriteStrided(ADIO_File fd, const void *buf, int count,
186186
return;
187187
}
188188

189-
MPI_Type_extent(fd->filetype, &filetype_extent);
189+
MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
190190
MPI_Type_size_x(datatype, &buftype_size);
191-
MPI_Type_extent(datatype, &buftype_extent);
191+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
192192
etype_size = fd->etype_size;
193193

194194
ADIOI_Assert((buftype_size * count) ==

‎3rd-party/romio341/adio/ad_nfs/ad_nfs_read.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void ADIOI_NFS_ReadStrided(ADIO_File fd, void *buf, int count,
169169
ADIO_Offset n_filetypes, etype_in_filetype, st_n_filetypes, size_in_filetype;
170170
ADIO_Offset abs_off_in_filetype = 0, new_frd_size, frd_size = 0, st_frd_size;
171171
MPI_Count filetype_size, etype_size, buftype_size, partial_read;
172-
MPI_Aint filetype_extent, buftype_extent;
172+
MPI_Aint lb, filetype_extent, buftype_extent;
173173
int buf_count, buftype_is_contig, filetype_is_contig;
174174
ADIO_Offset userbuf_off, req_len, sum;
175175
ADIO_Offset off, req_off, disp, end_offset = 0, readbuf_off, start_off;
@@ -191,9 +191,9 @@ void ADIOI_NFS_ReadStrided(ADIO_File fd, void *buf, int count,
191191
return;
192192
}
193193

194-
MPI_Type_extent(fd->filetype, &filetype_extent);
194+
MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
195195
MPI_Type_size_x(datatype, &buftype_size);
196-
MPI_Type_extent(datatype, &buftype_extent);
196+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
197197
etype_size = fd->etype_size;
198198

199199
ADIOI_Assert((buftype_size * count) ==

‎3rd-party/romio341/adio/ad_nfs/ad_nfs_write.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ void ADIOI_NFS_WriteStrided(ADIO_File fd, const void *buf, int count,
274274
ADIO_Offset abs_off_in_filetype = 0;
275275
int req_len;
276276
MPI_Count filetype_size, etype_size, buftype_size;
277-
MPI_Aint filetype_extent, buftype_extent;
277+
MPI_Aint lb, filetype_extent, buftype_extent;
278278
int buf_count, buftype_is_contig, filetype_is_contig;
279279
ADIO_Offset userbuf_off;
280280
ADIO_Offset off, req_off, disp, end_offset = 0, writebuf_off, start_off;
@@ -296,9 +296,9 @@ void ADIOI_NFS_WriteStrided(ADIO_File fd, const void *buf, int count,
296296
return;
297297
}
298298

299-
MPI_Type_extent(fd->filetype, &filetype_extent);
299+
MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
300300
MPI_Type_size_x(datatype, &buftype_size);
301-
MPI_Type_extent(datatype, &buftype_extent);
301+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
302302
etype_size = fd->etype_size;
303303

304304
bufsize = buftype_size * count;

‎3rd-party/romio341/adio/ad_pvfs2/ad_pvfs2_io_dtype.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ int ADIOI_PVFS2_StridedDtypeIO(ADIO_File fd, void *buf, int count,
2121
PVFS_Request tmp_mem_req, mem_req, tmp_file_req, file_req;
2222
PVFS_sysresp_io resp_io;
2323
ADIO_Offset off = -1, bytes_into_filetype = 0;
24-
MPI_Aint filetype_extent = -1;
24+
MPI_Aint lb, filetype_extent = -1;
2525
int i = -1;
2626
MPI_Count etype_size;
2727
PVFS_size pvfs_disp = -1;
@@ -51,7 +51,7 @@ int ADIOI_PVFS2_StridedDtypeIO(ADIO_File fd, void *buf, int count,
5151
*error_code = MPI_SUCCESS;
5252
return -1;
5353
}
54-
MPI_Type_extent(fd->filetype, &filetype_extent);
54+
MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
5555
MPI_Type_size_x(fd->etype, &etype_size);
5656
if (filetype_size == 0) {
5757
*error_code = MPI_SUCCESS;

‎3rd-party/romio341/adio/ad_pvfs2/ad_pvfs2_io_list.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ int ADIOI_PVFS2_StridedListIO(ADIO_File fd, void *buf, int count,
4242
int64_t cur_flat_file_reg_off = 0;
4343
ADIOI_Flatlist_node *flat_buf_p, *flat_file_p;
4444
MPI_Count buftype_size = -1, filetype_size = -1;
45-
MPI_Aint filetype_extent = -1, buftype_extent = -1;;
45+
MPI_Aint lb, filetype_extent = -1, buftype_extent = -1;;
4646
int buftype_is_contig = -1, filetype_is_contig = -1;
4747

4848
/* PVFS2 specific parameters */
@@ -66,9 +66,9 @@ int ADIOI_PVFS2_StridedListIO(ADIO_File fd, void *buf, int count,
6666
*error_code = MPI_SUCCESS;
6767
return -1;
6868
}
69-
MPI_Type_extent(fd->filetype, &filetype_extent);
69+
MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
7070
MPI_Type_size_x(datatype, &buftype_size);
71-
MPI_Type_extent(datatype, &buftype_extent);
71+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
7272
io_size = buftype_size * count;
7373

7474
pvfs_fs = (ADIOI_PVFS2_fs *) fd->fs_ptr;

‎3rd-party/romio341/adio/ad_pvfs2/ad_pvfs2_open.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ void ADIOI_PVFS2_Open(ADIO_File fd, int *error_code)
196196
#endif
197197

198198
/* broadcast status and (possibly valid) object reference */
199-
MPI_Address(&o_status.error, &offsets[0]);
200-
MPI_Address(&o_status.object_ref, &offsets[1]);
199+
MPI_Get_address(&o_status.error, &offsets[0]);
200+
MPI_Get_address(&o_status.object_ref, &offsets[1]);
201201

202-
MPI_Type_struct(2, lens, offsets, types, &open_status_type);
202+
MPI_Type_create_struct(2, lens, offsets, types, &open_status_type);
203203
MPI_Type_commit(&open_status_type);
204204

205205
/* Assertion: if we hit this Bcast, then all processes collectively

‎3rd-party/romio341/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void ADIOI_PVFS2_OldReadStrided(ADIO_File fd, void *buf, int count,
2222
int n_filetypes, etype_in_filetype;
2323
ADIO_Offset abs_off_in_filetype = 0;
2424
MPI_Count filetype_size, etype_size, buftype_size;
25-
MPI_Aint filetype_extent, buftype_extent;
25+
MPI_Aint lb, filetype_extent, buftype_extent;
2626
int buf_count, buftype_is_contig, filetype_is_contig;
2727
ADIO_Offset off, disp, start_off, initial_off;
2828
int flag, st_frd_size, st_n_filetypes;
@@ -75,9 +75,9 @@ void ADIOI_PVFS2_OldReadStrided(ADIO_File fd, void *buf, int count,
7575
return;
7676
}
7777

78-
MPI_Type_extent(fd->filetype, &filetype_extent);
78+
MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent);
7979
MPI_Type_size_x(datatype, &buftype_size);
80-
MPI_Type_extent(datatype, &buftype_extent);
80+
MPI_Type_get_extent(datatype, &lb, &buftype_extent);
8181
etype_size = fd->etype_size;
8282

8383
bufsize = buftype_size * count;

0 commit comments

Comments
 (0)