sci-libs/silo/files/silo-4.10.2-mpiposix.patch

   1 --- src/hdf5_drv/silo_hdf5.c.orig       2017-07-28 08:52:09.026638768 +0200
   2 +++ src/hdf5_drv/silo_hdf5.c    2017-07-28 09:00:12.306635882 +0200
   3 @@ -4752,18 +4752,19 @@
   4          }
   5
   6          /* default HDF5 mpi drivers */
   7 -        case DB_FILE_OPTS_H5_DEFAULT_MPIP:
   8 -        {
   9 -#ifdef H5_HAVE_PARALLEL
  10 -            h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
  11 -#else
  12 -            H5Pclose(retval);
  13 -            return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
  14 -#endif
  15 -            break;
  16 -        }
  17 +//        case DB_FILE_OPTS_H5_DEFAULT_MPIP:
  18 +//        {
  19 +//#ifdef H5_HAVE_PARALLEL
  20 +//            h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
  21 +//#else
  22 +//            H5Pclose(retval);
  23 +//            return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
  24 +//#endif
  25 +//            break;
  26 +//        }
  27
  28          case DB_FILE_OPTS_H5_DEFAULT_MPIO:
  29 +       case DB_FILE_OPTS_H5_DEFAULT_MPIP:
  30          {
  31  #ifdef H5_HAVE_PARALLEL
  32              MPI_Info info;
  33 @@ -5069,15 +5070,15 @@
  34                      if ((p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS)))
  35                          use_gpfs_hints = FALSE;
  36
  37 -                    if (vfd == DB_H5VFD_MPIO)
  38 +//                    if (vfd == DB_H5VFD_MPIO)
  39                      {
  40                          h5status |= H5Pset_fapl_mpio(retval, mpi_comm, mpi_info);
  41                          if (created_info) MPI_Info_free(&mpi_info);
  42                      }
  43 -                    else
  44 -                    {
  45 -                        h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints);
  46 -                    }
  47 +//                    else
  48 +//                    {
  49 +//                        h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints);
  50 +//                    }
  51  #else
  52                      H5Pclose(retval);
  53                      return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);