[svn-r566] Fixed offset code [finally :-/ ] for selections.

1 files changed, 334 insertions, 6 deletions

diff --git a/test/tselect.c b/test/tselect.c
index 29fff74..c19bfdd 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -49,12 +49,6 @@ static char		RcsId[] = "$Revision$";
 #define SPACE3_DIM1	15
 #define SPACE3_DIM2	26
 
-/* 2-D dataset with fixed dimensions */
-#define SPACE4_NAME  "Space4"
-#define SPACE4_RANK	2
-#define SPACE4_DIM1	15
-#define SPACE4_DIM2	26
-
 /* Element selection information */
 #define POINT1_NPOINTS 10
 
@@ -1090,6 +1084,338 @@ test_select_point_copy(void)
 
 /****************************************************************
 **
+**  test_select_hyper_offset(): Test basic H5S (dataspace) selection code.
+**      Tests hyperslabs of various sizes and dimensionalities with selection
+**      offsets.
+** 
+****************************************************************/
+static void 
+test_select_hyper_offset(void)
+{
+    hid_t		fid1;		/* HDF5 File IDs		*/
+    hid_t		dataset;	/* Dataset ID			*/
+    hid_t		sid1,sid2;	/* Dataspace ID			*/
+    hsize_t		dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
+    hsize_t		dims2[] = {SPACE2_DIM1, SPACE2_DIM2};
+    hsize_t		dims3[] = {SPACE3_DIM1, SPACE3_DIM2};
+    hssize_t	start[SPACE1_RANK];     /* Starting location of hyperslab */
+    hsize_t		stride[SPACE1_RANK];    /* Stride of hyperslab */
+    hsize_t		count[SPACE1_RANK];     /* Element count of hyperslab */
+    hsize_t		block[SPACE1_RANK];     /* Block size of hyperslab */
+    hssize_t	offset[SPACE1_RANK];    /* Offset of selection */
+    uint8      *wbuf,       /* buffer to write to disk */
+               *rbuf,       /* buffer read from disk */
+               *tbuf,       /* temporary buffer pointer */
+               *tbuf2;      /* temporary buffer pointer */
+    intn        i,j;        /* Counters */
+    herr_t		ret;		/* Generic return value		*/
+    hbool_t	    valid;		/* Generic boolean return value		*/
+    H5S_class_t ext_type;   /* Extent type */
+
+    /* Output message about test being performed */
+    MESSAGE(5, ("Testing Hyperslab Selection Functions with Offsets\n"));
+
+    /* Allocate write & read buffers */
+    wbuf=malloc(sizeof(uint8)*SPACE2_DIM1*SPACE2_DIM2);
+    rbuf=calloc(sizeof(uint8),SPACE3_DIM1*SPACE3_DIM2);
+
+    /* Initialize write buffer */
+    for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
+        for(j=0; j<SPACE2_DIM2; j++)
+            *tbuf++=(uint8)((i*SPACE2_DIM2)+j);
+
+    /* Create file */
+    fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(fid1, FAIL, "H5Fcreate");
+
+    /* Create dataspace for dataset */
+    sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
+    CHECK(sid1, FAIL, "H5Screate_simple");
+
+    /* Create dataspace for writing buffer */
+    sid2 = H5Screate_simple(SPACE2_RANK, dims2, NULL);
+    CHECK(sid2, FAIL, "H5Screate_simple");
+
+    /* Verify extent type */
+    ext_type = H5Sextent_class(sid1);
+    VERIFY(ext_type, H5S_SIMPLE, "H5Sextent_class");
+
+    /* Select 2x15x13 hyperslab for disk dataset */
+    start[0]=1; start[1]=0; start[2]=0;
+    stride[0]=1; stride[1]=1; stride[2]=1;
+    count[0]=2; count[1]=15; count[2]=13;
+    block[0]=1; block[1]=1; block[2]=1;
+    ret = H5Sselect_hyperslab(sid1,H5S_SELECT_SET,start,stride,count,block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    /* Check a valid offset */
+    offset[0]=-1; offset[1]=0; offset[2]=0;
+    ret = H5Soffset_simple(sid1,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid1);
+    VERIFY(valid, TRUE, "H5Svalid_offset");
+
+    /* Check an invalid offset */
+    offset[0]=10; offset[1]=0; offset[2]=0;
+    ret = H5Soffset_simple(sid1,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid1);
+    VERIFY(valid, FALSE, "H5Svalid_offset");
+
+    /* Reset offset */
+    offset[0]=0; offset[1]=0; offset[2]=0;
+    ret = H5Soffset_simple(sid1,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid1);
+    VERIFY(valid, TRUE, "H5Svalid_offset");
+
+    /* Select 15x26 hyperslab for memory dataset */
+    start[0]=15; start[1]=0;
+    stride[0]=1; stride[1]=1;
+    count[0]=15; count[1]=26;
+    block[0]=1; block[1]=1;
+    ret = H5Sselect_hyperslab(sid2,H5S_SELECT_SET,start,stride,count,block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    /* Choose a valid offset for the memory dataspace */
+    offset[0]=-10; offset[1]=0;
+    ret = H5Soffset_simple(sid2,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid2);
+    VERIFY(valid, TRUE, "H5Svalid_offset");
+
+    /* Create a dataset */
+    dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT);
+
+    /* Write selection to disk */
+    ret=H5Dwrite(dataset,H5T_NATIVE_UCHAR,sid2,sid1,H5P_DEFAULT,wbuf);
+    CHECK(ret, FAIL, "H5Dwrite");
+
+    /* Close memory dataspace */
+    ret = H5Sclose(sid2);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    /* Create dataspace for reading buffer */
+    sid2 = H5Screate_simple(SPACE3_RANK, dims3, NULL);
+    CHECK(sid2, FAIL, "H5Screate_simple");
+
+    /* Select 15x26 hyperslab for reading memory dataset */
+    start[0]=0; start[1]=0;
+    stride[0]=1; stride[1]=1;
+    count[0]=15; count[1]=26;
+    block[0]=1; block[1]=1;
+    ret = H5Sselect_hyperslab(sid2,H5S_SELECT_SET,start,stride,count,block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    /* Read selection from disk */
+    ret=H5Dread(dataset,H5T_NATIVE_UCHAR,sid2,sid1,H5P_DEFAULT,rbuf);
+    CHECK(ret, FAIL, "H5Dread");
+
+    /* Compare data read with data written out */
+    for(i=0; i<SPACE3_DIM1; i++) {
+        tbuf=wbuf+((i+5)*SPACE2_DIM2);
+        tbuf2=rbuf+(i*SPACE3_DIM2);
+        for(j=0; j<SPACE3_DIM2; j++, tbuf++, tbuf2++) {
+            if(*tbuf!=*tbuf2) {
+                printf("hyperslab values don't match!, i=%d, j=%d\n",i,j);
+            } /* end if */
+        } /* end for */
+    } /* end for */
+
+    /* Close memory dataspace */
+    ret = H5Sclose(sid2);
+    CHECK(ret, FAIL, "H5Sclose");
+    
+    /* Close disk dataspace */
+    ret = H5Sclose(sid1);
+    CHECK(ret, FAIL, "H5Sclose");
+    
+    /* Close Dataset */
+    ret = H5Dclose(dataset);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    /* Close file */
+    ret = H5Fclose(fid1);
+    CHECK(ret, FAIL, "H5Fclose");
+
+    /* Free memory buffers */
+    free(wbuf);
+    free(rbuf);
+}   /* test_select_hyper_offset() */
+
+/****************************************************************
+**
+**  test_select_point_offset(): Test basic H5S (dataspace) selection code.
+**      Tests element selections between dataspaces of various sizes
+**      and dimensionalities with selection offsets.
+** 
+****************************************************************/
+static void 
+test_select_point_offset(void)
+{
+    hid_t		fid1;		/* HDF5 File IDs		*/
+    hid_t		dataset;	/* Dataset ID			*/
+    hid_t		sid1,sid2;	/* Dataspace ID			*/
+    hsize_t		dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
+    hsize_t		dims2[] = {SPACE2_DIM1, SPACE2_DIM2};
+    hsize_t		dims3[] = {SPACE3_DIM1, SPACE3_DIM2};
+    hssize_t	coord1[POINT1_NPOINTS][SPACE1_RANK]; /* Coordinates for point selection */
+    hssize_t	coord2[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
+    hssize_t	coord3[POINT1_NPOINTS][SPACE3_RANK]; /* Coordinates for point selection */
+    hssize_t	offset[SPACE1_RANK];    /* Offset of selection */
+    uint8      *wbuf,       /* buffer to write to disk */
+               *rbuf,       /* buffer read from disk */
+               *tbuf,       /* temporary buffer pointer */
+               *tbuf2;      /* temporary buffer pointer */
+    intn        i,j;        /* Counters */
+    herr_t		ret;		/* Generic return value		*/
+    hbool_t	    valid;		/* Generic boolean return value		*/
+
+    /* Output message about test being performed */
+    MESSAGE(5, ("Testing Element Selection Functions\n"));
+
+    /* Allocate write & read buffers */
+    wbuf=malloc(sizeof(uint8)*SPACE2_DIM1*SPACE2_DIM2);
+    rbuf=calloc(sizeof(uint8),SPACE3_DIM1*SPACE3_DIM2);
+
+    /* Initialize write buffer */
+    for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
+        for(j=0; j<SPACE2_DIM2; j++)
+            *tbuf++=(uint8)((i*SPACE2_DIM2)+j);
+
+    /* Create file */
+    fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(fid1, FAIL, "H5Fcreate");
+
+    /* Create dataspace for dataset */
+    sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
+    CHECK(sid1, FAIL, "H5Screate_simple");
+
+    /* Create dataspace for write buffer */
+    sid2 = H5Screate_simple(SPACE2_RANK, dims2, NULL);
+    CHECK(sid2, FAIL, "H5Screate_simple");
+
+    /* Select sequence of ten points for disk dataset */
+    coord1[0][0]=0; coord1[0][1]=10; coord1[0][2]= 5;
+    coord1[1][0]=1; coord1[1][1]= 2; coord1[1][2]= 7;
+    coord1[2][0]=2; coord1[2][1]= 4; coord1[2][2]= 9;
+    coord1[3][0]=0; coord1[3][1]= 6; coord1[3][2]=11;
+    coord1[4][0]=1; coord1[4][1]= 8; coord1[4][2]=12;
+    coord1[5][0]=2; coord1[5][1]=12; coord1[5][2]= 0;
+    coord1[6][0]=0; coord1[6][1]=14; coord1[6][2]= 2;
+    coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4;
+    coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6;
+    coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8;
+    ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,(const hssize_t **)coord1);
+    CHECK(ret, FAIL, "H5Sselect_elements");
+
+    /* Check a valid offset */
+    offset[0]=0; offset[1]=0; offset[2]=1;
+    ret = H5Soffset_simple(sid1,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid1);
+    VERIFY(valid, TRUE, "H5Svalid_offset");
+
+    /* Check an invalid offset */
+    offset[0]=10; offset[1]=0; offset[2]=0;
+    ret = H5Soffset_simple(sid1,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid1);
+    VERIFY(valid, FALSE, "H5Svalid_offset");
+
+    /* Reset offset */
+    offset[0]=0; offset[1]=0; offset[2]=0;
+    ret = H5Soffset_simple(sid1,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid1);
+    VERIFY(valid, TRUE, "H5Svalid_offset");
+
+    /* Select sequence of ten points for write dataset */
+    coord2[0][0]=12; coord2[0][1]= 3;
+    coord2[1][0]=15; coord2[1][1]=13;
+    coord2[2][0]= 7; coord2[2][1]=24;
+    coord2[3][0]= 0; coord2[3][1]= 6;
+    coord2[4][0]=13; coord2[4][1]= 0;
+    coord2[5][0]=24; coord2[5][1]=11;
+    coord2[6][0]=12; coord2[6][1]=21;
+    coord2[7][0]=23; coord2[7][1]= 4;
+    coord2[8][0]= 8; coord2[8][1]= 8;
+    coord2[9][0]=19; coord2[9][1]=17;
+    ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hssize_t **)coord2);
+    CHECK(ret, FAIL, "H5Sselect_elements");
+
+    /* Choose a valid offset for the memory dataspace */
+    offset[0]=5; offset[1]=1;
+    ret = H5Soffset_simple(sid2,offset);
+    CHECK(ret, FAIL, "H5Soffset_simple");
+    valid = H5Sselect_valid(sid2);
+    VERIFY(valid, TRUE, "H5Svalid_offset");
+
+    /* Create a dataset */
+    dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT);
+
+    /* Write selection to disk */
+    ret=H5Dwrite(dataset,H5T_NATIVE_UCHAR,sid2,sid1,H5P_DEFAULT,wbuf);
+    CHECK(ret, FAIL, "H5Dwrite");
+
+    /* Close memory dataspace */
+    ret = H5Sclose(sid2);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    /* Create dataspace for reading buffer */
+    sid2 = H5Screate_simple(SPACE3_RANK, dims3, NULL);
+    CHECK(sid2, FAIL, "H5Screate_simple");
+
+    /* Select sequence of points for read dataset */
+    coord3[0][0]= 0; coord3[0][1]= 2;
+    coord3[1][0]= 4; coord3[1][1]= 8;
+    coord3[2][0]=13; coord3[2][1]=13;
+    coord3[3][0]=14; coord3[3][1]=25;
+    coord3[4][0]= 7; coord3[4][1]= 9;
+    coord3[5][0]= 2; coord3[5][1]= 0;
+    coord3[6][0]= 9; coord3[6][1]=19;
+    coord3[7][0]= 1; coord3[7][1]=22;
+    coord3[8][0]=12; coord3[8][1]=21;
+    coord3[9][0]=11; coord3[9][1]= 6;
+    ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hssize_t **)coord3);
+    CHECK(ret, FAIL, "H5Sselect_elements");
+
+    /* Read selection from disk */
+    ret=H5Dread(dataset,H5T_NATIVE_UCHAR,sid2,sid1,H5P_DEFAULT,rbuf);
+    CHECK(ret, FAIL, "H5Dread");
+
+    /* Compare data read with data written out */
+    for(i=0; i<POINT1_NPOINTS; i++) {
+        tbuf=wbuf+((coord2[i][0]+offset[0])*SPACE2_DIM2)+coord2[i][1]+offset[1];
+        tbuf2=rbuf+(coord3[i][0]*SPACE3_DIM2)+coord3[i][1];
+        if(*tbuf!=*tbuf2) {
+            printf("element values don't match!, i=%d\n",i);
+        } /* end if */
+    } /* end for */
+
+    /* Close memory dataspace */
+    ret = H5Sclose(sid2);
+    CHECK(ret, FAIL, "H5Sclose");
+    
+    /* Close disk dataspace */
+    ret = H5Sclose(sid1);
+    CHECK(ret, FAIL, "H5Sclose");
+    
+    /* Close Dataset */
+    ret = H5Dclose(dataset);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    /* Close file */
+    ret = H5Fclose(fid1);
+    CHECK(ret, FAIL, "H5Fclose");
+
+    /* Free memory buffers */
+    free(wbuf);
+    free(rbuf);
+}   /* test_select_point() */
+
+/****************************************************************
+**
 **  test_select(): Main H5S selection testing routine.
 ** 
 ****************************************************************/
@@ -1107,6 +1433,8 @@ test_select(void)
     test_select_hyper_stride(); /* Test strided hyperslab selection code */
     test_select_hyper_copy();   /* Test hyperslab selection copying code */
     test_select_point_copy();   /* Test point selection copying code */
+    test_select_hyper_offset(); /* Test selection offset code with hyperslabs */
+    test_select_point_offset(); /* Test selection offset code with elements */
 
 }   /* test_select() */