summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2014-11-05 15:47:44 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2014-11-05 15:47:44 (GMT)
commit3ba28fb7ee35d27b6c86f3b5e5981e666fb12956 (patch)
tree2f4b08f1cd5c31c7eba7f4c0ffd5c18d5fd9a283
parenta096202edd89d5ce00ecc9d19232bd8a457ae1c1 (diff)
downloadhdf5-3ba28fb7ee35d27b6c86f3b5e5981e666fb12956.zip
hdf5-3ba28fb7ee35d27b6c86f3b5e5981e666fb12956.tar.gz
hdf5-3ba28fb7ee35d27b6c86f3b5e5981e666fb12956.tar.bz2
[svn-r25790] fix bug in shapesame test where test fails with more than 10
procs. This is a fix in the test itself and does not have to do with the library code. tested cloud machine with parallel.
-rw-r--r--testpar/t_shapesame.c10
1 files changed, 8 insertions, 2 deletions
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));