diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-02-12 22:50:48 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-02-12 22:50:48 (GMT) |
| commit | 6721c0f1317e8ed74bd56b7f4b3f8972ab277845 (patch) | |
| tree | f80e9ae6194f57f0c48cdb53ca04e1786c41f88d /src/H5Dchunk.c | |
| parent | c7c31475873a807750b916046eb5973df358b157 (diff) | |
| parent | 2e44998a70924b77f186f6cb60924035fd24441d (diff) | |
| download | hdf5-6721c0f1317e8ed74bd56b7f4b3f8972ab277845.zip hdf5-6721c0f1317e8ed74bd56b7f4b3f8972ab277845.tar.gz hdf5-6721c0f1317e8ed74bd56b7f4b3f8972ab277845.tar.bz2 | |
Merge pull request #1536 in HDFFV/hdf5 from ~JHENDERSON/hdf5:hdf5_1_10 to hdf5_1_10
* commit '2e44998a70924b77f186f6cb60924035fd24441d':
Add RELEASE.txt note for collective metadata read fixes
Fix some collective metadata read issues
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 0be19bd..553d75c 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2930,9 +2930,6 @@ H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, /* Check for cached information */ if(!H5D__chunk_cinfo_cache_found(&dset->shared->cache.chunk.last, udata)) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ -#ifdef H5_HAVE_PARALLEL - H5P_coll_md_read_flag_t temp_cmr; /* Temp value to hold the coll metadata read setting */ -#endif /* H5_HAVE_PARALLEL */ /* Compose chunked index info struct */ idx_info.f = dset->oloc.file; @@ -2941,25 +2938,18 @@ H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, idx_info.storage = &dset->shared->layout.storage.u.chunk; #ifdef H5_HAVE_PARALLEL - if(H5F_HAS_FEATURE(idx_info.f, H5FD_FEAT_HAS_MPI)) { - /* disable collective metadata read for chunk indexes - as it is highly unlikely that users would read the - same chunks from all processes. MSC - might turn on - for root node? */ - temp_cmr = H5F_COLL_MD_READ(idx_info.f); - H5F_set_coll_md_read(idx_info.f, H5P_FORCE_FALSE); - } /* end if */ + /* Disable collective metadata read for chunk indexes as it is + * highly unlikely that users would read the same chunks from all + * processes. + */ + if(H5F_HAS_FEATURE(idx_info.f, H5FD_FEAT_HAS_MPI)) + H5CX_set_coll_metadata_read(FALSE); #endif /* H5_HAVE_PARALLEL */ /* Go get the chunk information */ if((dset->shared->layout.storage.u.chunk.ops->get_addr)(&idx_info, udata) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query chunk address") -#ifdef H5_HAVE_PARALLEL - if(H5F_HAS_FEATURE(idx_info.f, H5FD_FEAT_HAS_MPI)) - H5F_set_coll_md_read(idx_info.f, temp_cmr); -#endif /* H5_HAVE_PARALLEL */ - /* * Cache the information retrieved. * |