diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-08-25 20:11:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-25 20:11:06 (GMT) |
| commit | 6b1adb2ec97a529854613e091270f5b3cb37bc22 (patch) | |
| tree | 2779f78bcfad97dcaeff4ef8560ee0c27ef850a1 /testpar/t_shapesame.c | |
| parent | 9424fa2d5e9cab7e187f9e1efe0bc7ba50f691ca (diff) | |
| download | hdf5-6b1adb2ec97a529854613e091270f5b3cb37bc22.zip hdf5-6b1adb2ec97a529854613e091270f5b3cb37bc22.tar.gz hdf5-6b1adb2ec97a529854613e091270f5b3cb37bc22.tar.bz2 | |
Merge test changes from develop (#959)
Diffstat (limited to 'testpar/t_shapesame.c')
| -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 027c8c9..2dd867a 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; |