diff options
author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-01-08 15:55:29 (GMT) |
---|---|---|
committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-01-08 15:55:29 (GMT) |
commit | 1421059cfba7af05bb4a675820e9c5a6a73e77fe (patch) | |
tree | 156a3e1be5afeff69cdcfbcd6e60b521c41b3a66 /src/H5Dio.c | |
parent | b4828e7feb8fd11514683c6eef8809356751760a (diff) | |
parent | 74a41f92a48d553a33b80d84d0981623327074af (diff) | |
download | hdf5-1421059cfba7af05bb4a675820e9c5a6a73e77fe.zip hdf5-1421059cfba7af05bb4a675820e9c5a6a73e77fe.tar.gz hdf5-1421059cfba7af05bb4a675820e9c5a6a73e77fe.tar.bz2 |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'src/H5Dio.c')
-rw-r--r-- | src/H5Dio.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index fe85d23..6062dff 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -657,22 +657,12 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, /* Various MPI based checks */ #ifdef H5_HAVE_PARALLEL - if H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI) { - /* If MPI based VFD is used, no VL datatype support yet. */ + if(H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI)) { + /* If MPI based VFD is used, no VL or region reference datatype support yet. */ /* This is because they use the global heap in the file and we don't */ /* support parallel access of that yet */ - if(H5T_detect_class(type_info.mem_type, H5T_VLEN, FALSE) > 0) - HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Parallel IO does not support writing VL datatypes yet") - - /* 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 */ - /* We should really use H5T_detect_class() here, but it will be difficult - * to detect the type of the reference if it is nested... -QAK - */ - if(H5T_get_class(type_info.mem_type, TRUE) == H5T_REFERENCE && - H5T_get_ref_type(type_info.mem_type) == H5R_DATASET_REGION) - HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Parallel IO does not support writing region reference datatypes yet") + if(H5T_is_vl_storage(type_info.mem_type) > 0) + HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Parallel IO does not support writing VL or region reference datatypes yet") } /* end if */ else { H5FD_mpio_xfer_t io_xfer_mode; /* MPI I/O transfer mode */ |