From 2e4302818ab260604ffa26e90dab159cf28079d4 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Fri, 21 Mar 2014 18:02:24 -0500 Subject: [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 --- MANIFEST | 4 - Makefile.in | 1 - bin/checkposix | 5 +- c++/Makefile.in | 1 - c++/examples/Makefile.in | 1 - c++/src/H5FaccProp.h | 8 - c++/src/Makefile.in | 1 - c++/test/Makefile.in | 1 - config/cmake/ConfigureChecks.cmake | 29 - config/cmake/H5pubconf.h.in | 6 - config/cmake/HDF5Tests.c | 11 - config/cmake/libhdf5.settings.cmake.in | 1 - configure | 79 +- configure.ac | 34 +- examples/Makefile.in | 1 - fortran/Makefile.in | 1 - fortran/examples/Makefile.in | 1 - fortran/src/H5FDmpiof.c | 81 -- fortran/src/H5FDmpioff.f90 | 71 +- fortran/src/H5f90proto.h | 4 - fortran/src/Makefile.in | 1 - fortran/src/hdf5_fortrandll.def.in | 2 - fortran/test/Makefile.in | 1 - fortran/testpar/Makefile.in | 1 - hl/Makefile.in | 1 - hl/c++/Makefile.in | 1 - hl/c++/examples/Makefile.in | 1 - hl/c++/src/Makefile.in | 1 - hl/c++/test/Makefile.in | 1 - hl/examples/Makefile.in | 1 - hl/fortran/Makefile.in | 1 - hl/fortran/examples/Makefile.in | 1 - hl/fortran/src/Makefile.in | 1 - hl/fortran/test/Makefile.in | 1 - hl/src/Makefile.in | 1 - hl/test/Makefile.in | 1 - hl/tools/Makefile.in | 1 - hl/tools/gif2h5/Makefile.in | 1 - perform/Makefile.in | 1 - perform/benchpar.c | 20 +- perform/perf_meta.c | 59 +- perform/pio_engine.c | 800 ++++------------- perform/pio_perf.c | 44 +- perform/pio_perf.h | 1 - perform/sio_engine.c | 461 ---------- perform/sio_perf.c | 15 - perform/sio_perf.h | 1 - release_docs/INSTALL_CMake.txt | 1 - src/CMakeLists.txt | 2 - src/H5Dmpio.c | 49 +- src/H5FDmpi.h | 1 - src/H5FDmpio.c | 43 +- src/H5FDmpio.h | 8 +- src/H5FDmpiposix.c | 1488 -------------------------------- src/H5FDmpiposix.h | 51 -- src/H5FDprivate.h | 3 - src/H5Ppublic.h | 7 +- src/H5S.c | 13 - src/H5Sprivate.h | 4 - src/H5config.h.in | 6 - src/H5trace.c | 77 +- src/Makefile.am | 7 +- src/Makefile.in | 80 +- src/hdf5.lnt | 1 - src/libhdf5.settings.in | 1 - test/Makefile.in | 1 - test/h5test.c | 6 +- test/links.c | 3 +- testpar/CMakeTests.cmake | 4 - testpar/Makefile.am | 7 +- testpar/Makefile.in | 39 +- testpar/t_coll_chunk.c | 5 +- testpar/t_dset.c | 123 +-- testpar/t_file.c | 3 +- testpar/t_mdset.c | 34 +- testpar/t_ph5basic.c | 114 --- testpar/t_posix_compliant.c | 927 -------------------- testpar/t_shapesame.c | 23 +- testpar/t_span_tree.c | 14 +- testpar/testph5.sh.in | 77 -- testpar/testphdf5.c | 22 +- testpar/testphdf5.h | 16 +- tools/Makefile.in | 1 - tools/h5copy/Makefile.in | 1 - tools/h5diff/Makefile.in | 1 - tools/h5dump/Makefile.in | 1 - tools/h5dump/h5dump_ddl.c | 33 +- tools/h5import/Makefile.in | 1 - tools/h5jam/Makefile.in | 1 - tools/h5ls/Makefile.in | 1 - tools/h5repack/Makefile.in | 1 - tools/h5stat/Makefile.in | 1 - tools/lib/Makefile.in | 1 - tools/lib/h5tools.c | 64 +- tools/misc/Makefile.in | 1 - vms/src/h5pubconf.h | 6 - vms/src/make.com | 2 +- 97 files changed, 444 insertions(+), 4694 deletions(-) delete mode 100644 src/H5FDmpiposix.c delete mode 100644 src/H5FDmpiposix.h delete mode 100644 testpar/t_posix_compliant.c delete mode 100644 testpar/testph5.sh.in diff --git a/MANIFEST b/MANIFEST index c25f5cf..355d72b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -694,8 +694,6 @@ ./src/H5FDmpi.h ./src/H5FDmpio.c ./src/H5FDmpio.h -./src/H5FDmpiposix.c -./src/H5FDmpiposix.h ./src/H5FDmulti.c ./src/H5FDmulti.h ./src/H5FDpkg.h @@ -1157,14 +1155,12 @@ ./testpar/t_ph5basic.c ./testpar/t_pflush1.c ./testpar/t_pflush2.c -./testpar/t_posix_compliant.c ./testpar/t_prop.c ./testpar/t_shapesame.c ./testpar/t_span_tree.c ./testpar/testpar.h ./testpar/testphdf5.c ./testpar/testphdf5.h -./testpar/testph5.sh.in ./tools/COPYING ./tools/Makefile.am diff --git a/Makefile.in b/Makefile.in index 0c6890b..0378c52 100644 --- a/Makefile.in +++ b/Makefile.in @@ -248,7 +248,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/bin/checkposix b/bin/checkposix index e3617e5..69d43b4 100755 --- a/bin/checkposix +++ b/bin/checkposix @@ -83,7 +83,7 @@ if(<>) { next if $name =~ /^(ABS|ADDR_OVERFLOW|ALL_MEMBERS|BOUND|CONSTR|DETECT_[I|F|M]|DOWN)$/; next if $name =~ /^(MIN3?|MAX3?|NELMTS|POWER_OF_TWO|REGION_OVERFLOW)$/; next if $name =~ /^(UNIQUE_MEMBERS)$/; - next if $name =~ /^(IS_H5FD_MPIO|IS_H5FD_MPIPOSIX)$/; + next if $name =~ /^(IS_H5FD_MPIO)$/; next if $name =~ /^addr_defined$/; # These functions/macros are exempt. @@ -93,9 +93,6 @@ if(<>) { next if $name =~ /^(_get_osfhandle|GetFileInformationByHandle|SetFilePointer|GetLastError|SetEndOfFile)$/; next if $name =~ /^(FindNextFile|FindClose|_tzset|Wgettimeofday|GetSystemTimeAsFileTime|Wgetlogin|GetUserName)$/; - # These are GPFS function calls. Ignore them. - next if $name =~ /^gpfs_fcntl$/; - # These are MPI function calls. Ignore them. next if $name =~ /^(MPI_|MPE_)/; diff --git a/c++/Makefile.in b/c++/Makefile.in index 492970b..80bffc2 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -213,7 +213,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/c++/examples/Makefile.in b/c++/examples/Makefile.in index dee7c11..72e333a 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -180,7 +180,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/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h index 5b56f6e..5dd108f 100644 --- a/c++/src/H5FaccProp.h +++ b/c++/src/H5FaccProp.h @@ -67,14 +67,6 @@ class H5_DLLCPP FileAccPropList : public PropList { void setSplit( FileAccPropList& meta_plist, FileAccPropList& raw_plist, const H5std_string& meta_ext, const H5std_string& raw_ext ) const; -#ifdef H5_HAVE_STREAM // for Stream Virtual File Driver - // Modifies this file access property list to use the Stream driver. - void setStream(H5FD_stream_fapl_t &fapl) const; - - // Retrieves the streaming I/O driver settings - H5FD_stream_fapl_t getStream() const; -#endif - // Sets the maximum size of the data sieve buffer. void setSieveBufSize(size_t bufsize) const; diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index dfc3167..6399253 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -256,7 +256,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/c++/test/Makefile.in b/c++/test/Makefile.in index 0aad590..5e88a09 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -216,7 +216,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/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 03a7975..9816755 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -144,13 +144,6 @@ if (WIN32) endif (NOT UNIX AND NOT CYGWIN AND NOT MINGW) endif (WIN32) -#if (WIN32) -# set (DEFAULT_STREAM_VFD OFF) -#else (WIN32) -# set (DEFAULT_STREAM_VFD ON) -#endif (WIN32) -#option (HDF5_STREAM_VFD "Compile Stream Virtual File Driver support" ${DEFAULT_STREAM_VFD}) - # TODO -------------------------------------------------------------------------- # Should the Default Virtual File Driver be compiled? # This is hard-coded now but option should added to match configure @@ -817,16 +810,6 @@ if (NOT WINDOWS) endif (NOT WINDOWS) #----------------------------------------------------------------------------- -# Check for the Stream VFD driver -#----------------------------------------------------------------------------- -if (HDF5_STREAM_VFD) - CHECK_INCLUDE_FILE_CONCAT ("netdb.h" H5_HAVE_NETDB_H) - CHECK_INCLUDE_FILE_CONCAT ("netinet/tcp.h" H5_HAVE_NETINET_TCP_H) - CHECK_INCLUDE_FILE_CONCAT ("sys/filio.h" H5_HAVE_SYS_FILIO_H) - set (H5_HAVE_STREAM 1) -endif (HDF5_STREAM_VFD) - -#----------------------------------------------------------------------------- # Check if InitOnceExecuteOnce is available #----------------------------------------------------------------------------- if (WINDOWS) @@ -892,18 +875,6 @@ if (WINDOWS) endif (WINDOWS) #----------------------------------------------------------------------------- -# Option to see if GPFS is available on this filesystem --enable-gpfs -#----------------------------------------------------------------------------- -option (HDF5_ENABLE_GPFS "Enable GPFS hints for the MPI/POSIX file driver" OFF) -if (HDF5_ENABLE_GPFS) - CHECK_INCLUDE_FILE_CONCAT ("gpfs.h" HAVE_GPFS) - if (HAVE_GPFS) - HDF5_FUNCTION_TEST (HAVE_GPFS) - endif (HAVE_GPFS) -endif (HDF5_ENABLE_GPFS) -MARK_AS_ADVANCED (HDF5_ENABLE_GPFS) - -#----------------------------------------------------------------------------- # Determine how 'inline' is used #----------------------------------------------------------------------------- set (HDF5_EXTRA_TEST_DEFINITIONS INLINE_TEST_INLINE) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index f3e1d75..25a0e37 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -217,12 +217,6 @@ /* Define to 1 if you have the `get_fpc_csr' function. */ #cmakedefine H5_HAVE_GET_FPC_CSR @H5_HAVE_GET_FPC_CSR@ -/* Define if we have GPFS support */ -#cmakedefine H5_HAVE_GPFS @H5_HAVE_GPFS@ - -/* Define to 1 if you have the header file. */ -#cmakedefine H5_HAVE_GPFS_H @H5_HAVE_GPFS_H@ - /* Define if library will contain instrumentation to detect correct optimization operation */ #cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@ diff --git a/config/cmake/HDF5Tests.c b/config/cmake/HDF5Tests.c index 21206e0..355c06f 100644 --- a/config/cmake/HDF5Tests.c +++ b/config/cmake/HDF5Tests.c @@ -437,17 +437,6 @@ main () #endif -#ifdef HAVE_GPFS - -#include -int main () -{ - int fd = 0; - gpfs_fcntl(fd, (void *)0); -} - -#endif /* HAVE_GPFS */ - #ifdef HAVE_IOEO #include diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in index 3970a9f..418a6cf 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -63,7 +63,6 @@ Features: Clear file buffers before write: @HDF5_Enable_Clear_File_Buffers@ Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@ Function Stack Tracing: @HDF5_ENABLE_CODESTACK@ - GPFS: @HDF5_ENABLE_GPFS@ Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@ Optimization Instrumentation: @HDF5_Enable_Instrument@ Large File Support (LFS): @HDF5_ENABLE_LARGE_FILE@ diff --git a/configure b/configure index 4db05b1..3d751d0 100755 --- a/configure +++ b/configure @@ -788,7 +788,6 @@ HAVE_DMALLOC CODESTACK INSTRUMENT LARGEFILE -GPFS HDF5_HL CXX HDF_CXX @@ -913,7 +912,6 @@ with_zlib with_szlib enable_threadsafe with_pthread -enable_gpfs enable_debug enable_codestack enable_metadata_trace_file @@ -1596,8 +1594,6 @@ Optional Features: --enable-production Determines how to run the compiler. --disable-largefile omit support for large files --enable-threadsafe Enable thread-safe capability - --enable-gpfs Enable GPFS hints for the MPI/POSIX file driver. - [default=no] --enable-debug=all Turn on debugging in all packages. One may also specify a comma-separated list of package names without the leading H5 or the word no. The default @@ -3975,7 +3971,6 @@ $as_echo "done" >&6; } ## HDF_CXX: whether C++ is enabled. Default no. ## CXX: C++ compiler. ## HDF5_HL: whether high-level library is enabled. Default is yes. -## GPFS: whether gpfs is enabled. Default no. ## LARGEFILE: whether largefile support is enabled. Default yes. ## INSTRUMENT: whether INSTRUMENT is enabled. No default set here. ## CODESTACK: whether CODESTACK is enabled. Default no. @@ -3997,7 +3992,6 @@ $as_echo "done" >&6; } HDF_CXX=no HDF_CXX=no HDF5_HL=yes - GPFS=no LARGEFILE=yes CODESTACK=no @@ -27683,74 +27677,6 @@ $as_echo "no" >&6; } fi ## ---------------------------------------------------------------------- -## Checking to see if GPFS is available on this filesystem -## -# Check whether --enable-gpfs was given. -if test "${enable_gpfs+set}" = set; then : - enableval=$enable_gpfs; -else - enableval=no -fi - - -case "X-$enableval" in - X-yes) - for ac_header in gpfs.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "gpfs.h" "ac_cv_header_gpfs_h" "$ac_includes_default" -if test "x$ac_cv_header_gpfs_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GPFS_H 1 -_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPFS support" >&5 -$as_echo_n "checking for GPFS support... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -int fd = 0; gpfs_fcntl(fd, (void *)0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -$as_echo "#define HAVE_GPFS 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - LIBS="$LIBS -lgpfs" - GPFS="yes" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - GPFS="no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -done - - ;; - X-no|*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpfs" >&5 -$as_echo_n "checking for gpfs... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5 -$as_echo "suppressed" >&6; } - ;; -esac - -## ---------------------------------------------------------------------- ## Turn on debugging by setting compiler flags ## This must come after the enable-production since it depends on production. ## @@ -31244,7 +31170,7 @@ PARALLEL_MAKE="" FORTRAN_PARALLEL_MAKE="" if test -n "$TESTPARALLEL"; then - PARALLEL_MAKE="$TESTPARALLEL/Makefile $TESTPARALLEL/testph5.sh" + PARALLEL_MAKE="$TESTPARALLEL/Makefile" if test "X$HDF_FORTRAN" = "Xyes"; then FORTRAN_PARALLEL_MAKE=fortran/$TESTPARALLEL/Makefile @@ -33192,7 +33118,7 @@ else fi -ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/test_plugin.sh testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh" +ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/test_plugin.sh testpar/Makefile perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh" cat >confcache <<\_ACEOF @@ -34468,7 +34394,6 @@ do "test/testlinks_env.sh") CONFIG_FILES="$CONFIG_FILES test/testlinks_env.sh" ;; "test/test_plugin.sh") CONFIG_FILES="$CONFIG_FILES test/test_plugin.sh" ;; "testpar/Makefile") CONFIG_FILES="$CONFIG_FILES testpar/Makefile" ;; - "testpar/testph5.sh") CONFIG_FILES="$CONFIG_FILES testpar/testph5.sh" ;; "perform/Makefile") CONFIG_FILES="$CONFIG_FILES perform/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "tools/h5dump/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5dump/Makefile" ;; diff --git a/configure.ac b/configure.ac index 31381ab..87baba5 100644 --- a/configure.ac +++ b/configure.ac @@ -160,7 +160,6 @@ AC_MSG_RESULT([done]) ## HDF_CXX: whether C++ is enabled. Default no. ## CXX: C++ compiler. ## HDF5_HL: whether high-level library is enabled. Default is yes. -## GPFS: whether gpfs is enabled. Default no. ## LARGEFILE: whether largefile support is enabled. Default yes. ## INSTRUMENT: whether INSTRUMENT is enabled. No default set here. ## CODESTACK: whether CODESTACK is enabled. Default no. @@ -182,7 +181,6 @@ AC_SUBST([FC2003]) HDF_FORTRAN2003=no AC_SUBST([HDF_CXX]) HDF_CXX=no AC_SUBST([CXX]) HDF_CXX=no AC_SUBST([HDF5_HL]) HDF5_HL=yes -AC_SUBST([GPFS]) GPFS=no AC_SUBST([LARGEFILE]) LARGEFILE=yes AC_SUBST([INSTRUMENT]) AC_SUBST([CODESTACK]) CODESTACK=no @@ -2392,35 +2390,6 @@ else fi ## ---------------------------------------------------------------------- -## Checking to see if GPFS is available on this filesystem -## -AC_ARG_ENABLE([gpfs], - [AS_HELP_STRING([--enable-gpfs], - [Enable GPFS hints for the MPI/POSIX file - driver. [default=no]])],, - [enableval=no]) - -case "X-$enableval" in - X-yes) - AC_CHECK_HEADERS([gpfs.h], - [AC_MSG_CHECKING([for GPFS support]) - AC_TRY_COMPILE([#include ], - [int fd = 0; gpfs_fcntl(fd, (void *)0);], - [AC_DEFINE([HAVE_GPFS], [1], - [Define if we have GPFS support]) - AC_MSG_RESULT([yes]) - LIBS="$LIBS -lgpfs" - GPFS="yes"], - [AC_MSG_RESULT([no]) - GPFS="no"])]) - ;; - X-no|*) - AC_MSG_CHECKING([for gpfs]) - AC_MSG_RESULT([suppressed]) - ;; -esac - -## ---------------------------------------------------------------------- ## Turn on debugging by setting compiler flags ## This must come after the enable-production since it depends on production. ## @@ -4456,7 +4425,7 @@ PARALLEL_MAKE="" FORTRAN_PARALLEL_MAKE="" if test -n "$TESTPARALLEL"; then - PARALLEL_MAKE="$TESTPARALLEL/Makefile $TESTPARALLEL/testph5.sh" + PARALLEL_MAKE="$TESTPARALLEL/Makefile" if test "X$HDF_FORTRAN" = "Xyes"; then FORTRAN_PARALLEL_MAKE=fortran/$TESTPARALLEL/Makefile @@ -4532,7 +4501,6 @@ AC_CONFIG_FILES([src/libhdf5.settings test/testlinks_env.sh test/test_plugin.sh testpar/Makefile - testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile diff --git a/examples/Makefile.in b/examples/Makefile.in index a564dd4..394b996 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -180,7 +180,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/fortran/Makefile.in b/fortran/Makefile.in index 4196fe2..ca646ce 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -217,7 +217,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 1cc0825..53dc2b6 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -188,7 +188,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/fortran/src/H5FDmpiof.c b/fortran/src/H5FDmpiof.c index 993b5ac..bbdb170 100644 --- a/fortran/src/H5FDmpiof.c +++ b/fortran/src/H5FDmpiof.c @@ -220,87 +220,6 @@ nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode) return ret_value; } -/****if* H5FDmpiof/h5pset_fapl_mpiposix_c - * NAME - * h5pset_fapl_mpiposix_c - * PURPOSE - * Call H5Pset_fapl_mpiposix to set mode for parallel I/O and the user - * supplied communicator - * INPUTS - * prp_id - property list identifier - * comm - MPI communicator - * flag - flag to use GPFS hints - * RETURNS - * 0 on success, -1 on failure - * AUTHOR - * Elena Pourmal - * Tuesday, May 6, 2003 - * HISTORY - * - * SOURCE -*/ -int_f -nh5pset_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag) -/******/ -{ - int ret_value = -1; - hid_t c_prp_id; - herr_t ret; - hbool_t c_flag; - MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); - c_flag = (hbool_t)*flag; - /* - * Call H5Pset_fapl_mpiposix function. - */ - c_prp_id = (hid_t) *prp_id; - ret = H5Pset_fapl_mpiposix(c_prp_id, c_comm, c_flag); - if (ret < 0) return ret_value; - ret_value = 0; - return ret_value; -} - -/****if* H5FDmpiof/h5pget_fapl_mpiposix_c - * NAME - * h5pget_fapl_mpiposix_c - * PURPOSE - * Call H5Pget_fapl_mpiposix to retrieve communicator and info object - * INPUTS - * prp_id - property list identifier - * OUTPUTS - * comm - buffer to return MPI communicator - * flag - flag to use GPFS hints - * RETURNS - * 0 on success, -1 on failure - * AUTHOR - * Elena Pourmal - * Tuesday, May 6, 2003 - * HISTORY - * - * SOURCE -*/ -int_f -nh5pget_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag) -/******/ -{ - int ret_value = -1; - hid_t c_prp_id; - herr_t ret; - hbool_t c_flag; - MPI_Comm c_comm; - - /* - * Call H5Pget_fapl_mpiposix function. - */ - c_prp_id = (hid_t) *prp_id; - ret = H5Pget_fapl_mpiposix(c_prp_id, &c_comm, &c_flag); - if (ret < 0) return ret_value; - *comm = (int_f) MPI_Comm_c2f(c_comm); - *flag = (int_f) c_flag; - ret_value = 0; - return ret_value; -} - /****if* H5Pf/h5pget_mpio_actual_io_mode_c * NAME * h5pget_mpio_actual_io_mode_c diff --git a/fortran/src/H5FDmpioff.f90 b/fortran/src/H5FDmpioff.f90 index 5c81bc8..50a77d9 100644 --- a/fortran/src/H5FDmpioff.f90 +++ b/fortran/src/H5FDmpioff.f90 @@ -131,6 +131,7 @@ CONTAINS INTEGER, EXTERNAL :: h5pset_dxpl_mpio_c hdferr = h5pset_dxpl_mpio_c(prp_id, data_xfer_mode) END SUBROUTINE h5pset_dxpl_mpio_f + !****s* H5FDMPIO/h5pget_dxpl_mpio_f ! ! NAME @@ -164,76 +165,6 @@ CONTAINS hdferr = h5pget_dxpl_mpio_c(prp_id, data_xfer_mode) END SUBROUTINE h5pget_dxpl_mpio_f -!****s* H5FDMPIO/h5pset_fapl_mpiposix_f -! -! NAME -! h5pset_fapl_mpiposix_f -! -! PURPOSE -! Stores MPI IO communicator information to the file -! access property list. -! -! INPUTS -! prp_id - File access property list identifier. -! comm - MPI-2 communicator. -! use_gpfs - Logical flag to use the GPFS hints. -! OUTPUTS -! hdferr - Returns 0 if successful and -1 if fails. -! -! AUTHOR -! Elena Pourmal -! May 6, 2003 -! -! Fortran90 Interface: - SUBROUTINE h5pset_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr) - IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: prp_id - INTEGER, INTENT(IN) :: comm - LOGICAL, INTENT(IN) :: use_gpfs - INTEGER, INTENT(OUT) :: hdferr -!***** - INTEGER :: flag - INTEGER, EXTERNAL :: h5pset_fapl_mpiposix_c - flag = 0 - IF(use_gpfs) flag = 1 - hdferr = h5pset_fapl_mpiposix_c(prp_id, comm, flag) - END SUBROUTINE h5pset_fapl_mpiposix_f - -!****s* H5FDMPIO/h5pget_fapl_mpiposix_f -! -! NAME -! h5pget_fapl_mpiposix_f -! -! PURPOSE -! Returns MPI communicator information. -! -! INPUTS -! prp_id - File access property list identifier. -! OUTPUTS -! comm - MPI-2 communicator. -! use_gpfs - Flag to use GPFS hints. -! hdferr - Returns 0 if successful and -1 if fails. -! AUTHOR -! Elena Pourmal -! May 6, 2003 -! -! Fortran90 Interface: - SUBROUTINE h5pget_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr) - IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: prp_id - INTEGER, INTENT(OUT) :: comm - LOGICAL, INTENT(OUT) :: use_gpfs - INTEGER, INTENT(OUT) :: hdferr -!***** - INTEGER :: flag - - INTEGER, EXTERNAL :: h5pget_fapl_mpiposix_c - hdferr = h5pget_fapl_mpiposix_c(prp_id, comm, flag) - use_gpfs = .FALSE. - IF (flag .EQ. 1) use_gpfs = .TRUE. - END SUBROUTINE h5pget_fapl_mpiposix_f - - !****s* H5P/h5pget_mpio_actual_io_mode_f ! NAME ! h5pget_mpio_actual_io_mode_f diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index 2c5e9a1..ae848bf 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -914,8 +914,6 @@ H5_FCDLL int_f nh5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f * #define nh5pset_btree_ratios_c H5_FC_FUNC_(h5pset_btree_ratios_c, H5PSET_BTREE_RATIOS_C) #define nh5pset_fapl_mpio_c H5_FC_FUNC_(h5pset_fapl_mpio_c, H5PSET_FAPL_MPIO_C) #define nh5pget_fapl_mpio_c H5_FC_FUNC_(h5pget_fapl_mpio_c, H5PGET_FAPL_MPIO_C) -#define nh5pset_fapl_mpiposix_c H5_FC_FUNC_(h5pset_fapl_mpiposix_c, H5PSET_FAPL_MPIPOSIX_C) -#define nh5pget_fapl_mpiposix_c H5_FC_FUNC_(h5pget_fapl_mpiposix_c, H5PGET_FAPL_MPIPOSIX_C) #define nh5pset_dxpl_mpio_c H5_FC_FUNC_(h5pset_dxpl_mpio_c, H5PSET_DXPL_MPIO_C) #define nh5pget_dxpl_mpio_c H5_FC_FUNC_(h5pget_dxpl_mpio_c, H5PGET_DXPL_MPIO_C) #define nh5pget_fclose_degree_c H5_FC_FUNC_(h5pget_fclose_degree_c, H5PGET_FCLOSE_DEGREE_C) @@ -1072,8 +1070,6 @@ H5_FCDLL int_f nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* mid H5_FCDLL int_f nh5pset_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right); H5_FCDLL int_f nh5pget_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info); H5_FCDLL int_f nh5pset_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info); -H5_FCDLL int_f nh5pget_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag); -H5_FCDLL int_f nh5pset_fapl_mpiposix_c(hid_t_f *prp_id, int_f* comm, int_f* flag); H5_FCDLL int_f nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode); H5_FCDLL int_f nh5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode); H5_FCDLL int_f nh5pset_fclose_degree_c(hid_t_f *fapl, int_f *degree); diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 7845bb8..c566ee2 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -306,7 +306,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/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in index 62030f0..c549d34 100644 --- a/fortran/src/hdf5_fortrandll.def.in +++ b/fortran/src/hdf5_fortrandll.def.in @@ -567,6 +567,4 @@ H5Z_mp_H5ZGET_FILTER_INFO_F @H5_NOPAREXP@H5FDMPIO_mp_H5PGET_FAPL_MPIO_F @H5_NOPAREXP@H5FDMPIO_mp_H5PSET_DXPL_MPIO_F @H5_NOPAREXP@H5FDMPIO_mp_H5PGET_DXPL_MPIO_F -@H5_NOPAREXP@H5FDMPIO_mp_H5PSET_FAPL_MPIPOSIX_F -@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_FAPL_MPIPOSIX_F @H5_NOPAREXP@H5FDMPIO_mp_H5PGET_MPIO_ACTUAL_IO_MODE_F diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 9f8b6d0..9db74e8 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -291,7 +291,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 1903529..60f24b9 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -215,7 +215,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/hl/Makefile.in b/hl/Makefile.in index 6ca962b..8b00085 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -217,7 +217,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/hl/c++/Makefile.in b/hl/c++/Makefile.in index 210fcc5..a63388c 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -213,7 +213,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/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 1e66687..a3be41c 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -179,7 +179,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/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index c13f26a..06e6dea 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -250,7 +250,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/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index c873d32..de668da 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -212,7 +212,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/hl/examples/Makefile.in b/hl/examples/Makefile.in index ee4d885..8ff7579 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -179,7 +179,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/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 8cb74cd..be754a2 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -217,7 +217,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/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 8413c2d..ea66cab 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -180,7 +180,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/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 37aac6b..3a9d569 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -263,7 +263,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/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 024cb0f..899ec62 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/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/hl/src/Makefile.in b/hl/src/Makefile.in index f9f73c8..733049c 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -246,7 +246,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/hl/test/Makefile.in b/hl/test/Makefile.in index 5639844..588d867 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -253,7 +253,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/hl/tools/Makefile.in b/hl/tools/Makefile.in index 7d887f5..98095bb 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -214,7 +214,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/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index e587f5f..54754ba 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -228,7 +228,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/perform/Makefile.in b/perform/Makefile.in index 091f4f1..fe9d184 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -254,7 +254,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/perform/benchpar.c b/perform/benchpar.c index 24146e4..b75006a 100644 --- a/perform/benchpar.c +++ b/perform/benchpar.c @@ -44,7 +44,6 @@ /* defines for type of VFL driver to use */ #define FACC_DEFAULT 0 #define FACC_MPIO 1 -#define FACC_MPIPOSIX 2 /* Defines for computing performance information */ #define ONE_KB 1024 @@ -78,7 +77,7 @@ char mpi_name[MPI_MAX_PROCESSOR_NAME]; static void usage(void) { printf("usage: benchpar [-d <# of dims>] [-s ] [-f ] [-h]\n"); - printf(" [-S ] [-p] [-I] [-c] [-i <# of iterations>\n"); + printf(" [-S ] [-I] [-c] [-i <# of iterations>\n"); printf(" -c - Use chunked storage for dataset with 1-1 exact\n"); printf(" mapping of chunks to hyperslabs\n"); printf(" Default: off (i.e. contiguous storage)\n"); @@ -91,8 +90,6 @@ static void usage(void) printf(" Default: 3\n"); printf(" -I - Use independent parallel I/O\n"); printf(" Default: use collective parallel I/O\n"); - printf(" -p - Use MPI-posix VFL driver\n"); - printf(" Default: use MPI-I/O VFL driver\n"); printf(" -s - Set the size of each of the dataset's dimensions\n"); printf(" Default: 1024\n"); printf(" -S - Set the dimension to slice the dataset along\n"); @@ -114,7 +111,6 @@ static hid_t create_fcpl(void) static hid_t create_fapl(MPI_Comm comm, MPI_Info info, int acc_type ) { hid_t fapl; /* File access property list */ - hbool_t use_gpfs = FALSE; /* Use GPFS hints */ herr_t ret; /* Generic return value */ fapl = H5Pcreate (H5P_FILE_ACCESS); @@ -122,13 +118,7 @@ static hid_t create_fapl(MPI_Comm comm, MPI_Info info, int acc_type ) /* set parallel access with communicator, using MPI-I/O driver */ if (acc_type == FACC_MPIO) { - ret = H5Pset_fapl_mpio(fapl, comm, info); - assert(ret>=0); - } /* end if */ - - /* set parallel access with communicator, using MPI-posix driver */ - if (acc_type == FACC_MPIPOSIX) { - ret = H5Pset_fapl_mpiposix(fapl, comm, use_gpfs); + ret = H5Pset_fapl_mpio(fapl, comm, info); assert(ret>=0); } /* end if */ @@ -279,10 +269,6 @@ int main(int argc, char *argv[]) par_mode=H5FD_MPIO_INDEPENDENT; break; - case 'p': /* Use MPI-posix VFL driver */ - vfl_type=FACC_MPIPOSIX; - break; - case 's': /* Change dimension size */ /* Get new dimension size */ dim_size=atoi(argv[curr_arg]); @@ -469,7 +455,7 @@ int main(int argc, char *argv[]) /* Only print information from one node */ if(mpi_rank==0) { /* Print information about test */ - printf("File driver used: %s\n",vfl_type==FACC_MPIO ? "MPI-I/O" : "MPI-posix"); + printf("File driver used: %s\n",vfl_type==FACC_MPIO ? "MPI-I/O" : "Unknown"); printf("Type of parallel access: %s\n",par_mode==H5FD_MPIO_COLLECTIVE ? "Collective" : "Independent"); printf("Type of dataset storage: %s\n",use_chunks ? "Chunked" : "Contiguous"); printf("Number of processes: %d\n",mpi_size); diff --git a/perform/perf_meta.c b/perform/perf_meta.c index 8c3b06f..b52871e 100644 --- a/perform/perf_meta.c +++ b/perform/perf_meta.c @@ -29,7 +29,6 @@ /* File_Access_type bits */ #define FACC_DEFAULT 0x0 /* serial as default */ #define FACC_MPIO 0x1 /* MPIO */ -#define FACC_MPIPOSIX 0x8 /* MPIPOSIX */ /* Which test to run */ int RUN_TEST = 0x0; /* all tests as default */ @@ -129,11 +128,7 @@ parse_options(int argc, char **argv) } break; - case 'p': /* Use the MPI-POSIX driver access */ - facc_type = FACC_MPIPOSIX; - break; - - case 'm': /* Use the MPI-POSIX driver access */ + case 'm': /* Use the MPI-IO driver */ facc_type = FACC_MPIO; break; @@ -171,7 +166,7 @@ parse_options(int argc, char **argv) /* Check valid values */ #ifndef H5_HAVE_PARALLEL - if(facc_type == FACC_MPIO || facc_type == FACC_MPIPOSIX) + if(facc_type == FACC_MPIO) { nerrors++; return(1); @@ -215,19 +210,15 @@ parse_options(int argc, char **argv) static void usage(void) { - printf("Usage: perf_meta [-h] [-m] [-p] [-d]" + printf("Usage: perf_meta [-h] [-m] [-d]" "[-a]\n" "\t[-n] [-f