summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2018-03-20 22:30:33 (GMT)
committerQuincey Koziol <koziol@lbl.gov>2018-03-20 22:30:33 (GMT)
commitc5db36c7df19f27d65b29364596e81f7d5c8434d (patch)
treebb1c027f03902961b0d0fe7fe564b46c72072700
parentc135db33656a94bdebb8b8c52275356208e4f3dd (diff)
downloadhdf5-c5db36c7df19f27d65b29364596e81f7d5c8434d.zip
hdf5-c5db36c7df19f27d65b29364596e81f7d5c8434d.tar.gz
hdf5-c5db36c7df19f27d65b29364596e81f7d5c8434d.tar.bz2
Update handling of reporting for breaking collective I/O when the default
DXPL is used.
-rw-r--r--src/H5CX.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/H5CX.c b/src/H5CX.c
index ad84bd9..0f98a15 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -2436,12 +2436,14 @@ H5CX_set_mpio_local_no_coll_cause(uint32_t mpio_local_no_coll_cause)
/* Sanity checks */
HDassert(head && *head);
- HDassert(!((*head)->ctx.dxpl_id == H5P_DEFAULT ||
- (*head)->ctx.dxpl_id == H5P_DATASET_XFER_DEFAULT));
+ HDassert((*head)->ctx.dxpl_id != H5P_DEFAULT);
- /* Cache the value for later, marking it to set in DXPL when context popped */
- (*head)->ctx.mpio_local_no_coll_cause = mpio_local_no_coll_cause;
- (*head)->ctx.mpio_local_no_coll_cause_set = TRUE;
+ /* If we're using the default DXPL, don't modify it */
+ if((*head)->ctx.dxpl_id != H5P_DATASET_XFER_DEFAULT) {
+ /* Cache the value for later, marking it to set in DXPL when context popped */
+ (*head)->ctx.mpio_local_no_coll_cause = mpio_local_no_coll_cause;
+ (*head)->ctx.mpio_local_no_coll_cause_set = TRUE;
+ } /* end if */
FUNC_LEAVE_NOAPI_VOID
} /* end H5CX_set_mpio_local_no_coll_cause() */
@@ -2468,12 +2470,14 @@ H5CX_set_mpio_global_no_coll_cause(uint32_t mpio_global_no_coll_cause)
/* Sanity checks */
HDassert(head && *head);
- HDassert(!((*head)->ctx.dxpl_id == H5P_DEFAULT ||
- (*head)->ctx.dxpl_id == H5P_DATASET_XFER_DEFAULT));
+ HDassert((*head)->ctx.dxpl_id != H5P_DEFAULT);
- /* Cache the value for later, marking it to set in DXPL when context popped */
- (*head)->ctx.mpio_global_no_coll_cause = mpio_global_no_coll_cause;
- (*head)->ctx.mpio_global_no_coll_cause_set = TRUE;
+ /* If we're using the default DXPL, don't modify it */
+ if((*head)->ctx.dxpl_id != H5P_DATASET_XFER_DEFAULT) {
+ /* Cache the value for later, marking it to set in DXPL when context popped */
+ (*head)->ctx.mpio_global_no_coll_cause = mpio_global_no_coll_cause;
+ (*head)->ctx.mpio_global_no_coll_cause_set = TRUE;
+ } /* end if */
FUNC_LEAVE_NOAPI_VOID
} /* end H5CX_set_mpio_global_no_coll_cause() */