diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2018-01-17 14:14:45 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-01-17 14:14:45 -0800 |
| commit | c2a10a2aa23f3905ee22bb4b7c79ab963d966a9d (patch) | |
| tree | 18d502edbbc09b8f9cf255697bd135e9718fb584 /var/spack/repos/builtin/packages/silo/remove-mpiposix.patch | |
| parent | 52a9e5d2a31b4a66ce51d0ff03ab709417dee6dc (diff) | |
| parent | ba6c39310b537bbeafd4eb00836623ac2bb19d99 (diff) | |
| download | spack-0.11.0.tar.gz spack-0.11.0.tar.bz2 spack-0.11.0.tar.xz spack-0.11.0.zip | |
Merge branch 'releases/v0.11.0'v0.11.0
Diffstat (limited to 'var/spack/repos/builtin/packages/silo/remove-mpiposix.patch')
| -rw-r--r-- | var/spack/repos/builtin/packages/silo/remove-mpiposix.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/silo/remove-mpiposix.patch b/var/spack/repos/builtin/packages/silo/remove-mpiposix.patch new file mode 100644 index 0000000000..1c6449f0c0 --- /dev/null +++ b/var/spack/repos/builtin/packages/silo/remove-mpiposix.patch @@ -0,0 +1,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); |