diff options
| author | hdftest <hdftest@hdfgroup.org> | 2018-06-24 22:37:20 (GMT) |
|---|---|---|
| committer | hdftest <hdftest@hdfgroup.org> | 2018-06-24 22:37:20 (GMT) |
| commit | e9f476dad47ce593f13dacb77b1cc664d1f24e7b (patch) | |
| tree | c775d3e8a991a37373c0ec640d7a8c2e6b883b3c /src/H5Dmpio.c | |
| parent | 2ff00b1b937ebe36ac6ddf590c16a4c27fc0b053 (diff) | |
| parent | 25f80cbbec3a7d8036325784168b029cb71cc813 (diff) | |
| download | hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.zip hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.tar.gz hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.tar.bz2 | |
Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop
* commit '25f80cbbec3a7d8036325784168b029cb71cc813': (324 commits)
Snapshot version 1.10 release 3 (snap3)
Update document
HDFFV-10433 Updated text to address issues raised.
Snapshot version 1.10 release 3 (snap2)
Updated version to 1.10.3-snap2
Merge corrections from develop
HDFFV-10473 add note for attribute fix
Correct attribute location
HDFFV-9739 and cmake improvements merge from develop
Fix for HDFFV-10469: set to latest format for virtual layout encoding.
Update Windows test machines
Fix soversion
Fixed libver bounds underscore issue
removed extraneous lib. ver. bound, PR comment
temporary fix for HDFFV-10469
Updated version to 1.10.3-snap1
Add new file
Correct number of tests
Whitespace and test reclassify merge from develop
HDFFV-10444 fix so numbers and merge java test changes
...
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 107b751..e621e04 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -2630,6 +2630,7 @@ H5D__chunk_redistribute_shared_chunks(const H5D_io_info_t *io_info, const H5D_ty int *send_displacements = NULL; int scatter_recvcount_int; int mpi_rank, mpi_size, mpi_code; + hid_t fapl_id = -1; /* File access property list for H5S_encode() */ herr_t ret_value = SUCCEED; FUNC_ENTER_STATIC @@ -2644,6 +2645,9 @@ H5D__chunk_redistribute_shared_chunks(const H5D_io_info_t *io_info, const H5D_ty if ((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0) HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size") + if((fapl_id = H5F_get_access_plist(io_info->dset->oloc.file, FALSE)) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get fapl") + if (*local_chunk_array_num_entries) if (NULL == (send_requests = (MPI_Request *) H5MM_malloc(*local_chunk_array_num_entries * sizeof(MPI_Request)))) HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate send requests buffer") @@ -2749,7 +2753,7 @@ H5D__chunk_redistribute_shared_chunks(const H5D_io_info_t *io_info, const H5D_ty /* Determine size of serialized chunk file dataspace, plus the size of * the data being written */ - if (H5S_encode(chunk_info->fspace, &mod_data_p, &mod_data_size) < 0) + if (H5S_encode(chunk_info->fspace, &mod_data_p, &mod_data_size, fapl_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "unable to get encoded dataspace size") if ((iter_nelmts = H5S_GET_SELECT_NPOINTS(chunk_info->mspace)) < 0) @@ -2762,7 +2766,7 @@ H5D__chunk_redistribute_shared_chunks(const H5D_io_info_t *io_info, const H5D_ty /* Serialize the chunk's file dataspace into the buffer */ mod_data_p = mod_data[num_send_requests]; - if (H5S_encode(chunk_info->fspace, &mod_data_p, &mod_data_size) < 0) + if (H5S_encode(chunk_info->fspace, &mod_data_p, &mod_data_size, fapl_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "unable to encode dataspace") /* Intialize iterator for memory selection */ |