diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-12-04 18:17:51 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-12-04 18:17:51 (GMT) |
| commit | 992e79b58cf83a75f7567d73d7e7d534750c3d68 (patch) | |
| tree | 9ea798c153caac4860e42e0fbd4636b2389e8a45 /testpar | |
| parent | 33a18df797719e423543ed8a177d886bc85b275d (diff) | |
| parent | ccbd46e914a67546a6cc4961b55c85ff5378f295 (diff) | |
| download | hdf5-992e79b58cf83a75f7567d73d7e7d534750c3d68.zip hdf5-992e79b58cf83a75f7567d73d7e7d534750c3d68.tar.gz hdf5-992e79b58cf83a75f7567d73d7e7d534750c3d68.tar.bz2 | |
[svn-r25862] merge from trunk.
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_dset.c | 15 | ||||
| -rw-r--r-- | testpar/t_shapesame.c | 10 |
2 files changed, 19 insertions, 6 deletions
diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 281b1c0..e27cddc 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -3540,9 +3540,16 @@ test_no_collective_cause_mode(int selection_mode) is_chunked = 0; } else { - /* Create the basic Space */ - dims[0] = dim0; - dims[1] = dim1; + /* Create the basic Space */ + /* if this is a compact dataset, create a small dataspace that does not exceed 64K */ + if (selection_mode & TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT) { + dims[0] = ROW_FACTOR * 6; + dims[1] = COL_FACTOR * 6; + } + else { + dims[0] = dim0; + dims[1] = dim1; + } sid = H5Screate_simple (RANK, dims, NULL); VRFY((sid >= 0), "H5Screate_simple succeeded"); } @@ -3645,7 +3652,7 @@ test_no_collective_cause_mode(int selection_mode) } /* Get the number of elements in the selection */ - length = dim0 * dim1; + length = dims[0] * dims[1]; /* Allocate and initialize the buffer */ buffer = (int *)HDmalloc(sizeof(int) * length); diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index 1a74295..f96c669 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -2237,8 +2237,9 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type) int express_test; int local_express_test; int mpi_rank = -1; + int mpi_size; int test_num = 0; - int edge_size = 10; + int edge_size; int chunk_edge_size = 0; int small_rank; int large_rank; @@ -2258,8 +2259,11 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type) HDcompile_assert(sizeof(uint32_t) == sizeof(unsigned)); + MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); + edge_size = (mpi_size > 6 ? mpi_size : 6); + local_express_test = GetTestExpress(); mpi_result = MPI_Allreduce((void *)&local_express_test, @@ -4519,7 +4523,7 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type) int mpi_size = -1; int mpi_rank = -1; int test_num = 0; - int edge_size = 10; + int edge_size; int checker_edge_size = 3; int chunk_edge_size = 0; int small_rank = 3; @@ -4541,6 +4545,8 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type) MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); + edge_size = (mpi_size > 6 ? mpi_size : 6); + local_express_test = GetTestExpress(); HDcompile_assert(sizeof(uint32_t) == sizeof(unsigned)); |