Start adding data verification

1 files changed, 50 insertions, 28 deletions

diff --git a/testpar/t_filters_parallel.h b/testpar/t_filters_parallel.h
index d627c27..d098b66 100644
--- a/testpar/t_filters_parallel.h
+++ b/testpar/t_filters_parallel.h
@@ -46,9 +46,14 @@ size_t             cd_nelmts = FILTER_NUM_CDVALUES;
 #define C_DATATYPE           long
 #define C_DATATYPE_STR(type) STRINGIFY(type)
 #define HDF5_DATATYPE_NAME   H5T_NATIVE_LONG
-#define GEN_DATA(i)          RANK_DATA(i) /* Given an index value i, generates test data based upon selected mode */
-#define RANK_DATA(i)         (mpi_rank)   /* Generates test data to visibly show which rank wrote to which parts of the dataset */
-#define INCREMENTAL_DATA(i)  i            /* Generates incremental test data */
+
+#define GEN_DATA(i)          INCREMENTAL_DATA(i)
+#define INCREMENTAL_DATA(i)  (mpi_rank + i)      /* Generates incremental test data */
+
+/* XXX: For experimental purposes only, will causes tests to fail data verification phase */
+/* #define GEN_DATA(i)          RANK_DATA(i) */  /* Given an index value i, generates test data based upon selected mode */
+#define RANK_DATA(i)         (mpi_rank)          /* Generates test data to visibly show which rank wrote to which parts of the dataset */
+
 #ifdef DYNAMIC_FILTER
 #define SET_FILTER(dcpl)     H5Pset_filter(dcpl, filter_id, flags, FILTER_NUM_CDVALUES, cd_values) /* Test other filter in parallel */
 #else
@@ -58,50 +63,49 @@ size_t             cd_nelmts = FILTER_NUM_CDVALUES;
 /* Defines for the one-chunk filtered dataset test */
 #define ONE_CHUNK_FILTERED_DATASET_NAME       "one_chunk_filtered_dataset"
 #define ONE_CHUNK_FILTERED_DATASET_DIMS       2
-#define ONE_CHUNK_FILTERED_DATASET_NROWS      16 /* Must be an even multiple of the number of ranks to avoid issues */
-#define ONE_CHUNK_FILTERED_DATASET_NCOLS      8  /* Must be an even multiple of the number of ranks to avoid issues */
+#define ONE_CHUNK_FILTERED_DATASET_NROWS      (NUM_MPI_RANKS * 4) /* Must be an even multiple of the number of ranks to avoid issues */
+#define ONE_CHUNK_FILTERED_DATASET_NCOLS      (NUM_MPI_RANKS * 2) /* Must be an even multiple of the number of ranks to avoid issues */
 #define ONE_CHUNK_FILTERED_DATASET_CH_NROWS   ONE_CHUNK_FILTERED_DATASET_NROWS
 #define ONE_CHUNK_FILTERED_DATASET_CH_NCOLS   ONE_CHUNK_FILTERED_DATASET_NCOLS
 
 /* Defines for the unshared filtered chunks write test */
 #define UNSHARED_FILTERED_CHUNKS_DATASET_NAME "unshared_filtered_chunks"
 #define UNSHARED_FILTERED_CHUNKS_DATASET_DIMS 2
-#define UNSHARED_FILTERED_CHUNKS_NROWS        16
-#define UNSHARED_FILTERED_CHUNKS_NCOLS        8
+#define UNSHARED_FILTERED_CHUNKS_NROWS        (NUM_MPI_RANKS * 4)
+#define UNSHARED_FILTERED_CHUNKS_NCOLS        (NUM_MPI_RANKS * 2)
 #define UNSHARED_FILTERED_CHUNKS_CH_NROWS     (UNSHARED_FILTERED_CHUNKS_NROWS / NUM_MPI_RANKS)
 #define UNSHARED_FILTERED_CHUNKS_CH_NCOLS     (UNSHARED_FILTERED_CHUNKS_NCOLS / NUM_MPI_RANKS)
 
 /* Defines for the shared filtered chunks write test */
 #define SHARED_FILTERED_CHUNKS_DATASET_NAME "shared_filtered_chunks"
 #define SHARED_FILTERED_CHUNKS_DATASET_DIMS 2
