philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge t_2Gio test into hdf5_1_12. This will eventually be refactored out after merging the test functionality into the testphdf5 test.

Browse Source
This commit is contained in:
Richard Warren
2019-12-16 17:00:08 -05:00
parent 4eeeda3b86
commit 663d6e0118
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@@ -1320,6 +1320,7 @@
./testpar/COPYING
./testpar/Makefile.am
./testpar/t_2Gio.c
./testpar/t_bigio.c
./testpar/t_cache.c
./testpar/t_cache_image.c

1
testpar/CMakeLists.txt
View File

@@ -72,6 +72,7 @@ set (H5P_TESTS
t_init_term
t_shapesame
t_filters_parallel
t_2Gio
)
foreach (h5_testp ${H5P_TESTS})

2
testpar/Makefile.am
View File

@@ -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

4
testpar/t_2Gio.c
View File

@@ -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]);