diff options
| author | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-12-16 22:00:08 (GMT) |
|---|---|---|
| committer | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-12-16 22:00:08 (GMT) |
| commit | 663d6e0118d6077b8206b69521a3909a5444c8bf (patch) | |
| tree | b821524bfcdba7edb4d2aae675a32db78cee5cd3 /testpar | |
| parent | 4eeeda3b8669dee21867f6d1246b814b28570e3a (diff) | |
| download | hdf5-663d6e0118d6077b8206b69521a3909a5444c8bf.zip hdf5-663d6e0118d6077b8206b69521a3909a5444c8bf.tar.gz hdf5-663d6e0118d6077b8206b69521a3909a5444c8bf.tar.bz2 | |
Merge t_2Gio test into hdf5_1_12. This will eventually be refactored out after merging the test functionality into the testphdf5 test.
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | testpar/Makefile.am | 2 | ||||
| -rw-r--r-- | testpar/t_2Gio.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index 51c3420..9795c65 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -72,6 +72,7 @@ set (H5P_TESTS t_init_term t_shapesame t_filters_parallel + t_2Gio ) foreach (h5_testp ${H5P_TESTS}) diff --git a/testpar/Makefile.am b/testpar/Makefile.am index 0e7898e..0cdba24 100644 --- a/testpar/Makefile.am +++ b/testpar/Makefile.am @@ -30,7 +30,7 @@ check_SCRIPTS = $(TEST_SCRIPT_PARA) # Test programs. These are our main targets. # -TEST_PROG_PARA=t_mpi t_bigio testphdf5 t_cache t_cache_image t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel +TEST_PROG_PARA=t_mpi t_bigio testphdf5 t_cache t_cache_image t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel t_2Gio # t_pflush1 and t_pflush2 are used by testpflush.sh check_PROGRAMS = $(TEST_PROG_PARA) t_pflush1 t_pflush2 diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c index 43be819..52a5f80 100644 --- a/testpar/t_2Gio.c +++ b/testpar/t_2Gio.c @@ -540,7 +540,7 @@ int MpioTest2G( MPI_Comm comm, int mpi_rank ) int *data; /* pointer to data buffer to write */ hsize_t shape[3] = {1024, 1024, 1152}; - size_t slice_per_process, data_size, data_size_bytes; + size_t data_size, data_size_bytes, slice_per_process = shape[0]/2; size_t tot_size_bytes = sizeof(int); hsize_t chunk[3] = {4, shape[1], shape[2]}; hsize_t h5_counts[3] = { slice_per_process, shape[1], shape[2] }; @@ -613,7 +613,6 @@ int MpioTest2G( MPI_Comm comm, int mpi_rank ) status = H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE); VRFY((status >= 0), ""); - slice_per_process = (shape[0] + mpi_size - 1) / mpi_size; data_size = slice_per_process * shape[1] * shape[2]; data_size_bytes = sizeof(int) * data_size; data = HDmalloc(data_size_bytes); @@ -653,6 +652,7 @@ int MpioTest2G( MPI_Comm comm, int mpi_rank ) free(data); HDprintf("Proc %d - MpioTest2G test succeeded\n", mpi_rank, data_size_bytes); + HDfflush(stdout); if (mpi_rank == 0) HDremove(FILENAME[1]); |