diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2022-03-30 22:58:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 22:58:55 (GMT) |
| commit | ab48ed6df05f38dde776056363487f3629aa4cd4 (patch) | |
| tree | 7d0affbbb69f3786d38620ede69787f2d1e4d42a /src/H5Dmpio.c | |
| parent | 82bf2e97f740c30f74a884dc93be3052ac4a0557 (diff) | |
| download | hdf5-ab48ed6df05f38dde776056363487f3629aa4cd4.zip hdf5-ab48ed6df05f38dde776056363487f3629aa4cd4.tar.gz hdf5-ab48ed6df05f38dde776056363487f3629aa4cd4.tar.bz2 | |
Add H5_CHECK_MPI_VERSION macro to check for at least MPI version of (version, subversion) (#1556)
* Fix MPI version check for MPI_Aint_diff usage
* Add H5_CHECK_MPI_VERSION macro
Adds new H5_CHECK_MPI_VERSION macro to check for MPI library version/subversion pair of at least the specified pair
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 8577001..2cde4d3 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -3801,7 +3801,7 @@ H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk H5D_filtered_collective_io_info_t **chunk_hash_table, unsigned char ***chunk_msg_bufs, int *chunk_msg_bufs_len) { -#if MPI_VERSION >= 3 +#if H5_CHECK_MPI_VERSION(3, 0) H5D_filtered_collective_io_info_t *chunk_table = NULL; H5S_sel_iter_t * mem_iter = NULL; unsigned char ** msg_send_bufs = NULL; @@ -4023,7 +4023,7 @@ H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk * post a non-blocking receive to receive it */ if (msg_flag) { -#if MPI_VERSION >= 3 +#if H5_CHECK_MPI_VERSION(3, 0) MPI_Count msg_size = 0; if (MPI_SUCCESS != (mpi_code = MPI_Get_elements_x(&status, MPI_BYTE, &msg_size))) @@ -5768,7 +5768,7 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l * offset and base chunk data buffer. */ if (op_type == H5D_IO_OP_WRITE) { -#if MPI_VERSION >= 3 +#if H5_CHECK_MPI_VERSION(3, 0) if (MPI_SUCCESS != (mpi_code = MPI_Get_address(chunk_list[0].buf, &base_buf))) HMPI_GOTO_ERROR(FAIL, "MPI_Get_address failed", mpi_code) #else @@ -5793,7 +5793,7 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l * data buffer if we haven't already */ if (!H5F_addr_defined(base_offset)) { -#if MPI_VERSION >= 3 +#if H5_CHECK_MPI_VERSION(3, 0) if (MPI_SUCCESS != (mpi_code = MPI_Get_address(chunk_list[i].buf, &base_buf))) HMPI_GOTO_ERROR(FAIL, "MPI_Get_address failed", mpi_code) #else @@ -5830,7 +5830,7 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l * Set the displacement of the chunk entry's chunk data buffer, * relative to the first entry's data buffer */ -#if MPI_VERSION >= 3 && MPI_SUBVERSION >= 1 +#if H5_CHECK_MPI_VERSION(3, 1) if (MPI_SUCCESS != (mpi_code = MPI_Get_address(chunk_list[i].buf, &chunk_buf))) HMPI_GOTO_ERROR(FAIL, "MPI_Get_address failed", mpi_code) |