From 55f7fe7f1b236bbe496ff1af79331166df4b7e83 Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Wed, 2 Jan 2019 09:39:03 -0600 Subject: Removed reason for breaking read-proc0-and-bcast --- src/H5Dmpio.c | 4 ++-- src/H5Pprivate.h | 1 - src/H5Ppublic.h | 6 ------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index df2cc9e..e1c0edb 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -354,7 +354,7 @@ H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space, /* Flag to do a MPI_Bcast of the data from one proc instead of * having all the processes involved in the persistent I/O. */ - local_cause[1] |= H5D_MPIO_NOT_H5S_ALL; + local_cause[1] |= 0x01; } else { @@ -367,7 +367,7 @@ H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space, H5D__get_storage_size(io_info->dset, &dset_storage_size); if(dset_storage_size > ((hsize_t)(H5_2GB) - 1) ) { - local_cause[1] |= H5D_MPIO_GREATER_THAN_2GB; + local_cause[1] |= 0x02; } } diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index 866f088..7007635 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -44,7 +44,6 @@ typedef struct H5P_genplist_t H5P_genplist_t; #define H5_COLL_MD_READ_FLAG_NAME "collective_metadata_read" - /****************************/ /* Library Private Typedefs */ /****************************/ diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 6f41ecd..86c6687 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -170,12 +170,6 @@ typedef enum H5D_mpio_no_collective_cause_t { H5D_MPIO_NO_COLLECTIVE_MAX_CAUSE = 0x80 } H5D_mpio_no_collective_cause_t; -typedef enum H5D_mpio_no_proc0_bcast_cause_t { - H5D_MPIO_PROC0_BCAST = 0x00, - H5D_MPIO_NOT_H5S_ALL = 0x01, - H5D_MPIO_GREATER_THAN_2GB = 0x02 -} H5D_mpio_no_proc0_bcast_cause_t; - /********************/ /* Public Variables */ /********************/ -- cgit v0.12