diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-08-27 21:00:49 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-08-27 21:00:49 (GMT) |
| commit | 937616872cf228f838fd1eb2853ce6110f3da10b (patch) | |
| tree | 02bc86f7988cddf75087ee56c667323f3727d83a /src/H5FDmpio.c | |
| parent | 477bd6cd77d931bffaaed707fd1f4d43f19d44ab (diff) | |
| download | hdf5-937616872cf228f838fd1eb2853ce6110f3da10b.zip hdf5-937616872cf228f838fd1eb2853ce6110f3da10b.tar.gz hdf5-937616872cf228f838fd1eb2853ce6110f3da10b.tar.bz2 | |
Minor tweaks to new H5P MPI code based on code review feedback.
Diffstat (limited to 'src/H5FDmpio.c')
| -rw-r--r-- | src/H5FDmpio.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 13efcff..71e9fe1 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -792,20 +792,11 @@ H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id, if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list") - /* Set MPI communicator and info object */ - if(H5P_FILE_ACCESS_DEFAULT == fapl_id || H5FD_MPIO != H5P_peek_driver(plist)) { - /* Non-parallel defaults */ - if(FAIL == H5_mpi_comm_dup(MPI_COMM_SELF, &comm)) - HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "communicator duplicate failed") - info = MPI_INFO_NULL; - } - else { - /* Get the MPI communicator and info object from the property list */ - if(H5P_get(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, &comm) < 0) - HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get MPI communicator") - if(H5P_get(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, &info) < 0) - HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get MPI info object") - } + /* Get the MPI communicator and info object from the property list */ + if(H5P_get(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, &comm) < 0) + HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get MPI communicator") + if(H5P_get(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, &info) < 0) + HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get MPI info object") /* Convert HDF5 flags to MPI-IO flags */ /* Some combinations are illegal; let MPI-IO figure it out */ |