-#define SHARED_FILTERED_CHUNKS_NROWS        16
-#define SHARED_FILTERED_CHUNKS_NCOLS        8
+#define SHARED_FILTERED_CHUNKS_NROWS        (NUM_MPI_RANKS * 4)
+#define SHARED_FILTERED_CHUNKS_NCOLS        (NUM_MPI_RANKS * 2)
 #define SHARED_FILTERED_CHUNKS_CH_NROWS     (SHARED_FILTERED_CHUNKS_NROWS / NUM_MPI_RANKS)
 #define SHARED_FILTERED_CHUNKS_CH_NCOLS     (SHARED_FILTERED_CHUNKS_NCOLS / NUM_MPI_RANKS)
 
 /* Defines for the filtered chunks write test where a process has no selection */
 #define SINGLE_NO_SELECTION_FILTERED_CHUNKS_DATASET_NAME   "single_no_selection_filtered_chunks"
 #define SINGLE_NO_SELECTION_FILTERED_CHUNKS_DATASET_DIMS   2
-#define SINGLE_NO_SELECTION_FILTERED_CHUNKS_NROWS          16
-#define SINGLE_NO_SELECTION_FILTERED_CHUNKS_NCOLS          8
+#define SINGLE_NO_SELECTION_FILTERED_CHUNKS_NROWS          (NUM_MPI_RANKS * 4)
+#define SINGLE_NO_SELECTION_FILTERED_CHUNKS_NCOLS          (NUM_MPI_RANKS * 2)
 #define SINGLE_NO_SELECTION_FILTERED_CHUNKS_CH_NROWS       (SINGLE_NO_SELECTION_FILTERED_CHUNKS_NROWS / NUM_MPI_RANKS)
 #define SINGLE_NO_SELECTION_FILTERED_CHUNKS_CH_NCOLS       (SINGLE_NO_SELECTION_FILTERED_CHUNKS_NCOLS / NUM_MPI_RANKS)
-#define SINGLE_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC 3
+#define SINGLE_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC NUM_MPI_RANKS - 1
 
 /* Defines for the filtered chunks write test where no process has a selection */
 #define ALL_NO_SELECTION_FILTERED_CHUNKS_DATASET_NAME   "all_no_selection_filtered_chunks"
 #define ALL_NO_SELECTION_FILTERED_CHUNKS_DATASET_DIMS   2
-#define ALL_NO_SELECTION_FILTERED_CHUNKS_NROWS          16
-#define ALL_NO_SELECTION_FILTERED_CHUNKS_NCOLS          8
+#define ALL_NO_SELECTION_FILTERED_CHUNKS_NROWS          (NUM_MPI_RANKS * 4)
+#define ALL_NO_SELECTION_FILTERED_CHUNKS_NCOLS          (NUM_MPI_RANKS * 2)
 #define ALL_NO_SELECTION_FILTERED_CHUNKS_CH_NROWS       (ALL_NO_SELECTION_FILTERED_CHUNKS_NROWS / NUM_MPI_RANKS)
 #define ALL_NO_SELECTION_FILTERED_CHUNKS_CH_NCOLS       (ALL_NO_SELECTION_FILTERED_CHUNKS_NCOLS / NUM_MPI_RANKS)
-#define ALL_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC 3
 
 /* Defines for the filtered chunks write test with a point selection */
 #define POINT_SELECTION_FILTERED_CHUNKS_DATASET_NAME "point_selection_filtered_chunks"
 #define POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS 2
