From 2700d20859e67995145677af5e3c627c19bd87b4 Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Thu, 10 Jul 2014 09:36:34 -0500 Subject: [svn-r25402] Bring 25397/8 from trunk: - remove configure checks for MPI_File_get_size and Big MPI_File_set_size as they are supported by MPIO implementations today. - fix bug in t_mpi.c (HDFFV-8856) tested with h5committest. --- CMakeLists.txt | 2 - Makefile.in | 1 - c++/Makefile.in | 1 - c++/examples/Makefile.in | 1 - c++/src/Makefile.in | 1 - c++/test/Makefile.in | 1 - config/cmake/H5pubconf.h.in | 7 - configure | 68 +-------- configure.ac | 48 ------- examples/Makefile.in | 1 - fortran/Makefile.in | 1 - fortran/examples/Makefile.in | 1 - fortran/src/Makefile.in | 1 - 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 - src/H5FDmpio.c | 39 +---- src/H5config.h.in | 7 - src/Makefile.in | 1 - test/Makefile.in | 1 - testpar/Makefile.in | 1 - testpar/t_chunk_alloc.c | 16 +-- testpar/t_mpi.c | 305 +++++++++++++++++++--------------------- tools/Makefile.in | 1 - tools/h5copy/Makefile.in | 1 - tools/h5diff/Makefile.in | 1 - tools/h5dump/Makefile.in | 1 - 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/misc/Makefile.in | 1 - vms/src/h5pubconf.h | 7 - 49 files changed, 147 insertions(+), 392 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dcf5d7c..9667dcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -643,8 +643,6 @@ if (HDF5_ENABLE_PARALLEL) # MPI checks, only do these if MPI_C_FOUND is true, otherwise they always fail # and once set, they are cached as false and not regenerated set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}" ) - CHECK_FUNCTION_EXISTS (MPI_File_get_size H5_HAVE_MPI_GET_SIZE) - set (H5_MPI_FILE_SET_SIZE_BIG 1) # Used by Fortran + MPI CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "${MPI_C_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm) CHECK_SYMBOL_EXISTS (MPI_Info_c2f "${MPI_C_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Info) diff --git a/Makefile.in b/Makefile.in index 9343560..a8e0b61 100644 --- a/Makefile.in +++ b/Makefile.in @@ -344,7 +344,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/c++/Makefile.in b/c++/Makefile.in index c56cfc4..de87fa5 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -504,7 +504,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index eb74609..90dfed3 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -452,7 +452,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 604e7af6..4e4a498 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -518,7 +518,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 621618e..49c08e4 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -509,7 +509,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index d299987..225d01d 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -289,9 +289,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine H5_HAVE_MPE_H @H5_HAVE_MPE_H@ -/* Define if MPI_File_get_size works correctly */ -#cmakedefine H5_HAVE_MPI_GET_SIZE @H5_HAVE_MPI_GET_SIZE@ - /* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */ #cmakedefine H5_HAVE_MPI_MULTI_LANG_Comm @H5_HAVE_MPI_MULTI_LANG_Comm@ @@ -530,10 +527,6 @@ /* Define if the metadata trace file code is to be compiled in */ #cmakedefine H5_METADATA_TRACE_FILE @H5_METADATA_TRACE_FILE@ -/* Define if your system's `MPI_File_set_size' function works for files over - 2GB. */ -#cmakedefine H5_MPI_FILE_SET_SIZE_BIG @H5_MPI_FILE_SET_SIZE_BIG@ - /* Define if we can violate pointer alignment restrictions */ #cmakedefine H5_NO_ALIGNMENT_RESTRICTIONS @H5_NO_ALIGNMENT_RESTRICTIONS@ diff --git a/configure b/configure index ca22794..688ef96 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 25379 2014-06-29 23:07:05Z hdftest . +# From configure.ac Id: configure.ac 25396 2014-07-07 00:22:09Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for HDF5 1.8.14-snap9. # @@ -675,7 +675,6 @@ USE_FILTER_NBIT USE_FILTER_FLETCHER32 USE_FILTER_SHUFFLE FILTERS -MPI_GET_SIZE ADD_PARALLEL_FILES USINGMEMCHECKER CLEARFILEBUF @@ -919,7 +918,6 @@ enable_clear_file_buffers enable_using_memchecker enable_parallel with_mpe -enable_mpi_size enable_filters with_default_vfd enable_direct_vfd @@ -1618,11 +1616,6 @@ Optional Features: picky about it's memory operations and also disables the library's free space manager code. Default=no. --enable-parallel Search for MPI-IO and MPI support files - --enable-mpi-size Some systems (only SGI Altix Propack 4 so far) - return wrong value from MPI_File_get_size. By - disabling this function, the library will replace it - with stat to get the correct file size. - [default=yes] --enable-filters=all Turn on all internal I/O filters. One may also specify a comma-separated list of filters or the word no. The default is all internal I/O filters. @@ -29169,65 +29162,6 @@ fi $as_echo "#define HAVE_MPE 1" >>confdefs.h fi - - ## ---------------------------------------------------------------------- - ## Set the flag to indicate that the MPI_File_set_size() function - ## works with files over 2GB, unless it's already set in the cache. - ## (This flag should be set for all machines, except for ASCI Red, where - ## the cache value is set in it's config file) - ## - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MPI_File_set_size works for files over 2GB" >&5 -$as_echo_n "checking if MPI_File_set_size works for files over 2GB... " >&6; } - if ${hdf5_cv_mpi_file_set_size_big+:} false; then : - $as_echo_n "(cached) " >&6 -else - hdf5_cv_mpi_file_set_size_big=yes -fi - - - if test ${hdf5_cv_mpi_file_set_size_big} = "yes"; then - -$as_echo "#define MPI_FILE_SET_SIZE_BIG 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - - ## ---------------------------------------------------------------------- - ## Set the flag to indicate that the MPI_File_get_size() function - ## works. The default is enabled unless the user knows the function - ## doesn't work on the system and disables it. (This flag should be set - ## for all machines except for SGI Altix Propack 4 where the function - ## doesn't return correct file size.) - ## - # Check whether --enable-mpi-size was given. -if test "${enable_mpi_size+set}" = set; then : - enableval=$enable_mpi_size; MPI_GET_SIZE=$enableval -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MPI_File_get_size is enabled" >&5 -$as_echo_n "checking if MPI_File_get_size is enabled... " >&6; } - - - case "X-$MPI_GET_SIZE" in - X-no) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - MPI_GET_SIZE=no - ;; - X-yes|*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - MPI_GET_SIZE=yes - -$as_echo "#define HAVE_MPI_GET_SIZE 1" >>confdefs.h - - ;; - esac fi ## ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 4ea36d1..6fc6a3c 100644 --- a/configure.ac +++ b/configure.ac @@ -2884,54 +2884,6 @@ if test -n "$PARALLEL"; then if test "X-$MPE" = "X-yes"; then AC_DEFINE([HAVE_MPE], [1], [Define if we have MPE support]) fi - - ## ---------------------------------------------------------------------- - ## Set the flag to indicate that the MPI_File_set_size() function - ## works with files over 2GB, unless it's already set in the cache. - ## (This flag should be set for all machines, except for ASCI Red, where - ## the cache value is set in it's config file) - ## - AC_MSG_CHECKING([if MPI_File_set_size works for files over 2GB]) - AC_CACHE_VAL([hdf5_cv_mpi_file_set_size_big], [hdf5_cv_mpi_file_set_size_big=yes]) - - if test ${hdf5_cv_mpi_file_set_size_big} = "yes"; then - AC_DEFINE([MPI_FILE_SET_SIZE_BIG], [1], - [Define if your system's `MPI_File_set_size' function works for files over 2GB.]) - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - - ## ---------------------------------------------------------------------- - ## Set the flag to indicate that the MPI_File_get_size() function - ## works. The default is enabled unless the user knows the function - ## doesn't work on the system and disables it. (This flag should be set - ## for all machines except for SGI Altix Propack 4 where the function - ## doesn't return correct file size.) - ## - AC_ARG_ENABLE([mpi-size], - [AS_HELP_STRING([--enable-mpi-size], - [Some systems (only SGI Altix Propack 4 so far) return wrong value - from MPI_File_get_size. By disabling this function, the library - will replace it with stat to get the correct file size. - [default=yes]])], - [MPI_GET_SIZE=$enableval]) - - AC_MSG_CHECKING([if MPI_File_get_size is enabled]) - - AC_SUBST(MPI_GET_SIZE) - case "X-$MPI_GET_SIZE" in - X-no) - AC_MSG_RESULT([no]) - MPI_GET_SIZE=no - ;; - X-yes|*) - AC_MSG_RESULT([yes]) - MPI_GET_SIZE=yes - AC_DEFINE([HAVE_MPI_GET_SIZE], [1], - [Define if MPI_File_get_size works correctly]) - ;; - esac fi ## ---------------------------------------------------------------------- diff --git a/examples/Makefile.in b/examples/Makefile.in index 02db80c..71a9b4c 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -452,7 +452,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index b1c7f6a..4d8abdc 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -508,7 +508,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 890d52a..b9b5efb 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -460,7 +460,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index bc8e06e..a9114b0 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -569,7 +569,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 89db8f4..1cf96a1 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -565,7 +565,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 989c626..583b6dc 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -504,7 +504,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 17a1ff0..cda0122 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -508,7 +508,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 4b11ad8..3839814 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -504,7 +504,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 3938a3b..5712043 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -451,7 +451,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 2110786..2049ad1 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -510,7 +510,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index cee963a..f6bd246 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -507,7 +507,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 2bf5764..6bbf493 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -451,7 +451,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index c2d6610..8fe9e35 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -508,7 +508,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 1eb9c9d..1051658 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -451,7 +451,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 63c46a7..9b273a6 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -525,7 +525,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index e142edf..4a929a6 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -516,7 +516,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 54cbd17..f46b067 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -506,7 +506,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 0bb4abe..a002482 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -543,7 +543,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 5247b54..a34e225 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -505,7 +505,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 0652ddb..1c9be68 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -519,7 +519,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 8698c46..8db63de 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -546,7 +546,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 2c97282..5189939 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -1004,9 +1004,6 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, MPI_Comm comm_dup=MPI_COMM_NULL; MPI_Info info_dup=MPI_INFO_NULL; H5FD_t *ret_value; /* Return value */ -#ifndef H5_HAVE_MPI_GET_SIZE - h5_stat_t stat_buf; -#endif FUNC_ENTER_NOAPI_NOINIT @@ -1081,18 +1078,8 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, /* Only processor p0 will get the filesize and broadcast it. */ if (mpi_rank == 0) { - /* Get current file size. If MPI_File_get_size is disabled in configuration - * because it doesn't return correct value (SGI Altix Propack 4), - * use stat to get the file size. */ -#ifdef H5_HAVE_MPI_GET_SIZE if (MPI_SUCCESS != (mpi_code=MPI_File_get_size(fh, &size))) HMPI_GOTO_ERROR(NULL, "MPI_File_get_size failed", mpi_code) -#else - if((mpi_code=HDstat(name, &stat_buf))<0) - HMPI_GOTO_ERROR(NULL, "stat failed", mpi_code) - /* Hopefully this casting is safe */ - size = (MPI_Offset)(stat_buf.st_size); -#endif } /* end if */ /* Broadcast file size */ @@ -1987,38 +1974,14 @@ H5FD_mpio_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing) int mpi_code; /* mpi return code */ MPI_Offset mpi_off; -#ifdef H5_MPI_FILE_SET_SIZE_BIG if(H5FD_mpi_haddr_to_MPIOff(file->eoa, &mpi_off) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset") /* Extend the file's size */ if(MPI_SUCCESS != (mpi_code = MPI_File_set_size(file->f, mpi_off))) HMPI_GOTO_ERROR(FAIL, "MPI_File_set_size failed", mpi_code) -#else /* H5_MPI_FILE_SET_SIZE_BIG */ - /* Wait until all processes are here before reading/writing the byte at - * process 0's end of address space. The window for corruption is - * probably tiny, but does exist... - */ - if(MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm))) - HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code) - - if(0 == file->mpi_rank) { - uint8_t byte = 0; - MPI_Status mpi_stat; - - /* Portably initialize MPI status variable */ - HDmemset(&mpi_stat, 0, sizeof(MPI_Status)); - - if(H5FD_mpi_haddr_to_MPIOff(file->eoa-1, &mpi_off) < 0) - HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset") - if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, &byte, 1, MPI_BYTE, &mpi_stat))) - HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code) - if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, &byte, 1, MPI_BYTE, &mpi_stat))) - HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code) - } /* end if */ -#endif /* H5_MPI_FILE_SET_SIZE_BIG */ - /* Don't let any proc return until all have extended the file. + /* Don't let any proc return until all have extended the file. * (Prevents race condition where some processes go ahead and write * more data to the file before all the processes have finished making * it the shorter length, potentially truncating the file and dropping diff --git a/src/H5config.h.in b/src/H5config.h.in index 82925bf..daf7d0d 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -253,9 +253,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MPE_H -/* Define if MPI_File_get_size works correctly */ -#undef HAVE_MPI_GET_SIZE - /* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */ #undef HAVE_MPI_MULTI_LANG_Comm @@ -479,10 +476,6 @@ /* Define if the metadata trace file code is to be compiled in */ #undef METADATA_TRACE_FILE -/* Define if your system's `MPI_File_set_size' function works for files over - 2GB. */ -#undef MPI_FILE_SET_SIZE_BIG - /* Define if we can violate pointer alignment restrictions */ #undef NO_ALIGNMENT_RESTRICTIONS diff --git a/src/Makefile.in b/src/Makefile.in index 30b0ae1..1d42bf0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -564,7 +564,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/test/Makefile.in b/test/Makefile.in index aff56c9..2235cef 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -874,7 +874,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 87d0e29..dc5b6b1 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -525,7 +525,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c index 43b45af..1ed21a2 100644 --- a/testpar/t_chunk_alloc.c +++ b/testpar/t_chunk_alloc.c @@ -36,13 +36,9 @@ get_filesize(const char *filename) int mpierr; MPI_File fd; MPI_Offset filesize; -#ifndef H5_HAVE_MPI_GET_SIZE - h5_stat_t stat_buf; -#endif -#ifdef H5_HAVE_MPI_GET_SIZE mpierr = MPI_File_open(MPI_COMM_SELF, (char*)filename, MPI_MODE_RDONLY, - MPI_INFO_NULL, &fd); + MPI_INFO_NULL, &fd); VRFY((mpierr == MPI_SUCCESS), ""); mpierr = MPI_File_get_size(fd, &filesize); @@ -50,16 +46,6 @@ get_filesize(const char *filename) mpierr = MPI_File_close(&fd); VRFY((mpierr == MPI_SUCCESS), ""); -#else - /* Some systems (only SGI Altix Propack 4 so far) doesn't return correct - * file size for MPI_File_get_size. Use stat instead. - */ - if((mpierr=HDstat(filename, &stat_buf))<0) - VRFY((mpierr == MPI_SUCCESS), ""); - - /* Hopefully this casting is safe */ - filesize = (MPI_Offset)(stat_buf.st_size); -#endif return(filesize); } diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 6e2348b..cd61e1e 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -206,7 +206,6 @@ test_mpio_gb_file(char *filename) MPI_Offset mpi_off; MPI_Offset mpi_off_old; MPI_Status mpi_stat; - h5_stat_t stat_buf; int is_signed, sizeof_mpi_offset; nerrs = 0; @@ -227,201 +226,185 @@ test_mpio_gb_file(char *filename) * sizes. */ if (MAINPROCESS){ /* only process 0 needs to check it*/ - printf("MPI_Offset is %s %d bytes integeral type\n", - is_signed ? "signed" : "unsigned", (int)sizeof(MPI_Offset)); - if (sizeof_mpi_offset <= 4 && is_signed){ - printf("Skipped 2GB range test " - "because MPI_Offset cannot support it\n"); - }else { - /* verify correctness of assigning 2GB sizes */ - mpi_off = 2 * 1024 * (MPI_Offset)MB; - INFO((mpi_off>0), "2GB OFFSET assignment no overflow"); - INFO((mpi_off-1)==TWO_GB_LESS1, "2GB OFFSET assignment succeed"); - - /* verify correctness of increasing from below 2 GB to above 2GB */ - mpi_off = TWO_GB_LESS1; - for (i=0; i < 3; i++){ - mpi_off_old = mpi_off; - mpi_off = mpi_off + 1; - /* no overflow */ - INFO((mpi_off>0), "2GB OFFSET increment no overflow"); - /* correct inc. */ - INFO((mpi_off-1)==mpi_off_old, "2GB OFFSET increment succeed"); - } - } + printf("MPI_Offset is %s %d bytes integeral type\n", + is_signed ? "signed" : "unsigned", (int)sizeof(MPI_Offset)); + if (sizeof_mpi_offset <= 4 && is_signed){ + printf("Skipped 2GB range test " + "because MPI_Offset cannot support it\n"); + }else { + /* verify correctness of assigning 2GB sizes */ + mpi_off = 2 * 1024 * (MPI_Offset)MB; + INFO((mpi_off>0), "2GB OFFSET assignment no overflow"); + INFO((mpi_off-1)==TWO_GB_LESS1, "2GB OFFSET assignment succeed"); + + /* verify correctness of increasing from below 2 GB to above 2GB */ + mpi_off = TWO_GB_LESS1; + for (i=0; i < 3; i++){ + mpi_off_old = mpi_off; + mpi_off = mpi_off + 1; + /* no overflow */ + INFO((mpi_off>0), "2GB OFFSET increment no overflow"); + /* correct inc. */ + INFO((mpi_off-1)==mpi_off_old, "2GB OFFSET increment succeed"); + } + } - if (sizeof_mpi_offset <= 4){ - printf("Skipped 4GB range test " - "because MPI_Offset cannot support it\n"); - }else { - /* verify correctness of assigning 4GB sizes */ - mpi_off = 4 * 1024 * (MPI_Offset)MB; - INFO((mpi_off>0), "4GB OFFSET assignment no overflow"); - INFO((mpi_off-1)==FOUR_GB_LESS1, "4GB OFFSET assignment succeed"); - - /* verify correctness of increasing from below 4 GB to above 4 GB */ - mpi_off = FOUR_GB_LESS1; - for (i=0; i < 3; i++){ - mpi_off_old = mpi_off; - mpi_off = mpi_off + 1; - /* no overflow */ - INFO((mpi_off>0), "4GB OFFSET increment no overflow"); - /* correct inc. */ - INFO((mpi_off-1)==mpi_off_old, "4GB OFFSET increment succeed"); - } - } + if (sizeof_mpi_offset <= 4){ + printf("Skipped 4GB range test " + "because MPI_Offset cannot support it\n"); + }else { + /* verify correctness of assigning 4GB sizes */ + mpi_off = 4 * 1024 * (MPI_Offset)MB; + INFO((mpi_off>0), "4GB OFFSET assignment no overflow"); + INFO((mpi_off-1)==FOUR_GB_LESS1, "4GB OFFSET assignment succeed"); + + /* verify correctness of increasing from below 4 GB to above 4 GB */ + mpi_off = FOUR_GB_LESS1; + for (i=0; i < 3; i++){ + mpi_off_old = mpi_off; + mpi_off = mpi_off + 1; + /* no overflow */ + INFO((mpi_off>0), "4GB OFFSET increment no overflow"); + /* correct inc. */ + INFO((mpi_off-1)==mpi_off_old, "4GB OFFSET increment succeed"); + } + } } /* * Verify if we can write to a file of multiple GB sizes. */ if (VERBOSE_MED) - printf("MPIO GB file test %s\n", filename); + printf("MPIO GB file test %s\n", filename); if (sizeof_mpi_offset <= 4){ - printf("Skipped GB file range test " - "because MPI_Offset cannot support it\n"); + printf("Skipped GB file range test " + "because MPI_Offset cannot support it\n"); }else{ - buf = malloc(MB); - VRFY((buf!=NULL), "malloc succeed"); - - /* open a new file. Remove it first in case it exists. */ - /* Must delete because MPI_File_open does not have a Truncate mode. */ - /* Don't care if it has error. */ - MPI_File_delete(filename, MPI_INFO_NULL); - MPI_Barrier(MPI_COMM_WORLD); /* prevent racing condition */ + buf = malloc(MB); + VRFY((buf!=NULL), "malloc succeed"); - mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_CREATE|MPI_MODE_RDWR, - info, &fh); - VRFY((mrc==MPI_SUCCESS), "MPI_FILE_OPEN"); + /* open a new file. Remove it first in case it exists. */ + /* Must delete because MPI_File_open does not have a Truncate mode. */ + /* Don't care if it has error. */ + MPI_File_delete(filename, MPI_INFO_NULL); + MPI_Barrier(MPI_COMM_WORLD); /* prevent racing condition */ - printf("MPIO GB file write test %s\n", filename); + mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_CREATE|MPI_MODE_RDWR, + info, &fh); + VRFY((mrc==MPI_SUCCESS), "MPI_FILE_OPEN"); - /* instead of writing every bytes of the file, we will just write - * some data around the 2 and 4 GB boundaries. That should cover - * potential integer overflow and filesystem size limits. - */ - writerrs = 0; - for (n=2; n <= 4; n+=2){ - ntimes = GB/MB*n/mpi_size + 1; - for (i=ntimes-2; i <= ntimes; i++){ - mpi_off = (i*mpi_size + mpi_rank)*(MPI_Offset)MB; - if (VERBOSE_MED) - HDfprintf(stdout,"proc %d: write to mpi_off=%016llx, %lld\n", - mpi_rank, mpi_off, mpi_off); - /* set data to some trivial pattern for easy verification */ - for (j=0; j0){ - printf("proc %d: Skip read test due to previous write errors\n", - mpi_rank); - goto finish; - } - mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh); - VRFY((mrc==MPI_SUCCESS), ""); + mrc = MPI_Barrier(MPI_COMM_WORLD); + VRFY((mrc==MPI_SUCCESS), "Sync after writes"); - /* Only read back parts of the file that have been written. */ - for (n=2; n <= 4; n+=2){ - ntimes = GB/MB*n/mpi_size + 1; - for (i=ntimes-2; i <= ntimes; i++){ - mpi_off = (i*mpi_size + (mpi_size - mpi_rank - 1))*(MPI_Offset)MB; - if (VERBOSE_MED) - HDfprintf(stdout,"proc %d: read from mpi_off=%016llx, %lld\n", - mpi_rank, mpi_off, mpi_off); - mrc = MPI_File_read_at(fh, mpi_off, buf, MB, MPI_BYTE, &mpi_stat); - INFO((mrc==MPI_SUCCESS), "GB size file read"); - expected = i*mpi_size + (mpi_size - mpi_rank - 1); - vrfyerrs=0; - for (j=0; j0){ + printf("proc %d: Skip read test due to previous write errors\n", + mpi_rank); + goto finish; } - } - if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED) - printf("proc %d: [more errors ...]\n", mpi_rank); - - nerrs += vrfyerrs; - } - } + mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh); + VRFY((mrc==MPI_SUCCESS), ""); - /* close file and free the communicator */ - mrc = MPI_File_close(&fh); - VRFY((mrc==MPI_SUCCESS), "MPI_FILE_CLOSE"); + /* Only read back parts of the file that have been written. */ + for (n=2; n <= 4; n+=2){ + ntimes = GB/MB*n/mpi_size + 1; + for (i=ntimes-2; i <= ntimes; i++){ + mpi_off = (i*mpi_size + (mpi_size - mpi_rank - 1))*(MPI_Offset)MB; + if (VERBOSE_MED) + HDfprintf(stdout,"proc %d: read from mpi_off=%016llx, %lld\n", + mpi_rank, mpi_off, mpi_off); + mrc = MPI_File_read_at(fh, mpi_off, buf, MB, MPI_BYTE, &mpi_stat); + INFO((mrc==MPI_SUCCESS), "GB size file read"); + expected = i*mpi_size + (mpi_size - mpi_rank - 1); + vrfyerrs=0; + for (j=0; j MAX_ERR_REPORT && !VERBOSE_MED) + printf("proc %d: [more errors ...]\n", mpi_rank); + + nerrs += vrfyerrs; + } + } - /* - * one more sync to ensure all processes have done reading - * before ending this test. - */ - mrc = MPI_Barrier(MPI_COMM_WORLD); - VRFY((mrc==MPI_SUCCESS), "Sync before leaving test"); + /* close file and free the communicator */ + mrc = MPI_File_close(&fh); + VRFY((mrc==MPI_SUCCESS), "MPI_FILE_CLOSE"); /* - * Check if MPI_File_get_size works correctly. Some systems (only SGI Altix - * Propack 4 so far) return wrong file size. It can be avoided by reconfiguring - * with "--disable-mpi-size". + * one more sync to ensure all processes have done reading + * before ending this test. */ -#ifdef H5_HAVE_MPI_GET_SIZE - printf("Test if MPI_File_get_size works correctly with %s\n", filename); + mrc = MPI_Barrier(MPI_COMM_WORLD); + VRFY((mrc==MPI_SUCCESS), "Sync before leaving test"); + + printf("Test if MPI_File_get_size works correctly with %s\n", filename); - mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh); + mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh); VRFY((mrc==MPI_SUCCESS), ""); if (MAINPROCESS){ /* only process 0 needs to check it*/ mrc = MPI_File_get_size(fh, &size); - VRFY((mrc==MPI_SUCCESS), ""); - - mrc=HDstat(filename, &stat_buf); - VRFY((mrc==0), ""); - - /* Hopefully this casting is safe */ - if(size != (MPI_Offset)(stat_buf.st_size)) { - printf("Warning: MPI_File_get_size doesn't return correct file size. To avoid using it in the library, reconfigure and rebuild the library with --disable-mpi-size.\n"); - } + VRFY((mrc==MPI_SUCCESS), ""); + VRFY((size == mpi_off+MB), "MPI_File_get_size doesn't return correct file size."); } - /* close file and free the communicator */ - mrc = MPI_File_close(&fh); - VRFY((mrc==MPI_SUCCESS), "MPI_FILE_CLOSE"); + /* close file and free the communicator */ + mrc = MPI_File_close(&fh); + VRFY((mrc==MPI_SUCCESS), "MPI_FILE_CLOSE"); - /* - * one more sync to ensure all processes have done reading - * before ending this test. - */ - mrc = MPI_Barrier(MPI_COMM_WORLD); - VRFY((mrc==MPI_SUCCESS), "Sync before leaving test"); -#else - printf("Skipped testing MPI_File_get_size because it's disabled\n"); -#endif + /* + * one more sync to ensure all processes have done reading + * before ending this test. + */ + mrc = MPI_Barrier(MPI_COMM_WORLD); + VRFY((mrc==MPI_SUCCESS), "Sync before leaving test"); } finish: if (buf) - HDfree(buf); + HDfree(buf); return (nerrs); } diff --git a/tools/Makefile.in b/tools/Makefile.in index c592973..0b0e2d0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -505,7 +505,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index fef0136..76573a0 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -513,7 +513,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 08008d7..6a8d2ac 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -520,7 +520,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index f479679..8cb1661 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -519,7 +519,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 5cba138..d3b0185 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -513,7 +513,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index a50a9c9..d0c8f16 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -525,7 +525,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index af9d170..2c4fe10 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -505,7 +505,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 44ffb9d..50e7341 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -537,7 +537,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index f0c2674..32b6d4c 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -515,7 +515,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 5af2dfd..210b6b3 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -502,7 +502,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index b0a7822..1160938 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -540,7 +540,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index 89fb89c..7c14c31 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -253,9 +253,6 @@ /* Define to 1 if you have the header file. */ /* #undef H5_HAVE_MPE_H */ -/* Define if MPI_File_get_size works correctly */ -/* #undef H5_HAVE_MPI_GET_SIZE */ - /* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */ /* #undef H5_HAVE_MPI_MULTI_LANG_Comm */ @@ -485,10 +482,6 @@ /* Define if the metadata trace file code is to be compiled in */ /* #undef H5_METADATA_TRACE_FILE */ -/* Define if your system's `MPI_File_set_size' function works for files over - 2GB. */ -/* #undef H5_MPI_FILE_SET_SIZE_BIG */ - /* Define if we can violate pointer alignment restrictions */ #define H5_NO_ALIGNMENT_RESTRICTIONS 1 -- cgit v0.12