diff options
| -rw-r--r-- | testpar/Makefile.in | 2 | ||||
| -rw-r--r-- | testpar/testphdf5.c | 5 | ||||
| -rw-r--r-- | testpar/testphdf5.h | 16 |
3 files changed, 22 insertions, 1 deletions
diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 239c969..4e48fa0 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -43,7 +43,7 @@ MOSTLYCLEAN=MPItest.h5 Para*.h5 *.clog DISTCLEAN=go Makefile testph5.sh ## Test source files -TEST_PHDF5_SRC=testphdf5.c t_dset.c t_file.c t_mdset.c t_ph5basic.c t_coll_chunk.c +TEST_PHDF5_SRC=testphdf5.c t_dset.c t_file.c t_mdset.c t_ph5basic.c t_coll_chunk.c t_span_tree.c TEST_PHDF5_OBJ=$(TEST_PHDF5_SRC:.c=.lo) TEST_SRC=t_mpi.c t_fphdf5.c $(TEST_PHDF5_SRC) TEST_OBJ=$(TEST_SRC:.c=.lo) diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 0f6624e..01e7ef9 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -352,6 +352,7 @@ int main(int argc, char **argv) TestInit(argv[0], usage, parse_options); /* Tests are generally arranged from least to most complexity... */ + AddTest("mpiodup", test_fapl_mpio_dup, NULL, "fapl_mpio duplicate", NULL); AddTest("posixdup", test_fapl_mpiposix_dup, NULL, @@ -434,6 +435,10 @@ int main(int argc, char **argv) "collective to independent chunk io",PARATESTFILE); } +#ifdef KYANG + AddTest("span_tree",t_span_tree,NULL, + "derived datatype test",PARATESTFILE); +#endif AddTest("null", null_dataset, NULL, "null dataset test", PARATESTFILE); diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index b66d196..788a02a 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -119,6 +119,21 @@ #define BYROW_DISCONT 2 #define DSET_COLLECTIVE_CHUNK_NAME "coll_chunk_name" + +/*Constants for MPI derived data type generated from span tree */ + +#define MSPACE1_RANK 1 /* Rank of the first dataset in memory */ +#define MSPACE1_DIM 50 /* Dataset size in memory */ +#define MSPACE2_RANK 1 /* Rank of the second dataset in memory */ +#define MSPACE2_DIM 4 /* Dataset size in memory */ +#define FSPACE_RANK 2 /* Dataset rank as it is stored in the file */ +#define FSPACE_DIM1 8 /* Dimension sizes of the dataset as it is stored in the file */ +#define FSPACE_DIM2 12 /* We will read dataset back from the file to the dataset in memory with these dataspace parameters. */ +#define MSPACE_RANK 2 +#define MSPACE_DIM1 8 +#define MSPACE_DIM2 9 +#define NPOINTS 4 /* Number of points that will be selected and overwritten */ + /* type definitions */ typedef struct H5Ptest_param_t /* holds extra test parameters */ { @@ -163,6 +178,7 @@ void coll_chunk1(void); void coll_chunk2(void); void coll_chunk3(void); void coll_chunk4(void); +void t_span_tree(void); void io_mode_confusion(void); #ifdef H5_HAVE_FILTER_DEFLATE void compress_readAll(void); |