-#define POINT_SELECTION_FILTERED_CHUNKS_NROWS        16
-#define POINT_SELECTION_FILTERED_CHUNKS_NCOLS        8
+#define POINT_SELECTION_FILTERED_CHUNKS_NROWS        (NUM_MPI_RANKS * 4)
+#define POINT_SELECTION_FILTERED_CHUNKS_NCOLS        (NUM_MPI_RANKS * 2)
 #define POINT_SELECTION_FILTERED_CHUNKS_CH_NROWS     (POINT_SELECTION_FILTERED_CHUNKS_NROWS / NUM_MPI_RANKS)
 #define POINT_SELECTION_FILTERED_CHUNKS_CH_NCOLS     (POINT_SELECTION_FILTERED_CHUNKS_NCOLS / NUM_MPI_RANKS)
 #define POINT_SELECTION_FILTERED_CHUNKS_NUM_CHUNKS   ((POINT_SELECTION_FILTERED_CHUNKS_NROWS / POINT_SELECTION_FILTERED_CHUNKS_CH_NROWS) * (POINT_SELECTION_FILTERED_CHUNKS_NCOLS / POINT_SELECTION_FILTERED_CHUNKS_CH_NCOLS))
@@ -109,8 +113,8 @@ size_t             cd_nelmts = FILTER_NUM_CDVALUES;
 /* Defines for the filtered dataset interleaved write test */
 #define INTERLEAVED_WRITE_FILTERED_DATASET_NAME        "interleaved_write_filtered_dataset"
 #define INTERLEAVED_WRITE_FILTERED_DATASET_DIMS        2
-#define INTERLEAVED_WRITE_FILTERED_DATASET_NROWS       16 /* Must be an even multiple of the number of ranks to avoid issues */
-#define INTERLEAVED_WRITE_FILTERED_DATASET_NCOLS       8  /* Must be an even multiple of the number of ranks to avoid issues */
+#define INTERLEAVED_WRITE_FILTERED_DATASET_NROWS       (NUM_MPI_RANKS * 4) /* Must be an even multiple of the number of ranks to avoid issues */
+#define INTERLEAVED_WRITE_FILTERED_DATASET_NCOLS       (NUM_MPI_RANKS * 2) /* Must be an even multiple of the number of ranks to avoid issues */
 #define INTERLEAVED_WRITE_FILTERED_DATASET_CH_NROWS    (INTERLEAVED_WRITE_FILTERED_DATASET_NROWS / NUM_MPI_RANKS)
 #define INTERLEAVED_WRITE_FILTERED_DATASET_CH_NCOLS    (INTERLEAVED_WRITE_FILTERED_DATASET_NCOLS / NUM_MPI_RANKS)
 #define INTERLEAVED_WRITE_FILTERED_DATASET_SEL_NPOINTS (INTERLEAVED_WRITE_FILTERED_DATASET_CH_NROWS * INTERLEAVED_WRITE_FILTERED_DATASET_CH_NCOLS / INTERLEAVED_WRITE_FILTERED_DATASET_NUM_RANKS)
@@ -118,27 +122,27 @@ size_t             cd_nelmts = FILTER_NUM_CDVALUES;
 /* Defines for the 3D unshared filtered dataset separate page write test */
 #define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_NAME "3d_unshared_filtered_chunks_separate_pages"
 #define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_DIMS 3
-#define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_NROWS        16
-#define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_NCOLS        8
-#define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DEPTH        NUM_MPI_RANKS
+#define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_NROWS        (NUM_MPI_RANKS * 4)
+#define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_NCOLS        (NUM_MPI_RANKS * 2)
+#define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DEPTH        (NUM_MPI_RANKS)
 #define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_CH_NROWS     (UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_NROWS / NUM_MPI_RANKS)
 #define UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_CH_NCOLS     (UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_NCOLS / NUM_MPI_RANKS)
 
 /* Defines for the 3D unshared filtered dataset same page write test */
 #define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_DATASET_NAME "3d_unshared_filtered_chunks_same_pages"
 #define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_DATASET_DIMS 3
