diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-11-04 17:57:37 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-11-04 17:57:37 (GMT) |
commit | fd722a3ef749cc3f72ae7d17a6ff74b6f4fefc76 (patch) | |
tree | 7c4b31f0d287177c48d637450a149909de4e6dc9 | |
parent | d11e246045c699b1cff8a83e8dc14547e0c258d8 (diff) | |
download | hdf5-fd722a3ef749cc3f72ae7d17a6ff74b6f4fefc76.zip hdf5-fd722a3ef749cc3f72ae7d17a6ff74b6f4fefc76.tar.gz hdf5-fd722a3ef749cc3f72ae7d17a6ff74b6f4fefc76.tar.bz2 |
[svn-r25780] merge 25779 from trunk.
fix bug in parallel tests where a compact dset is being created
proportional to the process count without regard to the 64KB limit for
compact datasets.
-rw-r--r-- | testpar/t_dset.c | 15 |
1 files changed, 11 insertions, 4 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); |