[svn-r24864] Description:

    Remove all traces of MPI-POSIX VFD and GPFS detection/code.

    Remove remaining traces of stream VFD.

    Remove testpar/t_posix_compliant test (it's not actually verifying anything).

    Clean up H5D__mpio_opt_possible() further.

    Moved environment variable that disables MPI collective operations into
MPI-IO VFD (instead of it being in src/H5S.c).

    A few other small code cleanups.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/parallel & serial

1 files changed, 12 insertions, 22 deletions

diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 516cc2f..fa1a980 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -88,7 +88,6 @@ void multiple_dset_write(void)
     int i, j, n, mpi_size, mpi_rank, size;
     hid_t iof, plist, dataset, memspace, filespace;
     hid_t dcpl;                         /* Dataset creation property list */
-    hbool_t use_gpfs = FALSE;           /* Use GPFS hints */
     hsize_t chunk_origin [DIM];
     hsize_t chunk_dims [DIM], file_dims [DIM];
     hsize_t count[DIM]={1,1};
@@ -112,7 +111,7 @@ void multiple_dset_write(void)
     outme = HDmalloc((size_t)(size * size * sizeof(double)));
     VRFY((outme != NULL), "HDmalloc succeeded for outme");
 
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     VRFY((plist>=0), "create_faccess_plist succeeded");
     iof = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, plist);
     VRFY((iof>=0), "H5Fcreate succeeded");
@@ -175,7 +174,6 @@ void multiple_dset_write(void)
 void compact_dataset(void)
 {
     int i, j, mpi_size, mpi_rank, size, err_num=0;
-    hbool_t use_gpfs = FALSE;
     hid_t iof, plist, dcpl, dxpl, dataset, filespace;
     hsize_t file_dims [DIM];
     double * outme;
@@ -201,7 +199,7 @@ void compact_dataset(void)
     filename = GetTestParameters();
     VRFY((mpi_size <= size), "mpi_size <= size");
 
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     iof = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, plist);
 
     /* Define data space */
@@ -244,7 +242,7 @@ void compact_dataset(void)
     H5Fclose(iof);
 
     /* Open the file and dataset, read and compare the data. */
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     iof = H5Fopen(filename, H5F_ACC_RDONLY, plist);
     VRFY((iof >= 0), "H5Fopen succeeded");
 
@@ -295,7 +293,6 @@ void compact_dataset(void)
 void null_dataset(void)
 {
     int mpi_size, mpi_rank;
-    hbool_t use_gpfs = FALSE;
     hid_t iof, plist, dxpl, dataset, attr, sid;
     unsigned uval=2;    /* Buffer for writing to dataset */
     int val=1;          /* Buffer for writing to attribute */
@@ -310,8 +307,7 @@ void null_dataset(void)
 
     filename = GetTestParameters();
 
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL,
-                                 facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     iof = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, plist);
 
     /* Define data space */
@@ -355,7 +351,7 @@ void null_dataset(void)
     H5Fclose(iof);
 
     /* Open the file and dataset, read and compare the data. */
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     iof = H5Fopen(filename, H5F_ACC_RDONLY, plist);
     VRFY((iof >= 0), "H5Fopen succeeded");
 
@@ -409,7 +405,6 @@ void null_dataset(void)
 void big_dataset(void)
 {
     int mpi_size, mpi_rank;     /* MPI info */
-    hbool_t use_gpfs = FALSE;   /* Don't use GPFS stuff for this test */
     hid_t iof,                  /* File ID */
         fapl,                   /* File access property list ID */
         dataset,                /* Dataset ID */
@@ -428,7 +423,7 @@ void big_dataset(void)
 
     filename = GetTestParameters();
 
-    fapl = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    fapl = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     VRFY((fapl >= 0), "create_faccess_plist succeeded");
 
     /*
@@ -540,7 +535,6 @@ void big_dataset(void)
 void dataset_fillvalue(void)
 {
     int mpi_size, mpi_rank;     /* MPI info */
-    hbool_t use_gpfs = FALSE;   /* Don't use GPFS stuff for this test */
     int err_num;                /* Number of errors */
     hid_t iof,                  /* File ID */
         fapl,                   /* File access property list ID */
@@ -575,7 +569,7 @@ void dataset_fillvalue(void)
     wdata=HDmalloc((size_t)(dset_size*sizeof(int)));
     VRFY((wdata != NULL), "HDmalloc succeeded for write buffer");
 
-    fapl = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    fapl = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     VRFY((fapl >= 0), "create_faccess_plist succeeded");
 
     /*
@@ -656,7 +650,7 @@ void dataset_fillvalue(void)
     ret = H5Dwrite(dataset, H5T_NATIVE_INT, memspace, filespace, dxpl, wdata);
     VRFY((ret >= 0), "H5Dwrite succeeded");
 
-    /* Barrier here, to allow MPI-posix I/O to sync */
+    /* Barrier here, to allow processes to sync */
     MPI_Barrier(MPI_COMM_WORLD);
 
     /*
@@ -731,7 +725,6 @@ void collective_group_write(void)
 {
     int mpi_rank, mpi_size, size;
     int i, j, m;
-    hbool_t use_gpfs = FALSE;
     char gname[64], dname[32];
     hid_t fid, gid, did, plist, dcpl, memspace, filespace;
     DATATYPE * outme = NULL;
@@ -758,7 +751,7 @@ void collective_group_write(void)
     outme = HDmalloc((size_t)(size * size * sizeof(DATATYPE)));
     VRFY((outme != NULL), "HDmalloc succeeded for outme");
 
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, plist);
     H5Pclose(plist);
 
@@ -827,7 +820,6 @@ void independent_group_read(void)
 {
     int      mpi_rank, m;
     hid_t    plist, fid;
-    hbool_t  use_gpfs = FALSE;
     const H5Ptest_param_t *pt;
     char	*filename;
     int		ngroups;
@@ -838,7 +830,7 @@ void independent_group_read(void)
 
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     fid = H5Fopen(filename, H5F_ACC_RDONLY, plist);
     H5Pclose(plist);
 
@@ -950,7 +942,6 @@ void multiple_group_write(void)
 {
     int mpi_rank, mpi_size, size;
     int m;
-    hbool_t use_gpfs = FALSE;
     char gname[64];
     hid_t fid, gid, plist, memspace, filespace;
     hsize_t chunk_origin[DIM];
@@ -969,7 +960,7 @@ void multiple_group_write(void)
 
     size = get_size();
 
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, plist);
     H5Pclose(plist);
 
@@ -1120,7 +1111,6 @@ void multiple_group_read(void)
 {
     int      mpi_rank, mpi_size, error_num, size;
     int      m;
-    hbool_t  use_gpfs = FALSE;
     char     gname[64];
     hid_t    plist, fid, gid, memspace, filespace;
     hsize_t  chunk_origin[DIM];
@@ -1138,7 +1128,7 @@ void multiple_group_read(void)
 
     size = get_size();
 
-    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type, use_gpfs);
+    plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     fid = H5Fopen(filename, H5F_ACC_RDONLY, plist);
     H5Pclose(plist);