diff options
author | jhendersonHDF <jhenderson@hdfgroup.org> | 2021-02-03 17:08:19 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-03 17:08:19 (GMT) |
commit | c55ac8ab7126f101bf704a54824c0a55f410e105 (patch) | |
tree | fbd3be1a87e5d6efb45408a34de542e7666f0cdb | |
parent | eac05994c71a98a302674ab425a43758ecac9fd8 (diff) | |
download | hdf5-c55ac8ab7126f101bf704a54824c0a55f410e105.zip hdf5-c55ac8ab7126f101bf704a54824c0a55f410e105.tar.gz hdf5-c55ac8ab7126f101bf704a54824c0a55f410e105.tar.bz2 |
Ensure processes always synchronize in t_shapesame test setup (#306)
-rw-r--r-- | testpar/t_shapesame.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index 1c5e875..8ef252f 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -441,11 +441,8 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker VRFY((ret >= 0), "H5Dwrite() small_dataset initial write succeeded"); /* sync with the other processes before checking data */ - if (!use_collective_io) { - - mrc = MPI_Barrier(MPI_COMM_WORLD); - VRFY((mrc == MPI_SUCCESS), "Sync after small dataset writes"); - } + mrc = MPI_Barrier(MPI_COMM_WORLD); + VRFY((mrc == MPI_SUCCESS), "Sync after small dataset writes"); /* read the small data set back to verify that it contains the * expected data. Note that each process reads in the entire @@ -515,11 +512,8 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker VRFY((ret >= 0), "H5Dwrite() large_dataset initial write succeeded"); /* sync with the other processes before checking data */ - if (!use_collective_io) { - - mrc = MPI_Barrier(MPI_COMM_WORLD); - VRFY((mrc == MPI_SUCCESS), "Sync after large dataset writes"); - } + mrc = MPI_Barrier(MPI_COMM_WORLD); + VRFY((mrc == MPI_SUCCESS), "Sync after large dataset writes"); /* read the large data set back to verify that it contains the * expected data. Note that each process reads in the entire @@ -547,12 +541,8 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker VRFY((mis_match == FALSE), "large ds init data good."); /* sync with the other processes before changing data */ - - if (!use_collective_io) { - - mrc = MPI_Barrier(MPI_COMM_WORLD); - VRFY((mrc == MPI_SUCCESS), "Sync initial values check"); - } + mrc = MPI_Barrier(MPI_COMM_WORLD); + VRFY((mrc == MPI_SUCCESS), "Sync initial values check"); return; |