diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 1999-07-12 17:37:58 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 1999-07-12 17:37:58 (GMT) |
| commit | ccd97f3d8f20768faaa7675041fff05ec9f79e89 (patch) | |
| tree | 49e91c13f8422c7eba65d3e82f9f0cf0f280bfd4 | |
| parent | 0fb4c9a123bbe05b99626b33c384951ef9ab8767 (diff) | |
| download | hdf5-ccd97f3d8f20768faaa7675041fff05ec9f79e89.zip hdf5-ccd97f3d8f20768faaa7675041fff05ec9f79e89.tar.gz hdf5-ccd97f3d8f20768faaa7675041fff05ec9f79e89.tar.bz2 | |
[svn-r1465] src/H5Fmpio.c:
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.)
| -rw-r--r-- | src/H5Fmpio.c | 8 | ||||
| -rw-r--r-- | src/H5public.h | 2 | ||||
| -rw-r--r-- | testpar/testphdf5.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Fmpio.c b/src/H5Fmpio.c index 971ced5..b5f3858 100644 --- a/src/H5Fmpio.c +++ b/src/H5Fmpio.c @@ -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 ); diff --git a/src/H5public.h b/src/H5public.h index 837f13a..da67b5c 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -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 */ diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index dd4db92..399f3b5 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -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 */ |