mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-19 16:50:46 +08:00
[svn-r25397] - remove configure checks for MPI_File_get_size and Big
MPI_File_set_size as they are supported by most MPI implementations. - fix bug in t_mpi.c (HDFFV-8856)
This commit is contained in:
Mohamad Chaarawi
parent
5ad9bfb322
commit
06ef71a37f
@ -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)
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -293,9 +293,6 @@
|
||||
/* Define to 1 if you have the <mpe.h> 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@
|
||||
|
||||
@ -534,10 +531,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@
|
||||
|
||||
|
||||
66
configure
vendored
66
configure
vendored
@ -675,7 +675,6 @@ USE_FILTER_NBIT
|
||||
USE_FILTER_FLETCHER32
|
||||
USE_FILTER_SHUFFLE
|
||||
FILTERS
|
||||
MPI_GET_SIZE
|
||||
ADD_PARALLEL_FILES
|
||||
USINGMEMCHECKER
|
||||
CLEARFILEBUF
|
||||
@ -922,7 +921,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.
|
||||
@ -29233,65 +29226,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
|
||||
|
||||
## ----------------------------------------------------------------------
|
||||
|
||||
48
configure.ac
48
configure.ac
@ -2895,54 +2895,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
|
||||
|
||||
## ----------------------------------------------------------------------
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -578,7 +578,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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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 */
|
||||
@ -1989,36 +1976,12 @@ 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.
|
||||
* (Prevents race condition where some processes go ahead and write
|
||||
|
||||
@ -253,9 +253,6 @@
|
||||
/* Define to 1 if you have the <mpe.h> 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
|
||||
|
||||
|
||||
@ -568,7 +568,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@
|
||||
|
||||
@ -911,7 +911,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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -36,11 +36,7 @@ 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);
|
||||
VRFY((mpierr == MPI_SUCCESS), "");
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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;
|
||||
@ -380,13 +379,7 @@ test_mpio_gb_file(char *filename)
|
||||
mrc = MPI_Barrier(MPI_COMM_WORLD);
|
||||
VRFY((mrc==MPI_SUCCESS), "Sync before leaving test");
|
||||
|
||||
/*
|
||||
* 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".
|
||||
*/
|
||||
#ifdef H5_HAVE_MPI_GET_SIZE
|
||||
printf("Test if MPI_File_get_size works correctly with %s\n", filename);
|
||||
printf("Test if MPI_File_get_size works with %s\n", filename);
|
||||
|
||||
mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh);
|
||||
VRFY((mrc==MPI_SUCCESS), "");
|
||||
@ -394,14 +387,6 @@ test_mpio_gb_file(char *filename)
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
/* close file and free the communicator */
|
||||
@ -414,9 +399,6 @@ test_mpio_gb_file(char *filename)
|
||||
*/
|
||||
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
|
||||
}
|
||||
|
||||
finish:
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -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@
|
||||
|
||||
@ -253,9 +253,6 @@
|
||||
/* Define to 1 if you have the <mpe.h> 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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user