diff options
| -rw-r--r-- | MANIFEST | 4 | ||||
| -rw-r--r-- | tools/h5dump/h5dumpgentest.c | 105 | ||||
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 8 | ||||
| -rw-r--r-- | tools/testfiles/taindices.h5 | bin | 0 -> 16736 bytes | |||
| -rw-r--r-- | tools/testfiles/tindiceslarge.ddl | 57 | ||||
| -rw-r--r-- | tools/testfiles/tindicesno.ddl | 191 | ||||
| -rw-r--r-- | tools/testfiles/tindicesyes.ddl | 212 |
7 files changed, 434 insertions, 143 deletions
@@ -1341,13 +1341,11 @@ ./tools/testfiles/tboot1.ddl ./tools/testfiles/tboot2.ddl ./tools/testfiles/tperror.ddl -./tools/testfiles/tindiceslarge.ddl ./tools/testfiles/tfill.ddl ./tools/testfiles/tfvalues.h5 ./tools/testfiles/tstring2.ddl ./tools/testfiles/tstr3.h5 - - +./tools/testfiles/taindices.h5 diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 9e90aec..bc84d08 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -79,6 +79,7 @@ #define FILE47 "tfcontents2.h5" #define FILE48 "tfvalues.h5" #define FILE49 "tstr3.h5" +#define FILE50 "taindices.h5" @@ -4499,24 +4500,15 @@ static void gent_filters(void) unsigned szip_pixels_per_block=4; #endif hsize_t dims1[RANK] = {DIM1,DIM2}; - hsize_t dims3[3] = {2,2,100}; hsize_t chunk_dims[RANK] = {CDIM1,CDIM2}; int buf1[DIM1][DIM2]; - int buf3[2][2][100]; - int i, j, k, n, ret; + int i, j, n, ret; for (i=n=0; i<DIM1; i++){ for (j=0; j<DIM2; j++){ buf1[i][j]=n++; } } - for (i=n=0; i<2; i++){ - for (j=0; j<2; j++){ - for (k=0; k<100; k++){ - buf3[i][j][k]=n++; - } - } - } /* create a file */ fid = H5Fcreate(FILE44, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -4750,12 +4742,6 @@ static void gent_filters(void) ret=H5Tclose(tid); assert(ret>=0); - -/*------------------------------------------------------------------------- - * a large 3D dataset - *------------------------------------------------------------------------- - */ - write_dset(fid,3,dims3,"3d",H5T_NATIVE_INT,buf3); /*------------------------------------------------------------------------- * close @@ -4828,13 +4814,6 @@ set_local_myfilter(hid_t dcpl_id, hid_t UNUSED type_id, hid_t UNUSED space_id) * *------------------------------------------------------------------------- */ -/*------------------------------------------------------------------------- - * Function: gent_fcontents - * - * Purpose: generate several files to list its contents - * - *------------------------------------------------------------------------- - */ static void gent_fcontents(void) { hid_t fid; /* file id */ @@ -5206,6 +5185,80 @@ static void gent_string(void) } +/*------------------------------------------------------------------------- + * Function: gent_aindices + * + * Purpose: make several datasets for the array indices tests + * + *------------------------------------------------------------------------- + */ +static void gent_aindices(void) +{ + hid_t fid; /* file id */ + hid_t gid[6]; /* group ids */ + hsize_t dims1[1] = {100}; + hsize_t dims2[2] = {2,100}; + hsize_t dims3[3] = {2,2,100}; + int buf1[100]; + int buf2[2][100]; + int buf3[2][2][100]; + int i, j, k, n, ret; + + for (i=n=0; i<100; i++){ + buf1[i]=n++; + } + + for (i=n=0; i<2; i++){ + for (j=0; j<100; j++){ + buf2[i][j]=n++; + } + } + for (i=n=0; i<2; i++){ + for (j=0; j<2; j++){ + for (k=0; k<100; k++){ + buf3[i][j][k]=n++; + } + } + } + + /* create a file */ + fid = H5Fcreate(FILE50, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + assert(fid>=0); + +/*------------------------------------------------------------------------- + * root datasets + *------------------------------------------------------------------------- + */ + write_dset(fid,1,dims1,"1d",H5T_NATIVE_INT,buf1); + write_dset(fid,2,dims2,"2d",H5T_NATIVE_INT,buf2); + write_dset(fid,3,dims3,"3d",H5T_NATIVE_INT,buf3); + +/*------------------------------------------------------------------------- + * test with group indentation + *------------------------------------------------------------------------- + */ + gid[0] = H5Gcreate (fid, "/g1", 0); + gid[1] = H5Gcreate (fid, "g1/g2", 0); + gid[2] = H5Gcreate (fid, "g1/g2/g3", 0); + gid[3] = H5Gcreate (fid, "g1/g2/g3/g4", 0); + gid[4] = H5Gcreate (fid, "g1/g2/g3/g4/g5", 0); + gid[5] = H5Gcreate (fid, "g1/g2/g3/g4/g5/g6", 0); + write_dset(gid[5],1,dims1,"1d",H5T_NATIVE_INT,buf1); + write_dset(gid[5],2,dims2,"2d",H5T_NATIVE_INT,buf2); + write_dset(gid[5],3,dims3,"3d",H5T_NATIVE_INT,buf3); + for (i=0; i<6; i++) + H5Gclose(gid[i]); + +/*------------------------------------------------------------------------- + * close + *------------------------------------------------------------------------- + */ + ret=H5Fclose(fid); + assert(ret>=0); +} + + + /*------------------------------------------------------------------------- * Function: main @@ -5259,11 +5312,13 @@ int main(void) gent_attr_all(); gent_compound_complex(); gent_named_dtype_attr(); - gent_filters(); gent_null_space(); - gent_fcontents(); + + gent_filters(); gent_fvalues(); + gent_fcontents(); gent_string(); + gent_aindices(); return 0; } diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 88b40c1..afc1038 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -245,10 +245,10 @@ TOOLTEST tstring.ddl tstr3.h5 # char data as ASCII with non escape TOOLTEST tstring2.ddl -r -d str4 tstr3.h5 -# array indices print/not print, large dataset -TOOLTEST tindicesyes.ddl -d compact tfilters.h5 -TOOLTEST tindicesno.ddl -y -d compact tfilters.h5 -TOOLTEST tindiceslarge.ddl -p -d 3d tfilters.h5 +# array indices print/not print +TOOLTEST tindicesyes.ddl taindices.h5 +TOOLTEST tindicesno.ddl -y taindices.h5 + # tests for filters # SZIP diff --git a/tools/testfiles/taindices.h5 b/tools/testfiles/taindices.h5 Binary files differnew file mode 100644 index 0000000..e13a69c --- /dev/null +++ b/tools/testfiles/taindices.h5 diff --git a/tools/testfiles/tindiceslarge.ddl b/tools/testfiles/tindiceslarge.ddl deleted file mode 100644 index 9572b2e..0000000 --- a/tools/testfiles/tindiceslarge.ddl +++ /dev/null @@ -1,57 +0,0 @@ -############################# -Expected output for 'h5dump -p -d 3d tfilters.h5' -############################# -HDF5 "tfilters.h5" { -DATASET "3d" { - DATATYPE H5T_STD_I32LE - DATASPACE SIMPLE { ( 2, 2, 100 ) / ( 2, 2, 100 ) } - STORAGE_LAYOUT { - CONTIGUOUS - SIZE 1600 - OFFSET 42544 - } - FILTERS { - NONE - } - FILLVALUE { - FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 - } - ALLOCATION_TIME { - H5D_ALLOC_TIME_LATE - } - DATA { - (0,0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - (0,0,19): 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - (0,0,35): 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - (0,0,51): 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - (0,0,67): 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - (0,0,83): 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - (0,0,99): 99, - (0,1,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - (0,1,13): 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - (0,1,26): 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - (0,1,39): 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - (0,1,52): 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - (0,1,65): 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - (0,1,78): 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - (0,1,91): 191, 192, 193, 194, 195, 196, 197, 198, 199, - (1,0,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, - (1,0,13): 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, - (1,0,26): 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - (1,0,39): 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, - (1,0,52): 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - (1,0,65): 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, - (1,0,78): 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, - (1,0,91): 291, 292, 293, 294, 295, 296, 297, 298, 299, - (1,1,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, - (1,1,13): 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - (1,1,26): 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, - (1,1,39): 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, - (1,1,52): 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, - (1,1,65): 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, - (1,1,78): 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, - (1,1,91): 391, 392, 393, 394, 395, 396, 397, 398, 399 - } -} -} diff --git a/tools/testfiles/tindicesno.ddl b/tools/testfiles/tindicesno.ddl index 4b8ff7d..efdbe5e 100644 --- a/tools/testfiles/tindicesno.ddl +++ b/tools/testfiles/tindicesno.ddl @@ -1,32 +1,169 @@ ############################# -Expected output for 'h5dump -y -d compact tfilters.h5' +Expected output for 'h5dump -y taindices.h5' ############################# -HDF5 "tfilters.h5" { -DATASET "compact" { -COMMENT "This is a dataset with compact storage" - DATATYPE H5T_STD_I32LE - DATASPACE SIMPLE { ( 20, 10 ) / ( 20, 10 ) } - DATA { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 194, 195, 196, 197, 198, 199 +HDF5 "taindices.h5" { +GROUP "/" { + DATASET "1d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 100 ) / ( 100 ) } + DATA { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99 + } + } + DATASET "2d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 100 ) / ( 2, 100 ) } + DATA { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199 + } + } + DATASET "3d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 2, 100 ) / ( 2, 2, 100 ) } + DATA { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, + 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, + 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, + 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, + 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, + 298, 299, + 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, + 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, + 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, + 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, + 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, + 398, 399 + } + } + GROUP "g1" { + GROUP "g2" { + GROUP "g3" { + GROUP "g4" { + GROUP "g5" { + GROUP "g6" { + DATASET "1d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 100 ) / ( 100 ) } + DATA { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99 + } + } + DATASET "2d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 100 ) / ( 2, 100 ) } + DATA { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199 + } + } + DATASET "3d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 2, 100 ) / ( 2, 2, 100 ) } + DATA { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, + 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, + 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, + 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, + 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, + 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, + 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, + 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, + 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, + 390, 391, 392, 393, 394, 395, 396, 397, 398, 399 + } + } + } + } + } + } + } } } } diff --git a/tools/testfiles/tindicesyes.ddl b/tools/testfiles/tindicesyes.ddl index e785742..ba6624e 100644 --- a/tools/testfiles/tindicesyes.ddl +++ b/tools/testfiles/tindicesyes.ddl @@ -1,32 +1,190 @@ ############################# -Expected output for 'h5dump -d compact tfilters.h5' +Expected output for 'h5dump taindices.h5' ############################# -HDF5 "tfilters.h5" { -DATASET "compact" { -COMMENT "This is a dataset with compact storage" - DATATYPE H5T_STD_I32LE - DATASPACE SIMPLE { ( 20, 10 ) / ( 20, 10 ) } - DATA { - (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - (1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - (2,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - (3,0): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - (4,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - (5,0): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - (6,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - (7,0): 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - (8,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - (9,0): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - (10,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - (11,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - (12,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - (13,0): 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - (14,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - (15,0): 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - (16,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - (17,0): 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - (18,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - (19,0): 190, 191, 192, 193, 194, 195, 196, 197, 198, 199 +HDF5 "taindices.h5" { +GROUP "/" { + DATASET "1d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 100 ) / ( 100 ) } + DATA { + (0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + (19): 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + (35): 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + (51): 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + (67): 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + (83): 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + (99): 99 + } + } + DATASET "2d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 100 ) / ( 2, 100 ) } + DATA { + (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (0,18): 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + (0,34): 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + (0,50): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + (0,66): 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + (0,82): 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + (0,98): 98, 99, + (1,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, + (1,13): 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + (1,25): 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + (1,37): 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + (1,49): 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + (1,61): 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, + (1,73): 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + (1,85): 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, + (1,97): 197, 198, 199 + } + } + DATASET "3d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 2, 100 ) / ( 2, 2, 100 ) } + DATA { + (0,0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (0,0,18): 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + (0,0,33): 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + (0,0,48): 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + (0,0,63): 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + (0,0,78): 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, + (0,0,93): 93, 94, 95, 96, 97, 98, 99, + (0,1,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + (0,1,12): 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + (0,1,24): 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, + (0,1,36): 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + (0,1,48): 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + (0,1,60): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, + (0,1,72): 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + (0,1,84): 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + (0,1,96): 196, 197, 198, 199, + (1,0,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, + (1,0,12): 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, + (1,0,24): 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + (1,0,36): 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + (1,0,48): 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + (1,0,60): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, + (1,0,72): 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, + (1,0,84): 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, + (1,0,96): 296, 297, 298, 299, + (1,1,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, + (1,1,12): 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, + (1,1,24): 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, + (1,1,36): 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, + (1,1,48): 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, + (1,1,60): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + (1,1,72): 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, + (1,1,84): 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, + (1,1,96): 396, 397, 398, 399 + } + } + GROUP "g1" { + GROUP "g2" { + GROUP "g3" { + GROUP "g4" { + GROUP "g5" { + GROUP "g6" { + DATASET "1d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 100 ) / ( 100 ) } + DATA { + (0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + (14): 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + (26): 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + (38): 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + (50): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + (62): 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + (74): 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + (86): 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + (98): 98, 99 + } + } + DATASET "2d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 100 ) / ( 2, 100 ) } + DATA { + (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + (0,14): 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + (0,25): 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + (0,36): 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + (0,47): 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + (0,58): 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + (0,69): 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + (0,80): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + (0,91): 91, 92, 93, 94, 95, 96, 97, 98, 99, + (1,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, + (1,9): 109, 110, 111, 112, 113, 114, 115, 116, 117, + (1,18): 118, 119, 120, 121, 122, 123, 124, 125, 126, + (1,27): 127, 128, 129, 130, 131, 132, 133, 134, 135, + (1,36): 136, 137, 138, 139, 140, 141, 142, 143, 144, + (1,45): 145, 146, 147, 148, 149, 150, 151, 152, 153, + (1,54): 154, 155, 156, 157, 158, 159, 160, 161, 162, + (1,63): 163, 164, 165, 166, 167, 168, 169, 170, 171, + (1,72): 172, 173, 174, 175, 176, 177, 178, 179, 180, + (1,81): 181, 182, 183, 184, 185, 186, 187, 188, 189, + (1,90): 190, 191, 192, 193, 194, 195, 196, 197, 198, + (1,99): 199 + } + } + DATASET "3d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 2, 100 ) / ( 2, 2, 100 ) } + DATA { + (0,0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + (0,0,13): 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + (0,0,24): 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + (0,0,35): 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + (0,0,46): 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + (0,0,57): 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + (0,0,68): 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + (0,0,79): 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + (0,0,90): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + (0,1,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, + (0,1,9): 109, 110, 111, 112, 113, 114, 115, 116, 117, + (0,1,18): 118, 119, 120, 121, 122, 123, 124, 125, + (0,1,26): 126, 127, 128, 129, 130, 131, 132, 133, + (0,1,34): 134, 135, 136, 137, 138, 139, 140, 141, + (0,1,42): 142, 143, 144, 145, 146, 147, 148, 149, + (0,1,50): 150, 151, 152, 153, 154, 155, 156, 157, + (0,1,58): 158, 159, 160, 161, 162, 163, 164, 165, + (0,1,66): 166, 167, 168, 169, 170, 171, 172, 173, + (0,1,74): 174, 175, 176, 177, 178, 179, 180, 181, + (0,1,82): 182, 183, 184, 185, 186, 187, 188, 189, + (0,1,90): 190, 191, 192, 193, 194, 195, 196, 197, + (0,1,98): 198, 199, + (1,0,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, + (1,0,9): 209, 210, 211, 212, 213, 214, 215, 216, 217, + (1,0,18): 218, 219, 220, 221, 222, 223, 224, 225, + (1,0,26): 226, 227, 228, 229, 230, 231, 232, 233, + (1,0,34): 234, 235, 236, 237, 238, 239, 240, 241, + (1,0,42): 242, 243, 244, 245, 246, 247, 248, 249, + (1,0,50): 250, 251, 252, 253, 254, 255, 256, 257, + (1,0,58): 258, 259, 260, 261, 262, 263, 264, 265, + (1,0,66): 266, 267, 268, 269, 270, 271, 272, 273, + (1,0,74): 274, 275, 276, 277, 278, 279, 280, 281, + (1,0,82): 282, 283, 284, 285, 286, 287, 288, 289, + (1,0,90): 290, 291, 292, 293, 294, 295, 296, 297, + (1,0,98): 298, 299, + (1,1,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, + (1,1,9): 309, 310, 311, 312, 313, 314, 315, 316, 317, + (1,1,18): 318, 319, 320, 321, 322, 323, 324, 325, + (1,1,26): 326, 327, 328, 329, 330, 331, 332, 333, + (1,1,34): 334, 335, 336, 337, 338, 339, 340, 341, + (1,1,42): 342, 343, 344, 345, 346, 347, 348, 349, + (1,1,50): 350, 351, 352, 353, 354, 355, 356, 357, + (1,1,58): 358, 359, 360, 361, 362, 363, 364, 365, + (1,1,66): 366, 367, 368, 369, 370, 371, 372, 373, + (1,1,74): 374, 375, 376, 377, 378, 379, 380, 381, + (1,1,82): 382, 383, 384, 385, 386, 387, 388, 389, + (1,1,90): 390, 391, 392, 393, 394, 395, 396, 397, + (1,1,98): 398, 399 + } + } + } + } + } + } + } } } } |