diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 1998-04-17 14:52:41 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 1998-04-17 14:52:41 (GMT) |
| commit | d6923f46e0f0969aa0b73eb2c525dc8bf65e610c (patch) | |
| tree | 691107678c0856aac60da073885814f3a672a340 /src/H5Farray.c | |
| parent | 4d16aa5ab78589e0e09dcd3072a06b3681bf7d54 (diff) | |
| download | hdf5-d6923f46e0f0969aa0b73eb2c525dc8bf65e610c.zip hdf5-d6923f46e0f0969aa0b73eb2c525dc8bf65e610c.tar.gz hdf5-d6923f46e0f0969aa0b73eb2c525dc8bf65e610c.tar.bz2 | |
[svn-r351] Removed the access_mode argument from H5Pset_mpi which was later
used to open an HDF5 file with MPIO access. The design has changed
to provide access-mode controll (independent or collective access)
as an argument in the H5D read/write calls.
Also removed the macros H5FACC_INDEPENDENT and H5FACC_COLLECTIVE.
The original thinking was to define how a file is independent or
collective access. They are replaced by the enum H5D_transfer_t
with values of H5D_XFER_INDEPENDENT and H5D_XFER_COLLECTIVE.
These values are used in the H5Pset_xfer to setup a data transfer
property list to be used during the H5D read/write calls.
The original access_mode field in the File access structure is
still there. It would be removed soon once the transfer control
can be passed down to the low level I/O routines.
Diffstat (limited to 'src/H5Farray.c')
| -rw-r--r-- | src/H5Farray.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Farray.c b/src/H5Farray.c index 76f09d8..98d3022 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -150,7 +150,7 @@ H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout, #ifdef HAVE_PARALLEL is_collective = (f->shared->access_parms.driver==H5F_LOW_MPIO - && f->shared->access_parms.u.mpio.access_mode==H5ACC_COLLECTIVE); + && f->shared->access_parms.u.mpio.access_mode==H5D_XFER_COLLECTIVE); if (is_collective){ #ifdef AKC printf("%s: collective read requested\n", FUNC); @@ -212,16 +212,16 @@ H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout, * Need to be changed LATER to combine all reads into one * collective MPIO call. */ - long max, min, temp; + unsigned long max, min, temp; temp = nelmts; assert(temp==nelmts); /* verify no overflow */ - MPI_Allreduce(&temp, &max, 1, MPI_LONG, MPI_MAX, + MPI_Allreduce(&temp, &max, 1, MPI_UNSIGNED_LONG, MPI_MAX, f->shared->access_parms.u.mpio.comm); - MPI_Allreduce(&temp, &min, 1, MPI_LONG, MPI_MIN, + MPI_Allreduce(&temp, &min, 1, MPI_UNSIGNED_LONG, MPI_MIN, f->shared->access_parms.u.mpio.comm); #ifdef AKC -printf("nelmnts=%ld, min=%ld, max=%ld\n", temp, min, max); +printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max); #endif if (max != min) HRETURN_ERROR(H5E_DATASET, H5E_READERROR, FAIL, @@ -350,7 +350,7 @@ H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout, #ifdef HAVE_PARALLEL is_collective = (f->shared->access_parms.driver==H5F_LOW_MPIO - && f->shared->access_parms.u.mpio.access_mode==H5ACC_COLLECTIVE); + && f->shared->access_parms.u.mpio.access_mode==H5D_XFER_COLLECTIVE); if (is_collective){ #ifdef AKC printf("%s: collective write requested\n", FUNC); @@ -412,16 +412,16 @@ H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout, * Need to be changed LATER to combine all writes into one * collective MPIO call. */ - long max, min, temp; + unsigned long max, min, temp; temp = nelmts; assert(temp==nelmts); /* verify no overflow */ - MPI_Allreduce(&temp, &max, 1, MPI_LONG, MPI_MAX, + MPI_Allreduce(&temp, &max, 1, MPI_UNSIGNED_LONG, MPI_MAX, f->shared->access_parms.u.mpio.comm); - MPI_Allreduce(&temp, &min, 1, MPI_LONG, MPI_MIN, + MPI_Allreduce(&temp, &min, 1, MPI_UNSIGNED_LONG, MPI_MIN, f->shared->access_parms.u.mpio.comm); #ifdef AKC -printf("nelmnts=%ld, min=%ld, max=%ld\n", temp, min, max); +printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max); #endif if (max != min) HRETURN_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, |