-#define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_NROWS        16
-#define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_NCOLS        8
-#define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_DEPTH        NUM_MPI_RANKS
+#define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_NROWS        (NUM_MPI_RANKS * 4)
+#define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_NCOLS        (NUM_MPI_RANKS * 2)
+#define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_DEPTH        (NUM_MPI_RANKS)
 #define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_CH_NROWS     (UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_NROWS / NUM_MPI_RANKS)
 #define UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_CH_NCOLS     (UNSHARED_FILTERED_CHUNKS_3D_SAME_PAGE_NCOLS / NUM_MPI_RANKS)
 
 /* Defines for the 3d shared filtered dataset write test */
 #define SHARED_FILTERED_CHUNKS_3D_DATASET_NAME "3d_shared_filtered_chunks"
 #define SHARED_FILTERED_CHUNKS_3D_DATASET_DIMS 3
-#define SHARED_FILTERED_CHUNKS_3D_NROWS        16
-#define SHARED_FILTERED_CHUNKS_3D_NCOLS        8
-#define SHARED_FILTERED_CHUNKS_3D_DEPTH        NUM_MPI_RANKS
+#define SHARED_FILTERED_CHUNKS_3D_NROWS        (NUM_MPI_RANKS * 4)
+#define SHARED_FILTERED_CHUNKS_3D_NCOLS        (NUM_MPI_RANKS * 2)
+#define SHARED_FILTERED_CHUNKS_3D_DEPTH        (NUM_MPI_RANKS)
 #define SHARED_FILTERED_CHUNKS_3D_CH_NROWS     (SHARED_FILTERED_CHUNKS_3D_NROWS / NUM_MPI_RANKS)
 #define SHARED_FILTERED_CHUNKS_3D_CH_NCOLS     (SHARED_FILTERED_CHUNKS_3D_NCOLS / NUM_MPI_RANKS)
 
@@ -186,4 +190,22 @@ typedef struct {
 #define COMPOUND_FILTERED_CHUNKS_TYPE_CONVERSION_SHARED_CH_NCOLS          1
 #define COMPOUND_FILTERED_CHUNKS_TYPE_CONVERSION_SHARED_ENTRIES_PER_PROC  COMPOUND_FILTERED_CHUNKS_TYPE_CONVERSION_SHARED_NCOLS
 
+/* Defines for the write file serially/read in parallel test */
+#define WRITE_SERIAL_READ_PARALLEL_DATASET_NAME "write_serial_read_parallel"
+#define WRITE_SERIAL_READ_PARALLEL_DATASET_DIMS 3
+#define WRITE_SERIAL_READ_PARALLEL_NROWS        (NUM_MPI_RANKS * 4)
+#define WRITE_SERIAL_READ_PARALLEL_NCOLS        (NUM_MPI_RANKS * 2)
+#define WRITE_SERIAL_READ_PARALLEL_DEPTH        (NUM_MPI_RANKS)
+#define WRITE_SERIAL_READ_PARALLEL_CH_NROWS     (WRITE_SERIAL_READ_PARALLEL_NROWS / NUM_MPI_RANKS)
+#define WRITE_SERIAL_READ_PARALLEL_CH_NCOLS     (WRITE_SERIAL_READ_PARALLEL_NCOLS / NUM_MPI_RANKS)
+
+/* Defines for the write file in parallel/read serially test */
+#define WRITE_PARALLEL_READ_SERIAL_DATASET_NAME "write_parallel_read_serial"
+#define WRITE_PARALLEL_READ_SERIAL_DATASET_DIMS 3
+#define WRITE_PARALLEL_READ_SERIAL_NROWS        (NUM_MPI_RANKS * 4)
+#define WRITE_PARALLEL_READ_SERIAL_NCOLS        (NUM_MPI_RANKS * 2)
+#define WRITE_PARALLEL_READ_SERIAL_DEPTH        (NUM_MPI_RANKS)
+#define WRITE_PARALLEL_READ_SERIAL_CH_NROWS     (WRITE_PARALLEL_READ_SERIAL_NROWS / NUM_MPI_RANKS)
+#define WRITE_PARALLEL_READ_SERIAL_CH_NCOLS     (WRITE_PARALLEL_READ_SERIAL_NCOLS / NUM_MPI_RANKS)
+
 #endif /* TEST_PARALLEL_FILTERS_H_ */