diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-12-23 15:02:40 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-12-23 15:02:40 (GMT) |
| commit | d4e70e8caeea4d4aa632fe10f83cd184fe0757e4 (patch) | |
| tree | eabbe8fd834d15d3033aa710fec106e659656a21 | |
| parent | cbd0460b1b2c94611cb02f9d6f240b4d24ce8fe2 (diff) | |
| download | hdf5-d4e70e8caeea4d4aa632fe10f83cd184fe0757e4.zip hdf5-d4e70e8caeea4d4aa632fe10f83cd184fe0757e4.tar.gz hdf5-d4e70e8caeea4d4aa632fe10f83cd184fe0757e4.tar.bz2 | |
[svn-r25922] mpi version check for new mpi 3 features should be >= 3 rather than == 3.
| -rw-r--r-- | src/H5FDmpio.c | 12 | ||||
| -rw-r--r-- | src/H5Smpio.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 4f48e27..89f1432 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -1454,7 +1454,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add int mpi_code; /* mpi return code */ MPI_Datatype buf_type = MPI_BYTE; /* MPI description of the selection in memory */ int size_i; /* Integer copy of 'size' to read */ -#if MPI_VERSION == 3 +#if MPI_VERSION >= 3 MPI_Count bytes_read; /* Number of bytes read in */ MPI_Count type_size; /* MPI datatype used for I/O's size */ MPI_Count io_size; /* Actual number of bytes requested */ @@ -1580,7 +1580,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add } /* How many bytes were actually read? */ -#if MPI_VERSION == 3 +#if MPI_VERSION >= 3 if (MPI_SUCCESS != (mpi_code = MPI_Get_elements_x(&mpi_stat, buf_type, &bytes_read))) #else if (MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_read))) @@ -1588,7 +1588,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code) /* Get the type's size */ -#if MPI_VERSION == 3 +#if MPI_VERSION >= 3 if (MPI_SUCCESS != (mpi_code = MPI_Type_size_x(buf_type, &type_size))) #else if (MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size))) @@ -1748,7 +1748,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, MPI_Status mpi_stat; /* Status from I/O operation */ MPI_Datatype buf_type = MPI_BYTE; /* MPI description of the selection in memory */ int mpi_code; /* MPI return code */ -#if MPI_VERSION == 3 +#if MPI_VERSION >= 3 MPI_Count bytes_written; MPI_Count type_size; /* MPI datatype used for I/O's size */ MPI_Count io_size; /* Actual number of bytes requested */ @@ -1884,7 +1884,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, } /* How many bytes were actually written? */ -#if MPI_VERSION == 3 +#if MPI_VERSION >= 3 if(MPI_SUCCESS != (mpi_code = MPI_Get_elements_x(&mpi_stat, buf_type, &bytes_written))) #else if(MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_written))) @@ -1892,7 +1892,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code) /* Get the type's size */ -#if MPI_VERSION == 3 +#if MPI_VERSION >= 3 if(MPI_SUCCESS != (mpi_code = MPI_Type_size_x(buf_type, &type_size))) #else if(MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size))) diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 81b032f..def7598 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -169,7 +169,7 @@ H5S_mpio_create_point_datatype (size_t elmt_size, hsize_t num_points, HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) elmt_type_created = TRUE; -#if MPI_VERSION == 3 +#if MPI_VERSION >= 3 /* Create an MPI datatype for the whole point selection */ if(MPI_SUCCESS != (mpi_code = MPI_Type_create_hindexed_block((int)num_points, 1, disp, elmt_type, new_type))) HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_indexed_block failed", mpi_code) |