mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r1465] src/H5Fmpio.c:

Browse Source 
Removed the unnecessary #include of mpi.h and mpio.h.  (They are
    included already in H5public.h when applicable.)  Changed couple
    debug printing to be controlled like the others.
src/H5public.h:
    Officially, mpio.h should be in mpi.h but MPIO are not always
    supported by the vendor yet.  Make the #include of mpio.h conditional
    when it is not in mpi.h.
testpar/testphdf5.h:
    Removed the unnecessary #include of mpi.h and mpio.h.  (They are
    included already in H5public.h when applicable.)
This commit is contained in:
Albert Cheng 1999-07-12 12:37:58 -05:00
parent 0fb4c9a123
commit ccd97f3d8f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/H5Fmpio.c
View File

@ -59,8 +59,6 @@
*/
/* const hbool_t H5F_mpio_avail = FALSE; */
#else /* HAVE_PARALLEL */
#include <mpi.h>
#include <mpio.h>
#define PABLO_MASK H5Fmpio_mask
static intn interface_initialize_g = 0;
@ -603,7 +601,8 @@ H5F_mpio_read(H5F_low_t *lf, H5F_access_t *access_parms,
case H5D_XFER_COLLECTIVE:
#ifdef H5Fmpio_DEBUG
printf("%s: using MPIO collective mode\n", FUNC);
if (H5F_mpio_Debug[(int)'t'])
fprintf(stdout, "%s: using MPIO collective mode\n", FUNC);
#endif
mpierr = MPI_File_read_at_all ( lf->u.mpio.f, mpi_off, (void*) buf,
size_i, buf_type, &mpi_stat );
@ -876,7 +875,8 @@ H5F_mpio_write(H5F_low_t *lf, H5F_access_t *access_parms,
case H5D_XFER_COLLECTIVE:
#ifdef H5Fmpio_DEBUG
printf("%s: using MPIO collective mode\n", FUNC);
if (H5F_mpio_Debug[(int)'t'])
fprintf(stdout, "%s: using MPIO collective mode\n", FUNC);
#endif
mpierr = MPI_File_write_at_all( lf->u.mpio.f, mpi_off, (void*) buf,
size_i, buf_type, &mpi_stat );

2
src/H5public.h
View File

@ -34,8 +34,10 @@ static char RcsId[] = "@(#)$Revision$";
#endif
#ifdef HAVE_PARALLEL
# include <mpi.h>
#ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already*/
# include <mpio.h>
#endif
#endif
#include <H5api_adpt.h>
/* Version numbers */

2
testpar/testphdf5.h
View File

@ -6,8 +6,6 @@
#include <assert.h>
#include <stdlib.h>
#include <hdf5.h>
#include <mpi.h>
#include <mpio.h>
/* Define some handy debugging shorthands, routines, ... */
/* debugging tools */