diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-24 17:41:18 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-24 17:41:18 (GMT) |
| commit | 25147d5567fa4a2e03c4adeb750d5a7928fe22a9 (patch) | |
| tree | 408de91ad7153277449aca0885323c75f4c18803 /tools/h5dump | |
| parent | f5a2f3d611c7df739264850ccecaf7b8158fb9d9 (diff) | |
| download | hdf5-25147d5567fa4a2e03c4adeb750d5a7928fe22a9.zip hdf5-25147d5567fa4a2e03c4adeb750d5a7928fe22a9.tar.gz hdf5-25147d5567fa4a2e03c4adeb750d5a7928fe22a9.tar.bz2 | |
[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)
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/Makefile.in | 1 | ||||
| -rw-r--r-- | tools/h5dump/h5dump_ddl.c | 20 |
2 files changed, 8 insertions, 13 deletions
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 21a622d..7770b93 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -226,7 +226,6 @@ FC_VERSION = @FC_VERSION@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ -GPFS = @GPFS@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c index 42e2c88..1227e6e 100644 --- a/tools/h5dump/h5dump_ddl.c +++ b/tools/h5dump/h5dump_ddl.c @@ -1203,28 +1203,24 @@ dump_fcpl(hid_t fid) PRINTSTREAM(rawoutstream, "%s %d\n","BTREE_LEAF", sym_lk); #ifdef SHOW_FILE_DRIVER - if (H5FD_CORE==fdriver) + if(H5FD_CORE==fdriver) HDstrcpy(dname,"H5FD_CORE"); #ifdef H5_HAVE_DIRECT - else if (H5FD_DIRECT==fdriver) + else if(H5FD_DIRECT==fdriver) HDstrcpy(dname,"H5FD_DIRECT"); #endif - else if (H5FD_FAMILY==fdriver) + else if(H5FD_FAMILY==fdriver) HDstrcpy(dname,"H5FD_FAMILY"); - else if (H5FD_LOG==fdriver) + else if(H5FD_LOG==fdriver) HDstrcpy(dname,"H5FD_LOG"); - else if (H5FD_MPIO==fdriver) + else if(H5FD_MPIO==fdriver) HDstrcpy(dname,"H5FD_MPIO"); - else if (H5FD_MULTI==fdriver) + else if(H5FD_MULTI==fdriver) HDstrcpy(dname,"H5FD_MULTI"); - else if (H5FD_SEC2==fdriver) + else if(H5FD_SEC2==fdriver) HDstrcpy(dname,"H5FD_SEC2"); - else if (H5FD_STDIO==fdriver) + else if(H5FD_STDIO==fdriver) HDstrcpy(dname,"H5FD_STDIO"); -#ifdef H5_HAVE_STREAM - else if (H5FD_STREAM==fdriver) - HDstrcpy(dname,"H5FD_STREAM"); -#endif else HDstrcpy(dname,"Unknown driver"); |