diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-21 21:00:22 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-21 21:00:22 (GMT) |
| commit | 4b9ee6b88b3415baa684c9a2d0fb9379f7687768 (patch) | |
| tree | e0542599f2be5c9f804108fabeb7d1c4d05322e3 /src/H5Dio.c | |
| parent | e8e06cbca06eba0ff1107caf7f4cbeb1f0f835c6 (diff) | |
| download | hdf5-4b9ee6b88b3415baa684c9a2d0fb9379f7687768.zip hdf5-4b9ee6b88b3415baa684c9a2d0fb9379f7687768.tar.gz hdf5-4b9ee6b88b3415baa684c9a2d0fb9379f7687768.tar.bz2 | |
[svn-r25996] - merge changes from trunk to eliminate usage of IS_H5FD_MPI Macro.
- add 2 missing feature flags for VFDs: H5FD_FEAT_HAS_MPI & H5FD_FEAT_ALLOCATE_EARLY and use them as appropriate.
tested with h5commitest
Diffstat (limited to 'src/H5Dio.c')
| -rw-r--r-- | src/H5Dio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index b0fc822..7495f7f 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -427,7 +427,8 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, #ifdef H5_HAVE_PARALLEL /* Collective access is not permissible without a MPI based VFD */ - if(dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPI(dataset->oloc.file)) + if(dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE && + !(H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI))) HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPI-based drivers only") #endif /*H5_HAVE_PARALLEL*/ @@ -646,7 +647,7 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, /* Various MPI based checks */ #ifdef H5_HAVE_PARALLEL - if(IS_H5FD_MPI(dataset->oloc.file)) { + if(H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI)) { /* If MPI based VFD is used, no VL datatype support yet. */ /* This is because they use the global heap in the file and we don't */ /* support parallel access of that yet */ @@ -889,7 +890,7 @@ const #ifdef H5_HAVE_PARALLEL /* Determine if the file was opened with an MPI VFD */ - io_info->using_mpi_vfd = IS_H5FD_MPI(dset->oloc.file); + io_info->using_mpi_vfd = H5F_HAS_FEATURE(dset->oloc.file, H5FD_FEAT_HAS_MPI); #endif /* H5_HAVE_PARALLEL */ FUNC_LEAVE_NOAPI(SUCCEED) |