diff options
| author | hdftest <hdftest@hdfgroup.org> | 2018-06-24 23:04:23 (GMT) |
|---|---|---|
| committer | hdftest <hdftest@hdfgroup.org> | 2018-06-24 23:04:23 (GMT) |
| commit | b193bc11c966d79b76ebc3bbe76728f0693693ef (patch) | |
| tree | 83b9e6782bc080051d3056f5610952a4bef08ca9 /src/H5Dmpio.c | |
| parent | e9f476dad47ce593f13dacb77b1cc664d1f24e7b (diff) | |
| download | hdf5-b193bc11c966d79b76ebc3bbe76728f0693693ef.zip hdf5-b193bc11c966d79b76ebc3bbe76728f0693693ef.tar.gz hdf5-b193bc11c966d79b76ebc3bbe76728f0693693ef.tar.bz2 | |
Revert "Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop"
This reverts commit e9f476dad47ce593f13dacb77b1cc664d1f24e7b, reversing
changes made to 2ff00b1b937ebe36ac6ddf590c16a4c27fc0b053.
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index e621e04..107b751 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -2630,7 +2630,6 @@ 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 @@ -2645,9 +2644,6 @@ 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") @@ -2753,7 +2749,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, fapl_id) < 0) + if (H5S_encode(chunk_info->fspace, &mod_data_p, &mod_data_size) < 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) @@ -2766,7 +2762,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, fapl_id) < 0) + if (H5S_encode(chunk_info->fspace, &mod_data_p, &mod_data_size) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "unable to encode dataspace") /* Intialize iterator for memory selection */ |