Skip to content

Commit 272683c

Browse files
committed
use MPI-IO explicit file offset subroutines only
MPI_File_read_at MPI_File_read_at_all MPI_File_write_at MPI_File_write_at_all
1 parent 7d05e3a commit 272683c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/drivers/ncmpio/ncmpio_intra_node.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ intra_node_aggregation(NC *ncp,
11641164

11651165
/* pack recv_buf, data received from non-aggregators, into wr_buf, a
11661166
* contiguous buffer, wr_buf, which will later be used in a call to
1167-
* MPI_File_write_all()
1167+
* MPI_File_write_at_all()
11681168
*/
11691169
char *ptr = wr_buf;
11701170
buf_count = 0;

src/drivers/ncmpio/ncmpio_wait.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ ncmpio_getput_zero_req(NC *ncp, int reqMode)
6666

6767
if (fIsSet(reqMode, NC_REQ_RD)) {
6868
if (ncp->nprocs > 1)
69-
TRACE_IO(MPI_File_read_all)(fh, NULL, 0, MPI_BYTE, &mpistatus);
69+
TRACE_IO(MPI_File_read_at_all)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
7070
else
71-
TRACE_IO(MPI_File_read)(fh, NULL, 0, MPI_BYTE, &mpistatus);
71+
TRACE_IO(MPI_File_read_at)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
7272
if (mpireturn != MPI_SUCCESS) {
73-
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_read_all");
73+
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_read_at_all");
7474
err = (err == NC_EFILE) ? NC_EREAD : err;
7575
DEBUG_ASSIGN_ERROR(status, err)
7676
}
7777
} else { /* write request */
7878
if (ncp->nprocs > 1)
79-
TRACE_IO(MPI_File_write_all)(fh, NULL, 0, MPI_BYTE, &mpistatus);
79+
TRACE_IO(MPI_File_write_at_all)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
8080
else
81-
TRACE_IO(MPI_File_write)(fh, NULL, 0, MPI_BYTE, &mpistatus);
81+
TRACE_IO(MPI_File_write_at)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
8282
if (mpireturn != MPI_SUCCESS) {
83-
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_write_all");
83+
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_write_at_all");
8484
err = (err == NC_EFILE) ? NC_EWRITE : err;
8585
DEBUG_ASSIGN_ERROR(status, err)
8686
}
@@ -2074,7 +2074,7 @@ req_aggregation(NC *ncp,
20742074
buf_len = 0;
20752075
}
20762076

2077-
/* call MPI_File_read/MPI_File_write */
2077+
/* call MPI_File_read_at_all/MPI_File_write_at_all */
20782078
err = ncmpio_read_write(ncp, rw_flag, coll_indep, offset, buf_len, buf_type,
20792079
buf, ((buf_type == MPI_BYTE) ? 1 : 0));
20802080
if (status == NC_NOERR) status = err;
@@ -2498,7 +2498,7 @@ mgetput(NC *ncp,
24982498
buf_count = 0;
24992499
}
25002500

2501-
/* call MPI_File_read/MPI_File_write */
2501+
/* call MPI_File_read_at_all/MPI_File_write_at_all */
25022502
err = ncmpio_read_write(ncp, rw_flag, coll_indep, offset, buf_count,
25032503
buf_type, buf, ((buf_type == MPI_BYTE) ? 1 : 0));
25042504
if (status == NC_NOERR) status = err;

0 commit comments

Comments
 (0)