diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-21 23:02:24 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-21 23:02:24 (GMT) |
commit | 2e4302818ab260604ffa26e90dab159cf28079d4 (patch) | |
tree | 311af94353763d9664b716be63c1280115ec0c1f /config | |
parent | c4f982abf147f1050251ddd6ec4fe9515d01f67c (diff) | |
download | hdf5-2e4302818ab260604ffa26e90dab159cf28079d4.zip hdf5-2e4302818ab260604ffa26e90dab159cf28079d4.tar.gz hdf5-2e4302818ab260604ffa26e90dab159cf28079d4.tar.bz2 |
[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
Diffstat (limited to 'config')
-rw-r--r-- | config/cmake/ConfigureChecks.cmake | 29 | ||||
-rw-r--r-- | config/cmake/H5pubconf.h.in | 6 | ||||
-rw-r--r-- | config/cmake/HDF5Tests.c | 11 | ||||
-rw-r--r-- | config/cmake/libhdf5.settings.cmake.in | 1 |
4 files changed, 0 insertions, 47 deletions
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 <gpfs.h> 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 <gpfs.h> -int main () -{ - int fd = 0; - gpfs_fcntl(fd, (void *)0); -} - -#endif /* HAVE_GPFS */ - #ifdef HAVE_IOEO #include <windows.h> 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@ |