diff options
Diffstat (limited to 'testpar/t_dset.c')
| -rw-r--r-- | testpar/t_dset.c | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 9ba6901..feaf370 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -42,7 +42,7 @@ * ZROW same as BYROW except process 0 gets 0 rows * ZCOL same as BYCOL except process 0 gets 0 columns */ -void +static void slab_set(int mpi_rank, int mpi_size, hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], int mode) { @@ -122,16 +122,16 @@ if (verbose){ * Fill the dataset with trivial data for testing. * Assume dimension rank is 2 and data is stored contiguous. */ -void -dataset_fill(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], DATATYPE * dataset) +static void +dataset_fill(hssize_t start[], hsize_t block[], DATATYPE * dataset) { DATATYPE *dataptr = dataset; - int i, j; + hsize_t i, j; /* put some trivial data in the data_array */ for (i=0; i < block[0]; i++){ for (j=0; j < block[1]; j++){ - *dataptr = (i+start[0])*100 + (j+start[1]+1); + *dataptr = (DATATYPE)((i+start[0])*100 + (j+start[1]+1)); dataptr++; } } @@ -141,10 +141,11 @@ dataset_fill(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[ /* * Print the content of the dataset. */ -void dataset_print(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], DATATYPE * dataset) +static void +dataset_print(hssize_t start[], hsize_t block[], DATATYPE * dataset) { DATATYPE *dataptr = dataset; - int i, j; + hsize_t i, j; /* print the column heading */ printf("%-8s", "Cols:"); @@ -169,7 +170,8 @@ void dataset_print(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t */ int dataset_vrfy(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], DATATYPE *dataset, DATATYPE *original) { - int i, j, vrfyerrs; + hsize_t i, j; + int vrfyerrs; /* print it if verbose */ if (verbose) { @@ -178,9 +180,9 @@ int dataset_vrfy(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t bl (long)start[0], (long)start[1], (unsigned long)count[0], (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1], (unsigned long)block[0], (unsigned long)block[1]); printf("original values:\n"); - dataset_print(start, count, stride, block, original); + dataset_print(start, block, original); printf("compared values:\n"); - dataset_print(start, count, stride, block, dataset); + dataset_print(start, block, dataset); } vrfyerrs = 0; @@ -188,9 +190,9 @@ int dataset_vrfy(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t bl for (j=0; j < block[1]; j++){ if (*dataset != *original){ if (vrfyerrs++ < MAX_ERR_REPORT || verbose){ - printf("Dataset Verify failed at [%d][%d](row %d, col %d): expect %d, got %d\n", - i, j, - (int)(i+start[0]), (int)(j+start[1]), + printf("Dataset Verify failed at [%ld][%ld](row %ld, col %ld): expect %d, got %d\n", + (long)i, (long)j, + (long)(i+start[0]), (long)(j+start[1]), *(original), *(dataset)); } dataset++; @@ -299,7 +301,7 @@ dataset_writeInd(char *filename) slab_set(mpi_rank, mpi_size, start, count, stride, block, BYROW); /* put some trivial data in the data_array */ - dataset_fill(start, count, stride, block, data_array1); + dataset_fill(start, block, data_array1); MESG("data_array initialized"); /* create a file dataspace independently */ @@ -429,7 +431,7 @@ dataset_readInd(char *filename) VRFY((mem_dataspace >= 0), ""); /* fill dataset with test data */ - dataset_fill(start, count, stride, block, data_origin1); + dataset_fill(start, block, data_origin1); /* read data independently */ ret = H5Dread(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, @@ -572,11 +574,11 @@ dataset_writeAll(char *filename) VRFY((mem_dataspace >= 0), ""); /* fill the local slab with some trivial data */ - dataset_fill(start, count, stride, block, data_array1); + dataset_fill(start, block, data_array1); MESG("data_array initialized"); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_array1); + dataset_print(start, block, data_array1); } /* set up the collective transfer properties list */ @@ -618,11 +620,11 @@ dataset_writeAll(char *filename) slab_set(mpi_rank, mpi_size, start, count, stride, block, BYCOL); /* put some trivial data in the data_array */ - dataset_fill(start, count, stride, block, data_array1); + dataset_fill(start, block, data_array1); MESG("data_array initialized"); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_array1); + dataset_print(start, block, data_array1); } /* create a file dataspace independently */ @@ -636,11 +638,11 @@ dataset_writeAll(char *filename) VRFY((mem_dataspace >= 0), ""); /* fill the local slab with some trivial data */ - dataset_fill(start, count, stride, block, data_array1); + dataset_fill(start, block, data_array1); MESG("data_array initialized"); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_array1); + dataset_print(start, block, data_array1); } /* set up the collective transfer properties list */ @@ -783,11 +785,11 @@ dataset_readAll(char *filename) VRFY((mem_dataspace >= 0), ""); /* fill dataset with test data */ - dataset_fill(start, count, stride, block, data_origin1); + dataset_fill(start, block, data_origin1); MESG("data_array initialized"); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_origin1); + dataset_print(start, block, data_origin1); } /* set up the collective transfer properties list */ @@ -846,11 +848,11 @@ dataset_readAll(char *filename) VRFY((mem_dataspace >= 0), ""); /* fill dataset with test data */ - dataset_fill(start, count, stride, block, data_origin1); + dataset_fill(start, block, data_origin1); MESG("data_array initialized"); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_origin1); + dataset_print(start, block, data_origin1); } /* set up the collective transfer properties list */ @@ -1020,11 +1022,11 @@ extend_writeInd(char *filename) slab_set(mpi_rank, mpi_size, start, count, stride, block, BYROW); /* put some trivial data in the data_array */ - dataset_fill(start, count, stride, block, data_array1); + dataset_fill(start, block, data_array1); MESG("data_array initialized"); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_array1); + dataset_print(start, block, data_array1); } /* create a memory dataspace independently */ @@ -1060,11 +1062,11 @@ extend_writeInd(char *filename) slab_set(mpi_rank, mpi_size, start, count, stride, block, BYCOL); /* put some trivial data in the data_array */ - dataset_fill(start, count, stride, block, data_array1); + dataset_fill(start, block, data_array1); MESG("data_array initialized"); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_array1); + dataset_print(start, block, data_array1); } /* create a memory dataspace independently */ @@ -1223,10 +1225,10 @@ extend_readInd(char *filename) VRFY((mem_dataspace >= 0), ""); /* fill dataset with test data */ - dataset_fill(start, count, stride, block, data_origin1); + dataset_fill(start, block, data_origin1); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_array1); + dataset_print(start, block, data_array1); } /* read data independently */ @@ -1258,10 +1260,10 @@ extend_readInd(char *filename) VRFY((mem_dataspace >= 0), ""); /* fill dataset with test data */ - dataset_fill(start, count, stride, block, data_origin1); + dataset_fill(start, block, data_origin1); if (verbose){ MESG("data_array created"); - dataset_print(start, count, stride, block, data_array1); + dataset_print(start, block, data_array1); } /* read data independently */ |