From c5db36c7df19f27d65b29364596e81f7d5c8434d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 20 Mar 2018 17:30:33 -0500 Subject: Update handling of reporting for breaking collective I/O when the default DXPL is used. --- src/H5CX.c | 24 ++++++++++++++---------- 1 file 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() */ -- cgit v0.12