diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2018-10-15 16:04:17 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2018-10-15 16:04:17 (GMT) |
| commit | f3f29dc7df5f3cc41a5e9462d8c415e540cda3d6 (patch) | |
| tree | 98e19e98333de2fcdf6f8f9a777528dde879733d /src/H5Dmpio.c | |
| parent | 6569f208b8f39ace9e442e94ab110bec94c67d37 (diff) | |
| parent | 545c5fb2a957c245f283c6db5c429b7b89cda622 (diff) | |
| download | hdf5-f3f29dc7df5f3cc41a5e9462d8c415e540cda3d6.zip hdf5-f3f29dc7df5f3cc41a5e9462d8c415e540cda3d6.tar.gz hdf5-f3f29dc7df5f3cc41a5e9462d8c415e540cda3d6.tar.bz2 | |
Merge branch 'hdf5_1_10_4' into 1.10/masterhdf5-1_10_4
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 9bffd8b..a669593 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -925,7 +925,6 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ hbool_t chunk_final_ftype_is_derived = FALSE; H5D_storage_t ctg_store; /* Storage info for "fake" contiguous dataset */ size_t total_chunks; - haddr_t *total_chunk_addr_array = NULL; MPI_Datatype *chunk_mtype = NULL; MPI_Datatype *chunk_ftype = NULL; MPI_Aint *chunk_disp_array = NULL; @@ -1146,20 +1145,7 @@ if(H5DEBUG(D)) mpi_buf_count = (hsize_t)1; } /* end if */ else { /* no selection at all for this process */ - /* Allocate chunking information */ - if(NULL == (total_chunk_addr_array = (haddr_t *)H5MM_malloc(sizeof(haddr_t) * total_chunks))) - HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "couldn't allocate total chunk address arraybuffer") - - /* Retrieve chunk address map */ - if(H5D__chunk_addrmap(io_info, total_chunk_addr_array) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address") - - /* Get chunk with lowest address */ - ctg_store.contig.dset_addr = HADDR_MAX; - for(u = 0; u < total_chunks; u++) - if(total_chunk_addr_array[u] < ctg_store.contig.dset_addr) - ctg_store.contig.dset_addr = total_chunk_addr_array[u]; - HDassert(ctg_store.contig.dset_addr != HADDR_MAX); + ctg_store.contig.dset_addr = 0; /* Set the MPI datatype */ chunk_final_ftype = MPI_BYTE; @@ -1187,8 +1173,6 @@ if(H5DEBUG(D)) HDfprintf(H5DEBUG(D),"before freeing memory inside H5D_link_collective_io ret_value = %d\n", ret_value); #endif /* Release resources */ - if(total_chunk_addr_array) - H5MM_xfree(total_chunk_addr_array); if(chunk_addr_info_array) H5MM_xfree(chunk_addr_info_array); if(chunk_mtype) |