summaryrefslogtreecommitdiffstats
path: root/testpar/testphdf5.c
diff options
context:
space:
mode:
authorChristian Chilan <chilan@hdfgroup.org>2009-04-02 21:28:48 (GMT)
committerChristian Chilan <chilan@hdfgroup.org>2009-04-02 21:28:48 (GMT)
commit149fd7232244896754912b6976a0c864275dd58d (patch)
tree6ebc1f050b5a27197fb2fbcfd10adb8df50640db /testpar/testphdf5.c
parentfa5c42e27f5406e7be21ff605e68ed96bf9e96c9 (diff)
downloadhdf5-149fd7232244896754912b6976a0c864275dd58d.zip
hdf5-149fd7232244896754912b6976a0c864275dd58d.tar.gz
hdf5-149fd7232244896754912b6976a0c864275dd58d.tar.bz2
[svn-r16659] Modified dset and t_chunk_alloc tests to use dataset dimensions that are multiples of the number of processors.
Tested on jam and abe.
Diffstat (limited to 'testpar/testphdf5.c')
-rw-r--r--testpar/testphdf5.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 114ef49..977d0a3 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -138,6 +138,14 @@ parse_options(int argc, char **argv)
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
/* setup default chunk-size. Make sure sizes are > 0 */
+ if (mpi_size < PROCS_THRESHOLD) {
+ dim0 = ROW_FACTOR*mpi_size;
+ dim1 = COL_FACTOR*mpi_size;
+ } else {
+ dim0 = MIN_ROW_FACTOR*(mpi_size-PROCS_THRESHOLD)+ROW_FACTOR*PROCS_THRESHOLD;
+ dim1 = MIN_COL_FACTOR*(mpi_size-PROCS_THRESHOLD)+COL_FACTOR*PROCS_THRESHOLD;
+ }
+
chunkdim0 = (dim0+9)/10;
chunkdim1 = (dim1+9)/10;
@@ -367,7 +375,6 @@ int main(int argc, char **argv)
"extendible dataset independent write #2", PARATESTFILE);
AddTest("selnone", none_selection_chunk, NULL,
"chunked dataset with none-selection", PARATESTFILE);
-
AddTest("calloc", test_chunk_alloc, NULL,
"parallel extend Chunked allocation on serial file", PARATESTFILE);
AddTest("fltread", test_filter_read, NULL,