diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-09-03 01:41:09 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2020-09-03 01:44:40 (GMT) |
| commit | 1f54ae64c190e9fca9626a5adee8a2f4b396ccaf (patch) | |
| tree | 8432c25fddc4e7dc43d398a2e0e2d9224af5916e /src/H5Cmpio.c | |
| parent | 88e5655be861f7f8a7b5a7979376607b955cc6bc (diff) | |
| download | hdf5-1f54ae64c190e9fca9626a5adee8a2f4b396ccaf.zip hdf5-1f54ae64c190e9fca9626a5adee8a2f4b396ccaf.tar.gz hdf5-1f54ae64c190e9fca9626a5adee8a2f4b396ccaf.tar.bz2 | |
Fix mis-merge from develop
Diffstat (limited to 'src/H5Cmpio.c')
| -rw-r--r-- | src/H5Cmpio.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c index b0e9c16..4989eea 100644 --- a/src/H5Cmpio.c +++ b/src/H5Cmpio.c @@ -921,6 +921,7 @@ H5C__collective_write(H5F_t *f) { H5AC_t *cache_ptr; H5FD_mpio_xfer_t orig_xfer_mode = H5FD_MPIO_COLLECTIVE; + void *base_buf; int count; int *length_array = NULL; MPI_Aint *buf_array = NULL; @@ -953,10 +954,8 @@ H5C__collective_write(H5F_t *f) /* Get number of entries in collective write list */ count = (int)H5SL_count(cache_ptr->coll_write_list); if(count > 0) { - H5FD_mpio_xfer_t xfer_mode = H5FD_MPIO_COLLECTIVE; H5SL_node_t *node; H5C_cache_entry_t *entry_ptr; - void *base_buf; int i; /* Allocate arrays */ @@ -1009,10 +1008,6 @@ H5C__collective_write(H5F_t *f) if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&ftype))) HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code) - /* Pass buf type, file type to the file driver */ - if(H5CX_set_mpi_coll_datatypes(btype, ftype) < 0) - HGOTO_ERROR(H5E_CACHE, H5E_CANTSET, FAIL, "can't set MPI-I/O properties") - /* MPI count to write */ buf_count = 1; } /* end if */ |