mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct handling for HDF5 releases w/o MPI-POSIX VFD.

Browse Source
This commit is contained in:
Quincey Koziol 2014-11-06 08:50:27 -06:00
parent 740a7bfc21
commit f9d1d550f5
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc4/nc4file.c
View File

@ -302,6 +302,11 @@ nc4_create_file(const char *path, int cmode, MPI_Comm comm, MPI_Info info,
if ((cmode & NC_MPIIO) || (cmode & NC_MPIPOSIX))
{
nc4_info->parallel = NC_TRUE;
/* If the MPI-POSIX VFD is available in HDF5, allow using it. Otherwise,
* alias NC_MPIPOSIX to use the MPI-IO VFD.
*/
#ifdef USE_PARALLEL_POSIX
if (cmode & NC_MPIIO) /* MPI/IO */
{
LOG((4, "creating parallel file with MPI/IO"));
@ -314,6 +319,11 @@ nc4_create_file(const char *path, int cmode, MPI_Comm comm, MPI_Info info,
if (H5Pset_fapl_mpiposix(fapl_id, comm, 0) < 0)
BAIL(NC_EPARINIT);
}
#else /* USE_PARALLEL_POSIX */
LOG((4, "creating parallel file with MPI/IO"));
if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0)
BAIL(NC_EPARINIT);
#endif /* USE_PARALLEL_POSIX */
/* Keep copies of the MPI Comm & Info objects */
if (MPI_SUCCESS != MPI_Comm_dup(comm, &nc4_info->comm))
@ -2162,6 +2172,11 @@ nc4_open_file(const char *path, int mode, MPI_Comm comm,
if (mode & NC_MPIIO || mode & NC_MPIPOSIX)
{
nc4_info->parallel = NC_TRUE;
/* If the MPI-POSIX VFD is available in HDF5, allow using it. Otherwise,
* alias NC_MPIPOSIX to use the MPI-IO VFD.
*/
#ifdef USE_PARALLEL_POSIX
if (mode & NC_MPIIO) /* MPI/IO */
{
LOG((4, "opening parallel file with MPI/IO"));
@ -2174,6 +2189,11 @@ nc4_open_file(const char *path, int mode, MPI_Comm comm,
if (H5Pset_fapl_mpiposix(fapl_id, comm, 0) < 0)
BAIL(NC_EPARINIT);
}
#else /* USE_PARALLEL_POSIX */
LOG((4, "opening parallel file with MPI/IO"));
if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0)
BAIL(NC_EPARINIT);
#endif /* USE_PARALLEL_POSIX */
/* Keep copies of the MPI Comm & Info objects */
if (MPI_SUCCESS != MPI_Comm_dup(comm, &nc4_info->comm))

3
nc_test4/tst_parallel3.c
View File

@ -92,9 +92,6 @@ int main(int argc, char **argv)
return -1;
}
if (facc_type != NC_MPIPOSIX)
facc_type = NC_MPIIO;
facc_type = NC_NETCDF4|NC_MPIIO;
facc_type_open = NC_MPIIO;