1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Index: silo-llnl-4.9.1/src/hdf5_drv/silo_hdf5.c
===================================================================
--- silo-llnl-4.9.1.orig/src/hdf5_drv/silo_hdf5.c
+++ silo-llnl-4.9.1/src/hdf5_drv/silo_hdf5.c
@@ -4717,16 +4717,7 @@ db_hdf5_process_file_options(opts_set_id
/* default HDF5 mpi drivers */
case DB_FILE_OPTS_H5_DEFAULT_MPIP:
- {
-#ifdef H5_HAVE_PARALLEL
- h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
-#else
- H5Pclose(retval);
- return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
-#endif
- break;
- }
-
+ /* FALLTHROUGH */
case DB_FILE_OPTS_H5_DEFAULT_MPIO:
{
#ifdef H5_HAVE_PARALLEL
@@ -4963,15 +4954,8 @@ db_hdf5_process_file_options(opts_set_id
if (p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS))
use_gpfs_hints = FALSE;
- if (vfd == DB_H5VFD_MPIO)
- {
- h5status |= H5Pset_fapl_mpio(retval, mpi_comm, mpi_info);
- if (created_info) MPI_Info_free(&mpi_info);
- }
- else
- {
- h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints);
- }
+ h5status |= H5Pset_fapl_mpio(retval, mpi_comm, mpi_info);
+ if (created_info) MPI_Info_free(&mpi_info);
#else
H5Pclose(retval);
return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
|