[svn-r24878] Description:

    Bring r24864 from trunk to 1.8 branch:

    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
    (daily tested on trunk)

1 files changed, 1 insertions, 21 deletions

diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 3c5f91d..d91c24c 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -118,7 +118,6 @@ usage(void)
         "\tset number of groups for the multiple group test\n");
     printf("\t-f <prefix>\tfilename prefix\n");
     printf("\t-2\t\tuse Split-file together with MPIO\n");
-    printf("\t-p\t\tuse combo MPI-POSIX driver\n");
     printf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n",
   ROW_FACTOR, COL_FACTOR);
     printf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
@@ -169,9 +168,6 @@ parse_options(int argc, char **argv)
           }
           paraprefix = *argv;
           break;
-    case 'p':   /* Use the MPI-POSIX driver access */
-          facc_type = FACC_MPIPOSIX;
-          break;
     case 'i':   /* Collective MPI-IO access with independent IO  */
           dxfer_coll_type = DXFER_INDEPENDENT_IO;
           break;
@@ -257,8 +253,7 @@ parse_options(int argc, char **argv)
  * Create the appropriate File access property list
  */
 hid_t
-create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type,
-                     hbool_t use_gpfs)
+create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
 {
     hid_t ret_pl = -1;
     herr_t ret;                 /* generic return value */
@@ -299,13 +294,6 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type,
   return(ret_pl);
     }
 
-    if (l_facc_type == FACC_MPIPOSIX) {
-  /* set Parallel access with communicator */
-  ret = H5Pset_fapl_mpiposix(ret_pl, comm, use_gpfs);
-  VRFY((ret >= 0), "H5Pset_fapl_mpiposix succeeded");
-  return(ret_pl);
-    }
-
     /* unknown file access types */
     return (ret_pl);
 }
@@ -353,8 +341,6 @@ int main(int argc, char **argv)
     /* Tests are generally arranged from least to most complexity... */
     AddTest("mpiodup", test_fapl_mpio_dup, NULL,
       "fapl_mpio duplicate", NULL);
-    AddTest("posixdup", test_fapl_mpiposix_dup, NULL,
-      "fapl_mpiposix duplicate", NULL);
 
     AddTest("split", test_split_comm_access, NULL,
       "dataset using split communicators", PARATESTFILE);
@@ -549,12 +535,6 @@ int main(int argc, char **argv)
     /* Parse command line arguments */
     TestParseCmdLine(argc, argv);
 
-    if (facc_type == FACC_MPIPOSIX && MAINPROCESS){
-  printf("===================================\n"
-         "   Using MPIPOSIX driver\n"
-         "===================================\n");
-    }
-
     if (dxfer_coll_type == DXFER_INDEPENDENT_IO && MAINPROCESS){
   printf("===================================\n"
          "   Using Independent I/O with file set view to replace collective I/O \n"