diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 1999-12-17 14:37:22 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 1999-12-17 14:37:22 (GMT) |
| commit | 2c7bbf697f56815d82c298e1103870daebe298c3 (patch) | |
| tree | 1df07bb74e8d7f53bdb1c931a35b40eec27bcf67 /src/H5Farray.c | |
| parent | 36c94d90182b5740742aff9d15edc430520e2c71 (diff) | |
| download | hdf5-2c7bbf697f56815d82c298e1103870daebe298c3.zip hdf5-2c7bbf697f56815d82c298e1103870daebe298c3.tar.gz hdf5-2c7bbf697f56815d82c298e1103870daebe298c3.tar.bz2 | |
[svn-r1881] Changed all the HAVE_PARALLEL and HAVE_GASS macros to the new
form of H5_HAVE_PARALLEL and H5_HAVE_GASS.
Diffstat (limited to 'src/H5Farray.c')
| -rw-r--r-- | src/H5Farray.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Farray.c b/src/H5Farray.c index ecf6066..02a39d3 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -140,7 +140,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, haddr_t addr; /*address in file */ intn i, j; /*counters */ hbool_t carray; /*carry for subtraction */ -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif @@ -158,7 +158,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, /* Make a local copy of size so we can modify it */ H5V_vector_cpy(layout->ndims, hslab_size, _hslab_size); -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL { /* Get the transfer mode */ H5F_xfer_t *dxpl; @@ -171,7 +171,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, } #endif -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL /* Collective MPIO access is unsupported for non-contiguous datasets */ if (H5D_CONTIGUOUS!=layout->type && H5FD_MPIO_COLLECTIVE==xfer_mode) { HRETURN_ERROR (H5E_DATASET, H5E_READERROR, FAIL, @@ -245,7 +245,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, * Now begin to walk through the array, copying data from disk to * memory. */ -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL if (H5FD_MPIO_COLLECTIVE==xfer_mode){ /* * Currently supports same number of collective access. Need to @@ -380,7 +380,7 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, haddr_t addr; /*address in file */ intn i, j; /*counters */ hbool_t carray; /*carry for subtraction */ -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif @@ -398,7 +398,7 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, /* Make a local copy of _size so we can modify it */ H5V_vector_cpy(layout->ndims, hslab_size, _hslab_size); -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL { /* Get the transfer mode */ H5F_xfer_t *dxpl; @@ -411,7 +411,7 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, } #endif -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL if (H5D_CONTIGUOUS!=layout->type && H5FD_MPIO_COLLECTIVE==xfer_mode) { HRETURN_ERROR (H5E_DATASET, H5E_WRITEERROR, FAIL, "collective access on non-contiguous datasets not " @@ -488,7 +488,7 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, * Now begin to walk through the array, copying data from memory to * disk. */ -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL if (H5FD_MPIO_COLLECTIVE==xfer_mode){ /* * Currently supports same number of collective access. Need to |