hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

silo: adding patch to support newer versions of hdf5 (#3162)

Browse source
This commit is contained in:
Carlos Bederián 2017-02-20 03:45:19 +02:00 committed by Todd Gamblin
parent 7edea4361f
commit 4b9a37a357
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
var/spack/repos/builtin/packages/silo/package.py
View file

@ -41,10 +41,11 @@ class Silo(Package):
variant('silex', default=False, variant('silex', default=False,
description='Builds Silex, a GUI for viewing Silo files') description='Builds Silex, a GUI for viewing Silo files')
# silo uses the obsolete function H5Pset_fapl_mpiposix: depends_on('hdf5')
depends_on("hdf5 @:1.8.12")
depends_on('qt', when='+silex') depends_on('qt', when='+silex')
patch('remove-mpiposix.patch', when='@4.8:4.10.2')
def install(self, spec, prefix): def install(self, spec, prefix):
config_args = [ config_args = [
'--enable-fortran' if '+fortran' in spec else '--disable-fortran', '--enable-fortran' if '+fortran' in spec else '--disable-fortran',

40
var/spack/repos/builtin/packages/silo/remove-mpiposix.patch Normal file
View file

@ -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);