summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuQun Yang <ymuqun@hdfgroup.org>2005-04-05 19:43:14 (GMT)
committerMuQun Yang <ymuqun@hdfgroup.org>2005-04-05 19:43:14 (GMT)
commit133d48e6d0548f0bc515e4fdaa420c76fc3bb52e (patch)
treee3c636e9b80311ca214f52c50f98adb3f4b1dfb5
parent1d6c4017ec2e8c7b8284cef20aac85ec9f9f8c2f (diff)
downloadhdf5-133d48e6d0548f0bc515e4fdaa420c76fc3bb52e.zip
hdf5-133d48e6d0548f0bc515e4fdaa420c76fc3bb52e.tar.gz
hdf5-133d48e6d0548f0bc515e4fdaa420c76fc3bb52e.tar.bz2
[svn-r10546] Purpose:
Support collective IO for irregular selection. Description: Solution: Platforms tested: Linux with MPICH AIX with mpcc_r Linux with ChaMPIO Altix with intel Misc. update:
-rw-r--r--testpar/testphdf5.c2
-rw-r--r--testpar/testphdf5.h20
2 files changed, 10 insertions, 12 deletions
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index d13bfe7..81bfbeb 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -435,7 +435,6 @@ int main(int argc, char **argv)
"collective to independent chunk io",PARATESTFILE);
}
-#ifdef KYANG
AddTest("ccontw",coll_irregular_cont_write,NULL,
"collective irregular contiguous write",PARATESTFILE);
AddTest("ccontr",coll_irregular_cont_read,NULL,
@@ -451,7 +450,6 @@ int main(int argc, char **argv)
AddTest("ccchunkr",coll_irregular_complex_chunk_read,NULL,
"collective irregular complex chunk read",PARATESTFILE);
-#endif
AddTest("null", null_dataset, NULL,
"null dataset test", PARATESTFILE);
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index 3b251f8..35eb5a6 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -61,15 +61,15 @@
/*Constants for MPI derived data type generated from span tree */
#define MSPACE1_RANK 1 /* Rank of the first dataset in memory */
-#define MSPACE1_DIM 19000 /* Dataset size in memory */
+#define MSPACE1_DIM 1000 /*27000 */ /* Dataset size in memory */
#define FSPACE_RANK 2 /* Dataset rank as it is stored in the file */
#define FSPACE_DIM1 9 /* Dimension sizes of the dataset as it is stored in the file */
-#define FSPACE_DIM2 2400 /* We will read dataset back from the file to the dataset in memory with these dataspace parameters. */
+#define FSPACE_DIM2 100 /*3600*/ /* We will read dataset back from the file to the dataset in memory with these dataspace parameters. */
#define MSPACE_RANK 2
#define MSPACE_DIM1 9
-#define MSPACE_DIM2 2400
+#define MSPACE_DIM2 100 /*3600*/
#define FHCOUNT0 1 /* Count of the first dimension of the first hyperslab selection*/
-#define FHCOUNT1 512 /* Count of the second dimension of the first hyperslab selection*/
+#define FHCOUNT1 6 /*768*/ /* Count of the second dimension of the first hyperslab selection*/
#define FHSTRIDE0 4 /* Stride of the first dimension of the first hyperslab selection*/
#define FHSTRIDE1 3 /* Stride of the second dimension of the first hyperslab selection*/
#define FHBLOCK0 3 /* Block of the first dimension of the first hyperslab selection*/
@@ -82,11 +82,11 @@
#define SHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
#define SHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
#define SHBLOCK0 3 /* Block of the first dimension of the first hyperslab selection*/
-#define SHBLOCK1 512 /* Block of the second dimension of the first hyperslab selection*/
+#define SHBLOCK1 6 /*768*/ /* Block of the second dimension of the first hyperslab selection*/
#define SHSTART0 4 /* start of the first dimension of the first hyperslab selection*/
#define SHSTART1 0 /* start of the second dimension of the first hyperslab selection*/
-#define MHCOUNT0 4608 /* Count of the first dimension of the first hyperslab selection*/
+#define MHCOUNT0 54 /*6912*/ /* Count of the first dimension of the first hyperslab selection*/
#define MHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
#define MHBLOCK0 1 /* Block of the first dimension of the first hyperslab selection*/
#define MHSTART0 1 /* start of the first dimension of the first hyperslab selection*/
@@ -94,7 +94,7 @@
#define RFFHCOUNT0 3 /* Count of the first dimension of the first hyperslab selection*/
-#define RFFHCOUNT1 512 /* Count of the second dimension of the first hyperslab selection*/
+#define RFFHCOUNT1 6 /*768*/ /* Count of the second dimension of the first hyperslab selection*/
#define RFFHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
#define RFFHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
#define RFFHBLOCK0 1 /* Block of the first dimension of the first hyperslab selection*/
@@ -104,7 +104,7 @@
#define RFSHCOUNT0 3 /* Count of the first dimension of the first hyperslab selection*/
-#define RFSHCOUNT1 1024 /* Count of the second dimension of the first hyperslab selection*/
+#define RFSHCOUNT1 12 /*1536 */ /* Count of the second dimension of the first hyperslab selection*/
#define RFSHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
#define RFSHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
#define RFSHBLOCK0 1 /* Block of the first dimension of the first hyperslab selection*/
@@ -114,7 +114,7 @@
#define RMFHCOUNT0 3 /* Count of the first dimension of the first hyperslab selection*/
-#define RMFHCOUNT1 512 /* Count of the second dimension of the first hyperslab selection*/
+#define RMFHCOUNT1 6 /*768*/ /* Count of the second dimension of the first hyperslab selection*/
#define RMFHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
#define RMFHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
#define RMFHBLOCK0 1 /* Block of the first dimension of the first hyperslab selection*/
@@ -123,7 +123,7 @@
#define RMFHSTART1 0 /* start of the second dimension of the first hyperslab selection*/
#define RMSHCOUNT0 3 /* Count of the first dimension of the first hyperslab selection*/
-#define RMSHCOUNT1 1024 /* Count of the second dimension of the first hyperslab selection*/
+#define RMSHCOUNT1 12 /*1536*/ /* Count of the second dimension of the first hyperslab selection*/
#define RMSHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
#define RMSHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
#define RMSHBLOCK0 1 /* Block of the first dimension of the first hyperslab selection*/