diff options
author | rjzamora <rzamora@anl.gov> | 2018-12-17 22:41:37 (GMT) |
---|---|---|
committer | rjzamora <rzamora@anl.gov> | 2018-12-17 22:41:37 (GMT) |
commit | 324b829c42b1058c8818d76209b1d4ac79d27bac (patch) | |
tree | 744b7eb1c1475f8a15fc4963cdae7230f09eab02 /src/H5Smpio.c | |
parent | b5120771b1076ff32421b5d3cf71f76a25b2f8c7 (diff) | |
download | hdf5-324b829c42b1058c8818d76209b1d4ac79d27bac.zip hdf5-324b829c42b1058c8818d76209b1d4ac79d27bac.tar.gz hdf5-324b829c42b1058c8818d76209b1d4ac79d27bac.tar.bz2 |
removing unintended changes form develop
Diffstat (limited to 'src/H5Smpio.c')
-rw-r--r-- | src/H5Smpio.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 78d1b4f..2689c5c 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -879,7 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) } - MPI_Type_extent (inner_type, &inner_extent); + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ + { + MPI_Aint unused_lb_arg; + MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); + } stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; /* If the element count is larger than what a 32 bit integer can hold, @@ -1535,7 +1542,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, } } - MPI_Type_extent (old_type, &old_extent); + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ + { + MPI_Aint unused_lb_arg; + MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); + } /* Set up the arguments for MPI_Type_struct constructor */ type[0] = outer_type; |