Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/drivers/ncmpio/ncmpio_intra_node.c
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ intra_node_aggregation(NC *ncp,

/* pack recv_buf, data received from non-aggregators, into wr_buf, a
* contiguous buffer, wr_buf, which will later be used in a call to
* MPI_File_write_all()
* MPI_File_write_at_all()
*/
char *ptr = wr_buf;
buf_count = 0;
Expand Down
16 changes: 8 additions & 8 deletions src/drivers/ncmpio/ncmpio_wait.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@ ncmpio_getput_zero_req(NC *ncp, int reqMode)

if (fIsSet(reqMode, NC_REQ_RD)) {
if (ncp->nprocs > 1)
TRACE_IO(MPI_File_read_all)(fh, NULL, 0, MPI_BYTE, &mpistatus);
TRACE_IO(MPI_File_read_at_all)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
else
TRACE_IO(MPI_File_read)(fh, NULL, 0, MPI_BYTE, &mpistatus);
TRACE_IO(MPI_File_read_at)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
if (mpireturn != MPI_SUCCESS) {
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_read_all");
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_read_at_all");
err = (err == NC_EFILE) ? NC_EREAD : err;
DEBUG_ASSIGN_ERROR(status, err)
}
} else { /* write request */
if (ncp->nprocs > 1)
TRACE_IO(MPI_File_write_all)(fh, NULL, 0, MPI_BYTE, &mpistatus);
TRACE_IO(MPI_File_write_at_all)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
else
TRACE_IO(MPI_File_write)(fh, NULL, 0, MPI_BYTE, &mpistatus);
TRACE_IO(MPI_File_write_at)(fh, 0, NULL, 0, MPI_BYTE, &mpistatus);
if (mpireturn != MPI_SUCCESS) {
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_write_all");
err = ncmpii_error_mpi2nc(mpireturn, "MPI_File_write_at_all");
err = (err == NC_EFILE) ? NC_EWRITE : err;
DEBUG_ASSIGN_ERROR(status, err)
}
Expand Down Expand Up @@ -2074,7 +2074,7 @@ req_aggregation(NC *ncp,
buf_len = 0;
}

/* call MPI_File_read/MPI_File_write */
/* call MPI_File_read_at_all/MPI_File_write_at_all */
err = ncmpio_read_write(ncp, rw_flag, coll_indep, offset, buf_len, buf_type,
buf, ((buf_type == MPI_BYTE) ? 1 : 0));
if (status == NC_NOERR) status = err;
Expand Down Expand Up @@ -2498,7 +2498,7 @@ mgetput(NC *ncp,
buf_count = 0;
}

/* call MPI_File_read/MPI_File_write */
/* call MPI_File_read_at_all/MPI_File_write_at_all */
err = ncmpio_read_write(ncp, rw_flag, coll_indep, offset, buf_count,
buf_type, buf, ((buf_type == MPI_BYTE) ? 1 : 0));
if (status == NC_NOERR) status = err;
Expand Down