summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2020-08-20 23:24:07 (GMT)
committerQuincey Koziol <koziol@lbl.gov>2020-08-20 23:24:07 (GMT)
commit4c43ff0b8b015ccfc1f4aeab18f189d629a5beb9 (patch)
treec7fafbc009f9c2bb0f9b36318753d5eb48cc2124
parentfa0d395370daa7337ed2676d30198937145ad6e9 (diff)
downloadhdf5-4c43ff0b8b015ccfc1f4aeab18f189d629a5beb9.zip
hdf5-4c43ff0b8b015ccfc1f4aeab18f189d629a5beb9.tar.gz
hdf5-4c43ff0b8b015ccfc1f4aeab18f189d629a5beb9.tar.bz2
Simplify default use of MPI_BYTE
-rw-r--r--src/H5Dchunk.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index b57a608..b2a9eb6 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -4954,7 +4954,7 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_info_t *chunk_info,
int blocks, leftover, block_len; /* converted to int for MPI */
MPI_Aint *chunk_disp_array = NULL;
int *block_lens = NULL;
- MPI_Datatype mem_type = MPI_DATATYPE_NULL, file_type = MPI_DATATYPE_NULL;
+ MPI_Datatype mem_type = MPI_BYTE, file_type = MPI_BYTE;
H5FD_mpio_xfer_t prev_xfer_mode; /* Previous data xfer mode */
hbool_t have_xfer_mode = FALSE; /* Whether the previous xffer mode has been retrieved */
hbool_t need_addr_sort = FALSE;
@@ -5046,11 +5046,6 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_info_t *chunk_info,
if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&mem_type)))
HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
} /* end if */
- else {
- /* Set up file & memory MPI types, to participate in collective write */
- file_type = MPI_BYTE;
- mem_type = MPI_BYTE;
- } /* end else */
/* Set MPI-IO VFD properties */
@@ -5082,10 +5077,10 @@ done:
HDONE_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set transfer mode")
/* free things */
- if(MPI_DATATYPE_NULL != file_type && MPI_BYTE != file_type)
+ if(MPI_BYTE != file_type)
if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&file_type)))
HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
- if(MPI_DATATYPE_NULL != mem_type && MPI_BYTE != mem_type)
+ if(MPI_BYTE != mem_type)
if(MPI_SUCCESS != (mpi_code = MPI_Type_free(&mem_type)))
HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
H5MM_xfree(chunk_disp_array);