From 40cdbe0b8dc5ad618920d6a33a818cfa42c3f241 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 4 Mar 2016 15:41:12 -0500 Subject: [svn-r29274] HDFFV-9698: fix subsetting issues with h5dump --- MANIFEST | 7 ++ tools/h5dump/CMakeTests.cmake | 25 +++++ tools/h5dump/h5dumpgentest.c | 177 ++++++++++++++++++----------- tools/h5dump/testh5dump.sh.in | 13 +++ tools/lib/h5tools_dump.c | 8 +- tools/testfiles/tints4dims.ddl | 202 ++++++++++++++++++++++++++++++++++ tools/testfiles/tints4dims.h5 | Bin 0 -> 9824 bytes tools/testfiles/tints4dimsBlock2.ddl | 16 +++ tools/testfiles/tints4dimsBlockEq.ddl | 30 +++++ tools/testfiles/tints4dimsCount2.ddl | 22 ++++ tools/testfiles/tints4dimsCountEq.ddl | 30 +++++ tools/testfiles/tints4dimsStride2.ddl | 22 ++++ 12 files changed, 480 insertions(+), 72 deletions(-) create mode 100644 tools/testfiles/tints4dims.ddl create mode 100644 tools/testfiles/tints4dims.h5 create mode 100644 tools/testfiles/tints4dimsBlock2.ddl create mode 100644 tools/testfiles/tints4dimsBlockEq.ddl create mode 100644 tools/testfiles/tints4dimsCount2.ddl create mode 100644 tools/testfiles/tints4dimsCountEq.ddl create mode 100644 tools/testfiles/tints4dimsStride2.ddl diff --git a/MANIFEST b/MANIFEST index 7386c76..7de29fb 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1535,6 +1535,13 @@ ./tools/testfiles/tindicessub3.ddl ./tools/testfiles/tindicessub4.ddl ./tools/testfiles/tindicessub1.ddl +./tools/testfiles/tints4dims.ddl +./tools/testfiles/tints4dimsBlock2.ddl +./tools/testfiles/tints4dimsBlockEq.ddl +./tools/testfiles/tints4dimsCount2.ddl +./tools/testfiles/tints4dimsCountEq.ddl +./tools/testfiles/tints4dimsStride2.ddl +./tools/testfiles/tints4dims.h5 ./tools/testfiles/tintsattrs.ddl ./tools/testfiles/tintsattrs.h5 ./tools/testfiles/tlarge_objname.ddl diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index c256e11..9f7e2b0 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -103,6 +103,12 @@ ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub3.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub4.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicesyes.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dims.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsBlock2.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsBlockEq.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsCount2.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsCountEq.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsStride2.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.ddl #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.ddl @@ -244,6 +250,7 @@ ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5 ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5 ${HDF5_TOOLS_SRC_DIR}/testfiles/thyperslab.h5 + ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dims.h5 ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.h5 ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.h5 #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.h5 @@ -915,6 +922,18 @@ texceedsubblock.out.err tindicesyes.out tindicesyes.out.err + tints4dims.out + tints4dims.out.err + tints4dimsBlock2.out + tints4dimsBlock2.out.err + tints4dimsBlockEq.out + tints4dimsBlockEq.out.err + tints4dimsCount2.out + tints4dimsCount2.out.err + tints4dimsCountEq.out + tints4dimsCountEq.out.err + tints4dimsStride2.out + tints4dimsStride2.out.err tintsattrs.out tintsattrs.out.err tlarge_objname.out @@ -1236,6 +1255,12 @@ ADD_H5_TEST (tdset-3s 0 --enable-error-stack -d "/dset1[1,1;;;]" tdset.h5) ADD_H5_TEST (tno-subset 0 --enable-error-stack --no-compact-subset -d "AHFINDERDIRECT::ah_centroid_t[0] it=0 tl=0" tno-subset.h5) + ADD_H5_TEST (tints4dimsCount2 0 --enable-error-stack -d FourDimInts -s 0,0,0,0 -c 2,2,2,2 tints4dims.h5) + ADD_H5_TEST (tints4dimsBlock2 0 --enable-error-stack -d FourDimInts -s 0,0,0,0 -c 1,1,1,1 -k 2,2,2,2 tints4dims.h5) + ADD_H5_TEST (tints4dimsStride2 0 --enable-error-stack -d FourDimInts -s 0,0,0,0 -S 2,2,2,2 -c 2,2,2,2 tints4dims.h5) + ADD_H5_TEST (tints4dimsCountEq 0 --enable-error-stack -d FourDimInts -s 0,0,0,0 -S 2,2,1,1 -k 1,2,1,1 -c 2,2,4,4 tints4dims.h5) + ADD_H5_TEST (tints4dimsBlockEq 0 --enable-error-stack -d FourDimInts -s 0,0,0,0 -S 2,2,1,1 -c 2,2,1,1 -k 1,2,4,4 tints4dims.h5) + # test printing characters in ASCII instead of decimal ADD_H5_TEST (tchar1 0 --enable-error-stack -r tchar.h5) diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 80051d4..668e3f7 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -110,6 +110,7 @@ #define FILE78 "tscalarintattrsize.h5" #define FILE79 "tintsattrs.h5" #define FILE80 "tbitnopaque.h5" +#define FILE81 "tints4dims.h5" /*------------------------------------------------------------------------- * prototypes @@ -271,20 +272,20 @@ typedef struct s1_t { #define THRESHOLD10 10 /* Free space section threshold */ /* "FILE66" macros and for FILE69 */ -#define F66_XDIM 8 +#define F66_XDIM 8 #define F66_DATASETU08 "DU08BITS" #define F66_DATASETS08 "DS08BITS" -#define F66_YDIM8 8 +#define F66_YDIM8 8 #define F66_DATASETU16 "DU16BITS" #define F66_DATASETS16 "DS16BITS" -#define F66_YDIM16 16 +#define F66_YDIM16 16 #define F66_DATASETU32 "DU32BITS" #define F66_DATASETS32 "DS32BITS" -#define F66_YDIM32 32 +#define F66_YDIM32 32 #define F66_DATASETU64 "DU64BITS" #define F66_DATASETS64 "DS64BITS" #define F66_YDIM64 64 -#define F66_DUMMYDBL "DummyDBL" +#define F66_DUMMYDBL "DummyDBL" /* "FILE70" macros and for FILE71 */ /* Name of dataset to create in datafile */ @@ -352,6 +353,13 @@ typedef struct s1_t { #define F80_DIM32 32 +#define F81_DATASETNAME "FourDimInts" +#define F81_RANK 4 +#define F81_WDIM 10 +#define F81_XDIM 8 +#define F81_YDIM 6 +#define F81_ZDIM 4 + static void gent_group(void) { @@ -568,7 +576,7 @@ static void gent_softlink(void) * Function: gent_softlink2 * * Purpose: Create soft links to various objects. - * Return: + * Return: * SUCCEED * FAIL * Programmer: Jonathan Kim @@ -582,7 +590,7 @@ static int gent_softlink2(void) hid_t gid1 = -1, gid2 = -1; hid_t datatype = -1; hid_t dset1 = -1, dset2 = -1; - hid_t dataspace = -1; + hid_t dataspace = -1; hsize_t dimsf[2]; /* dataset dimensions */ int data1[NX][NY] = {{0,0},{1,1},{2,2},{3,3}}; int data2[NX][NY] = {{0,0},{0,1},{0,2},{3,3}}; @@ -626,7 +634,7 @@ static int gent_softlink2(void) status = H5Tcommit2(fileid1, "dtype", datatype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", FILE4_1); status = FAIL; goto out; } @@ -2896,9 +2904,9 @@ static void gent_vldatatypes5(void) } /* This is big enough to make h5dump to use hyperslap to read - from file and display portion by portion. This also prints out array indices + from file and display portion by portion. This also prints out array indices via region reference for testing refion reference output. - Note: this was added originally prepared for bug2092. before the fix h5dump didn't + Note: this was added originally prepared for bug2092. before the fix h5dump didn't display array indices every 262 x N (N > 0) based on 2000x1000 dims. */ #define SPACE_ARRAY1BIG_DIM 2000 @@ -2945,7 +2953,7 @@ static void gent_array1_big(void) fid1 = H5Fcreate(FILE25_BIG, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); /*------------------------- - * Array type dataset + * Array type dataset */ /* Create dataspace for datasets */ sid1 = H5Screate_simple(SPACE1_RANK, sdims1, NULL); @@ -2961,7 +2969,7 @@ static void gent_array1_big(void) HDassert(ret >= 0); /*--------------------------- - * Region Reference dataset + * Region Reference dataset */ /* Create dataspace for the reference dataset */ sid2 = H5Screate_simple(SPACE1_RANK, dims2, NULL); @@ -5210,7 +5218,7 @@ static void gent_zero_dim_size(void) space = H5Screate_simple(SPACE3_RANK, dims1, NULL); /* dataset */ - dataset = H5Dcreate2(fid, "dset of 0 dimension size", H5T_STD_I32BE, space, H5P_DEFAULT, + dataset = H5Dcreate2(fid, "dset of 0 dimension size", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); /* nothing should be written */ H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &dset_buf); @@ -7064,7 +7072,7 @@ gent_packedbits(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETU16, H5T_STD_U16LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - valu16bits = (uint16_t) ~0u; /* all 1s */ + valu16bits = (uint16_t) ~0u; /* all 1s */ for(i = 0; i < dims[0]; i++){ dsetu16[i][0] = valu16bits; for(j = 1; j < dims[1]; j++) @@ -7081,7 +7089,7 @@ gent_packedbits(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETU32, H5T_STD_U32LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - valu32bits = (uint32_t) ~0u; /* all 1s */ + valu32bits = (uint32_t) ~0u; /* all 1s */ for(i = 0; i < dims[0]; i++){ dsetu32[i][0] = valu32bits; for(j = 1; j < dims[1]; j++) @@ -7115,7 +7123,7 @@ gent_packedbits(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETS08, H5T_STD_I8LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - val8bits = (int8_t) ~0; /* all 1s */ + val8bits = (int8_t) ~0; /* all 1s */ for(i = 0; i < dims[0]; i++){ dset8[i][0] = val8bits; for(j = 1; j < dims[1]; j++) @@ -7132,7 +7140,7 @@ gent_packedbits(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETS16, H5T_STD_I16LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - val16bits = (int16_t) ~0; /* all 1s */ + val16bits = (int16_t) ~0; /* all 1s */ for(i = 0; i < dims[0]; i++){ dset16[i][0] = val16bits; for(j = 1; j < dims[1]; j++) @@ -7149,7 +7157,7 @@ gent_packedbits(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETS32, H5T_STD_I32LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - val32bits = (int32_t) ~0; /* all 1s */ + val32bits = (int32_t) ~0; /* all 1s */ for(i = 0; i < dims[0]; i++){ dset32[i][0] = val32bits; for(j = 1; j < dims[1]; j++) @@ -8638,7 +8646,7 @@ static void gent_compound_int_array(void) { valu8bits = (uint8_t) ~0u; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dsetu8[n] = valu8bits; + Cmpd1[m].dsetu8[n] = valu8bits; valu8bits <<= 1; } @@ -8647,7 +8655,7 @@ static void gent_compound_int_array(void) { valu16bits = (uint16_t) ~0u; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dsetu16[n] = valu16bits; + Cmpd1[m].dsetu16[n] = valu16bits; valu16bits <<= 1; } @@ -8656,7 +8664,7 @@ static void gent_compound_int_array(void) { valu32bits = (uint32_t) ~0u; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dsetu32[n] = valu32bits; + Cmpd1[m].dsetu32[n] = valu32bits; valu32bits <<= 1; } @@ -8665,7 +8673,7 @@ static void gent_compound_int_array(void) { valu64bits = (uint64_t) ~0Lu; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dsetu64[n] = valu64bits; + Cmpd1[m].dsetu64[n] = valu64bits; valu64bits <<= 1; } @@ -8674,7 +8682,7 @@ static void gent_compound_int_array(void) { val8bits = (int8_t) ~0; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dset8[n] = val8bits; + Cmpd1[m].dset8[n] = val8bits; val8bits <<= 1; } @@ -8683,7 +8691,7 @@ static void gent_compound_int_array(void) { val16bits = (int16_t) ~0; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dset16[n] = val16bits; + Cmpd1[m].dset16[n] = val16bits; val16bits <<= 1; } @@ -8692,7 +8700,7 @@ static void gent_compound_int_array(void) { val32bits = (int32_t) ~0; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dset32[n] = val32bits; + Cmpd1[m].dset32[n] = val32bits; val32bits <<= 1; } @@ -8701,7 +8709,7 @@ static void gent_compound_int_array(void) { val64bits = (int64_t) ~0L; /* all 1s */ for(n = 0; n < dims[0]; n++){ - Cmpd1[m].dset64[n] = val64bits; + Cmpd1[m].dset64[n] = val64bits; val64bits <<= 1; } @@ -8709,7 +8717,7 @@ static void gent_compound_int_array(void) { dims[0] = F76_DIM8; for(n = 0; n < dims[0]; n++) - Cmpd1[m].dsetdbl[n] = 0.0001F + n; + Cmpd1[m].dsetdbl[n] = 0.0001F + n; } /* Create the array data type for the 8 bits signed int array */ @@ -8884,64 +8892,64 @@ static void gent_compound_ints(void) { for (m = 0; m < F77_LENGTH; m++) { /* Array of 8 bits unsigned int */ - if((m % F76_DIM8) == 0) - valu8bits = (uint8_t) ~0u; /* all 1s */ - Cmpd1[m].dsetu8 = valu8bits; - Cmpd2[m].dsetu8 = valu8bits; + if((m % F76_DIM8) == 0) + valu8bits = (uint8_t) ~0u; /* all 1s */ + Cmpd1[m].dsetu8 = valu8bits; + Cmpd2[m].dsetu8 = valu8bits; valu8bits <<= 1; /* Array of 16 bits unsigned int */ - if((m % F76_DIM16) == 0) + if((m % F76_DIM16) == 0) valu16bits = (uint16_t) ~0u; /* all 1s */ - Cmpd1[m].dsetu16 = valu16bits; - Cmpd2[m].dsetu16 = valu16bits; - valu16bits <<= 1; + Cmpd1[m].dsetu16 = valu16bits; + Cmpd2[m].dsetu16 = valu16bits; + valu16bits <<= 1; /* Array of 32 bits unsigned int */ - if((m % F76_DIM32) == 0) + if((m % F76_DIM32) == 0) valu32bits = (uint32_t) ~0u; /* all 1s */ - Cmpd1[m].dsetu32 = valu32bits; - Cmpd2[m].dsetu32 = valu32bits; - valu32bits <<= 1; + Cmpd1[m].dsetu32 = valu32bits; + Cmpd2[m].dsetu32 = valu32bits; + valu32bits <<= 1; /* Array of 64 bits unsigned int */ - if((m % F76_DIM64) == 0) + if((m % F76_DIM64) == 0) valu64bits = (uint64_t) ~0Lu; /* all 1s */ - Cmpd1[m].dsetu64 = valu64bits; - Cmpd2[m].dsetu64 = valu64bits; - valu64bits <<= 1; + Cmpd1[m].dsetu64 = valu64bits; + Cmpd2[m].dsetu64 = valu64bits; + valu64bits <<= 1; /* Array of 8 bits signed int */ - if((m % F76_DIM8) == 0) + if((m % F76_DIM8) == 0) val8bits = (int8_t) ~0; /* all 1s */ - Cmpd1[m].dset8 = val8bits; - Cmpd2[m].dset8 = val8bits; - val8bits <<= 1; + Cmpd1[m].dset8 = val8bits; + Cmpd2[m].dset8 = val8bits; + val8bits <<= 1; /* Array of 16 bits signed int */ - if((m % F76_DIM16) == 0) + if((m % F76_DIM16) == 0) val16bits = (int16_t) ~0; /* all 1s */ - Cmpd1[m].dset16 = val16bits; - Cmpd2[m].dset16 = val16bits; - val16bits <<= 1; + Cmpd1[m].dset16 = val16bits; + Cmpd2[m].dset16 = val16bits; + val16bits <<= 1; /* Array of 32 bits signed int */ - if((m % F76_DIM32) == 0) + if((m % F76_DIM32) == 0) val32bits = (int32_t) ~0; /* all 1s */ - Cmpd1[m].dset32 = val32bits; - Cmpd2[m].dset32 = val32bits; - val32bits <<= 1; + Cmpd1[m].dset32 = val32bits; + Cmpd2[m].dset32 = val32bits; + val32bits <<= 1; /* Array of 64 bits signed int */ - if((m % F76_DIM64) == 0) + if((m % F76_DIM64) == 0) val64bits = (int64_t) ~0L; /* all 1s */ - Cmpd1[m].dset64 = val64bits; - Cmpd2[m].dset64 = val64bits; - val64bits <<= 1; + Cmpd1[m].dset64 = val64bits; + Cmpd2[m].dset64 = val64bits; + val64bits <<= 1; /* Double Dummy set for failure tests */ - Cmpd1[m].dsetdbl = 0.0001F + m; - Cmpd2[m].dsetdbl = 0.0001F + m; + Cmpd1[m].dsetdbl = 0.0001F + m; + Cmpd2[m].dsetdbl = 0.0001F + m; } /* Create the dataspace */ @@ -9352,7 +9360,7 @@ gent_intsattrs(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETU16, H5T_STD_U16LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - valu16bits = (uint16_t) ~0u; /* all 1s */ + valu16bits = (uint16_t) ~0u; /* all 1s */ for(i = 0; i < dims[0]; i++){ dsetu16[i][0] = valu16bits; asetu16[i*dims[1]] = dsetu16[i][0]; @@ -9379,7 +9387,7 @@ gent_intsattrs(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETU32, H5T_STD_U32LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - valu32bits = (uint32_t) ~0u; /* all 1s */ + valu32bits = (uint32_t) ~0u; /* all 1s */ for(i = 0; i < dims[0]; i++){ dsetu32[i][0] = valu32bits; asetu32[i*dims[1]] = dsetu32[i][0]; @@ -9433,7 +9441,7 @@ gent_intsattrs(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETS08, H5T_STD_I8LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - val8bits = (int8_t) ~0; /* all 1s */ + val8bits = (int8_t) ~0; /* all 1s */ for(i = 0; i < dims[0]; i++){ dset8[i][0] = val8bits; aset8[i*dims[1]] = dset8[i][0]; @@ -9460,7 +9468,7 @@ gent_intsattrs(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETS16, H5T_STD_I16LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - val16bits = (int16_t) ~0; /* all 1s */ + val16bits = (int16_t) ~0; /* all 1s */ for(i = 0; i < dims[0]; i++){ dset16[i][0] = val16bits; aset16[i*dims[1]] = dset16[i][0]; @@ -9487,7 +9495,7 @@ gent_intsattrs(void) space = H5Screate_simple(2, dims, NULL); dataset = H5Dcreate2(fid, F66_DATASETS32, H5T_STD_I32LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - val32bits = (int32_t) ~0; /* all 1s */ + val32bits = (int32_t) ~0; /* all 1s */ for(i = 0; i < dims[0]; i++){ dset32[i][0] = val32bits; aset32[i*dims[1]] = dset32[i][0]; @@ -9710,6 +9718,41 @@ static void gent_bitnopaquefields(void) H5Fclose(file); } +/*------------------------------------------------------------------------- + * Function: gent_intsfourdims + * + * Purpose: Generate a file to be used in the h5dump subsetting tests. + * One datasets of unsigned int types are created in four dimensions 2,4,6,10. + *------------------------------------------------------------------------- + */ +static void +gent_intsfourdims(void) +{ + hid_t fid, dataset, space, tid; + hsize_t dims[F81_RANK]; + uint32_t dset1[F81_ZDIM][F81_YDIM][F81_XDIM][F81_WDIM]; + unsigned int i, j, k, l; + + fid = H5Fcreate(FILE81, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + + /* Dataset of 32 bits unsigned int */ + dims[0] = F81_ZDIM; dims[1] = F81_YDIM; dims[2] = F81_XDIM; dims[3] = F81_WDIM; + space = H5Screate_simple(F81_RANK, dims, NULL); + dataset = H5Dcreate2(fid, F81_DATASETNAME, H5T_STD_U32LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + + for(i = 0; i < F81_ZDIM; i++) + for(j = 0; j < F81_YDIM; j++) + for(k = 0; k < F81_XDIM; k++) + for(l = 0; l < F81_WDIM; l++) + dset1[i][j][k][l] = i*F81_YDIM*F81_XDIM*F81_WDIM + j*F81_XDIM*F81_WDIM + k*F81_WDIM + l; + + H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1); + H5Sclose(space); + H5Dclose(dataset); + + H5Fclose(fid); +} + /*------------------------------------------------------------------------- * Function: main @@ -9802,6 +9845,8 @@ int main(void) gent_intsattrs(); gent_bitnopaquefields(); + gent_intsfourdims(); + return 0; } diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 267ac44..6d481c6 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -133,6 +133,7 @@ $SRC_H5DUMP_TESTFILES/tgrp_comments.h5 $SRC_H5DUMP_TESTFILES/thlink.h5 $SRC_H5DUMP_TESTFILES/thyperslab.h5 $SRC_H5DUMP_TESTFILES/tintsattrs.h5 +$SRC_H5DUMP_TESTFILES/tints4dims.h5 $SRC_H5DUMP_TESTFILES/tlarge_objname.h5 #$SRC_H5DUMP_TESTFILES/tldouble.h5 $SRC_H5DUMP_TESTFILES/tlonglinks.h5 @@ -265,6 +266,12 @@ $SRC_H5DUMP_TESTFILES/tindicessub2.ddl $SRC_H5DUMP_TESTFILES/tindicessub3.ddl $SRC_H5DUMP_TESTFILES/tindicessub4.ddl $SRC_H5DUMP_TESTFILES/tindicesyes.ddl +$SRC_H5DUMP_TESTFILES/tints4dims.ddl +$SRC_H5DUMP_TESTFILES/tints4dimsBlock2.ddl +$SRC_H5DUMP_TESTFILES/tints4dimsBlockEq.ddl +$SRC_H5DUMP_TESTFILES/tints4dimsCount2.ddl +$SRC_H5DUMP_TESTFILES/tints4dimsCountEq.ddl +$SRC_H5DUMP_TESTFILES/tints4dimsStride2.ddl $SRC_H5DUMP_TESTFILES/tintsattrs.ddl $SRC_H5DUMP_TESTFILES/tlarge_objname.ddl #$SRC_H5DUMP_TESTFILES/tldouble.ddl @@ -1106,6 +1113,12 @@ TOOLTEST tall-5s.ddl --enable-error-stack -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall. TOOLTEST tdset-3s.ddl --enable-error-stack -d "/dset1[1,1;;;]" tdset.h5 TOOLTEST tno-subset.ddl --enable-error-stack --no-compact-subset -d "AHFINDERDIRECT::ah_centroid_t[0] it=0 tl=0" tno-subset.h5 +TOOLTEST tints4dimsCount2.ddl --enable-error-stack -d FourDimInts -s 0,0,0,0 -c 2,2,2,2 tints4dims.h5 +TOOLTEST tints4dimsBlock2.ddl --enable-error-stack -d FourDimInts -s 0,0,0,0 -c 1,1,1,1 -k 2,2,2,2 tints4dims.h5 +TOOLTEST tints4dimsStride2.ddl --enable-error-stack -d FourDimInts -s 0,0,0,0 -S 2,2,2,2 -c 2,2,2,2 tints4dims.h5 +TOOLTEST tints4dimsCountEq.ddl --enable-error-stack -d FourDimInts -s 0,0,0,0 -S 2,2,1,1 -k 1,2,1,1 -c 2,2,4,4 tints4dims.h5 +TOOLTEST tints4dimsBlockEq.ddl --enable-error-stack -d FourDimInts -s 0,0,0,0 -S 2,2,1,1 -c 2,2,1,1 -k 1,2,4,4 tints4dims.h5 + # test printing characters in ASCII instead of decimal TOOLTEST tchar1.ddl --enable-error-stack -r tchar.h5 diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index b6a53f3..5fb35bf 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -1359,7 +1359,7 @@ h5tools_display_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools if (ctx->ndims > 2) { for (i = 0; i < (size_t) ctx->ndims - 2; i++) { - max_start[i] = temp_start[i] + sset->count.data[i]; + max_start[i] = temp_start[i] + sset->count.data[i] * sset->stride.data[i]; temp_count[i] = 1; } } @@ -1401,14 +1401,10 @@ h5tools_display_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools /* increment start dimension */ do { reset_dim = 0; - temp_start[current_outer_dim]++; + temp_start[current_outer_dim] += sset->stride.data[current_outer_dim]; if (temp_start[current_outer_dim] >= max_start[current_outer_dim]) { temp_start[current_outer_dim] = sset->start.data[current_outer_dim]; - /* consider block */ - if (sset->block.data[current_outer_dim] > 1) - temp_start[current_outer_dim]++; - current_outer_dim--; reset_dim = 1; } diff --git a/tools/testfiles/tints4dims.ddl b/tools/testfiles/tints4dims.ddl new file mode 100644 index 0000000..ba5c852 --- /dev/null +++ b/tools/testfiles/tints4dims.ddl @@ -0,0 +1,202 @@ +HDF5 "tints4dims.h5" { +GROUP "/" { + DATASET "FourDimInts" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 4, 6, 8, 10 ) / ( 4, 6, 8, 10 ) } + DATA { + (0,0,0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + (0,0,1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + (0,0,2,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + (0,0,3,0): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + (0,0,4,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + (0,0,5,0): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + (0,0,6,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + (0,0,7,0): 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + (0,1,0,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + (0,1,1,0): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + (0,1,2,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + (0,1,3,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + (0,1,4,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + (0,1,5,0): 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + (0,1,6,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + (0,1,7,0): 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + (0,2,0,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + (0,2,1,0): 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + (0,2,2,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + (0,2,3,0): 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, + (0,2,4,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + (0,2,5,0): 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + (0,2,6,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + (0,2,7,0): 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + (0,3,0,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + (0,3,1,0): 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + (0,3,2,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, + (0,3,3,0): 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + (0,3,4,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, + (0,3,5,0): 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, + (0,3,6,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, + (0,3,7,0): 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + (0,4,0,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + (0,4,1,0): 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, + (0,4,2,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, + (0,4,3,0): 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, + (0,4,4,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, + (0,4,5,0): 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, + (0,4,6,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, + (0,4,7,0): 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, + (0,5,0,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, + (0,5,1,0): 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, + (0,5,2,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, + (0,5,3,0): 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, + (0,5,4,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, + (0,5,5,0): 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, + (0,5,6,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, + (0,5,7,0): 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, + (1,0,0,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, + (1,0,1,0): 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, + (1,0,2,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, + (1,0,3,0): 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, + (1,0,4,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, + (1,0,5,0): 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, + (1,0,6,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, + (1,0,7,0): 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, + (1,1,0,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, + (1,1,1,0): 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, + (1,1,2,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, + (1,1,3,0): 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, + (1,1,4,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, + (1,1,5,0): 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, + (1,1,6,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, + (1,1,7,0): 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, + (1,2,0,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, + (1,2,1,0): 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, + (1,2,2,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, + (1,2,3,0): 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, + (1,2,4,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, + (1,2,5,0): 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, + (1,2,6,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, + (1,2,7,0): 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, + (1,3,0,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, + (1,3,1,0): 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, + (1,3,2,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, + (1,3,3,0): 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, + (1,3,4,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, + (1,3,5,0): 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, + (1,3,6,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, + (1,3,7,0): 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, + (1,4,0,0): 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, + (1,4,1,0): 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, + (1,4,2,0): 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, + (1,4,3,0): 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, + (1,4,4,0): 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, + (1,4,5,0): 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, + (1,4,6,0): 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, + (1,4,7,0): 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, + (1,5,0,0): 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, + (1,5,1,0): 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, + (1,5,2,0): 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, + (1,5,3,0): 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, + (1,5,4,0): 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, + (1,5,5,0): 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, + (1,5,6,0): 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, + (1,5,7,0): 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, + (2,0,0,0): 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, + (2,0,1,0): 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, + (2,0,2,0): 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, + (2,0,3,0): 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, + (2,0,4,0): 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, + (2,0,5,0): 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, + (2,0,6,0): 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, + (2,0,7,0): 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, + (2,1,0,0): 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, + (2,1,1,0): 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, + (2,1,2,0): 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, + (2,1,3,0): 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, + (2,1,4,0): 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, + (2,1,5,0): 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, + (2,1,6,0): 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, + (2,1,7,0): 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, + (2,2,0,0): 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, + (2,2,1,0): 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, + (2,2,2,0): 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, + (2,2,3,0): 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, + (2,2,4,0): 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, + (2,2,5,0): 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, + (2,2,6,0): 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, + (2,2,7,0): 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1199, + (2,3,0,0): 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, + (2,3,1,0): 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, + (2,3,2,0): 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, + (2,3,3,0): 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, + (2,3,4,0): 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, + (2,3,5,0): 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, + (2,3,6,0): 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, + (2,3,7,0): 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, + (2,4,0,0): 1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, + (2,4,1,0): 1290, 1291, 1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299, + (2,4,2,0): 1300, 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, + (2,4,3,0): 1310, 1311, 1312, 1313, 1314, 1315, 1316, 1317, 1318, 1319, + (2,4,4,0): 1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, + (2,4,5,0): 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, + (2,4,6,0): 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, + (2,4,7,0): 1350, 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, + (2,5,0,0): 1360, 1361, 1362, 1363, 1364, 1365, 1366, 1367, 1368, 1369, + (2,5,1,0): 1370, 1371, 1372, 1373, 1374, 1375, 1376, 1377, 1378, 1379, + (2,5,2,0): 1380, 1381, 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1389, + (2,5,3,0): 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1399, + (2,5,4,0): 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, + (2,5,5,0): 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1418, 1419, + (2,5,6,0): 1420, 1421, 1422, 1423, 1424, 1425, 1426, 1427, 1428, 1429, + (2,5,7,0): 1430, 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1439, + (3,0,0,0): 1440, 1441, 1442, 1443, 1444, 1445, 1446, 1447, 1448, 1449, + (3,0,1,0): 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, + (3,0,2,0): 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, + (3,0,3,0): 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, + (3,0,4,0): 1480, 1481, 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, + (3,0,5,0): 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, + (3,0,6,0): 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, + (3,0,7,0): 1510, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1518, 1519, + (3,1,0,0): 1520, 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, + (3,1,1,0): 1530, 1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, + (3,1,2,0): 1540, 1541, 1542, 1543, 1544, 1545, 1546, 1547, 1548, 1549, + (3,1,3,0): 1550, 1551, 1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559, + (3,1,4,0): 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1567, 1568, 1569, + (3,1,5,0): 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, + (3,1,6,0): 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, + (3,1,7,0): 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, + (3,2,0,0): 1600, 1601, 1602, 1603, 1604, 1605, 1606, 1607, 1608, 1609, + (3,2,1,0): 1610, 1611, 1612, 1613, 1614, 1615, 1616, 1617, 1618, 1619, + (3,2,2,0): 1620, 1621, 1622, 1623, 1624, 1625, 1626, 1627, 1628, 1629, + (3,2,3,0): 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 1638, 1639, + (3,2,4,0): 1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 1649, + (3,2,5,0): 1650, 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658, 1659, + (3,2,6,0): 1660, 1661, 1662, 1663, 1664, 1665, 1666, 1667, 1668, 1669, + (3,2,7,0): 1670, 1671, 1672, 1673, 1674, 1675, 1676, 1677, 1678, 1679, + (3,3,0,0): 1680, 1681, 1682, 1683, 1684, 1685, 1686, 1687, 1688, 1689, + (3,3,1,0): 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1698, 1699, + (3,3,2,0): 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, + (3,3,3,0): 1710, 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, + (3,3,4,0): 1720, 1721, 1722, 1723, 1724, 1725, 1726, 1727, 1728, 1729, + (3,3,5,0): 1730, 1731, 1732, 1733, 1734, 1735, 1736, 1737, 1738, 1739, + (3,3,6,0): 1740, 1741, 1742, 1743, 1744, 1745, 1746, 1747, 1748, 1749, + (3,3,7,0): 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, 1759, + (3,4,0,0): 1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, + (3,4,1,0): 1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, + (3,4,2,0): 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789, + (3,4,3,0): 1790, 1791, 1792, 1793, 1794, 1795, 1796, 1797, 1798, 1799, + (3,4,4,0): 1800, 1801, 1802, 1803, 1804, 1805, 1806, 1807, 1808, 1809, + (3,4,5,0): 1810, 1811, 1812, 1813, 1814, 1815, 1816, 1817, 1818, 1819, + (3,4,6,0): 1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, + (3,4,7,0): 1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, + (3,5,0,0): 1840, 1841, 1842, 1843, 1844, 1845, 1846, 1847, 1848, 1849, + (3,5,1,0): 1850, 1851, 1852, 1853, 1854, 1855, 1856, 1857, 1858, 1859, + (3,5,2,0): 1860, 1861, 1862, 1863, 1864, 1865, 1866, 1867, 1868, 1869, + (3,5,3,0): 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877, 1878, 1879, + (3,5,4,0): 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, + (3,5,5,0): 1890, 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, + (3,5,6,0): 1900, 1901, 1902, 1903, 1904, 1905, 1906, 1907, 1908, 1909, + (3,5,7,0): 1910, 1911, 1912, 1913, 1914, 1915, 1916, 1917, 1918, 1919 + } + } +} +} diff --git a/tools/testfiles/tints4dims.h5 b/tools/testfiles/tints4dims.h5 new file mode 100644 index 0000000..2fe8321 Binary files /dev/null and b/tools/testfiles/tints4dims.h5 differ diff --git a/tools/testfiles/tints4dimsBlock2.ddl b/tools/testfiles/tints4dimsBlock2.ddl new file mode 100644 index 0000000..f414e10 --- /dev/null +++ b/tools/testfiles/tints4dimsBlock2.ddl @@ -0,0 +1,16 @@ +HDF5 "tints4dims.h5" { +DATASET "FourDimInts" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 4, 6, 8, 10 ) / ( 4, 6, 8, 10 ) } + SUBSET { + START ( 0, 0, 0, 0 ); + STRIDE ( 1, 1, 1, 1 ); + COUNT ( 1, 1, 1, 1 ); + BLOCK ( 2, 2, 2, 2 ); + DATA { + (0,0,0,0): 0, 1, 80, 81, 480, 481, 560, 561, + (0,0,1,0): 10, 11, 90, 91, 490, 491, 570, 571 + } + } +} +} diff --git a/tools/testfiles/tints4dimsBlockEq.ddl b/tools/testfiles/tints4dimsBlockEq.ddl new file mode 100644 index 0000000..6625780 --- /dev/null +++ b/tools/testfiles/tints4dimsBlockEq.ddl @@ -0,0 +1,30 @@ +HDF5 "tints4dims.h5" { +DATASET "FourDimInts" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 4, 6, 8, 10 ) / ( 4, 6, 8, 10 ) } + SUBSET { + START ( 0, 0, 0, 0 ); + STRIDE ( 2, 2, 1, 1 ); + COUNT ( 2, 2, 1, 1 ); + BLOCK ( 1, 2, 4, 4 ); + DATA { + (0,0,0,0): 0, 1, 2, 3, 80, 81, 82, 83, + (0,0,1,0): 10, 11, 12, 13, 90, 91, 92, 93, + (0,0,2,0): 20, 21, 22, 23, 100, 101, 102, 103, + (0,0,3,0): 30, 31, 32, 33, 110, 111, 112, 113 + (0,2,0,0): 160, 161, 162, 163, 240, 241, 242, 243, + (0,2,1,0): 170, 171, 172, 173, 250, 251, 252, 253, + (0,2,2,0): 180, 181, 182, 183, 260, 261, 262, 263, + (0,2,3,0): 190, 191, 192, 193, 270, 271, 272, 273 + (2,0,0,0): 960, 961, 962, 963, 1040, 1041, 1042, 1043, + (2,0,1,0): 970, 971, 972, 973, 1050, 1051, 1052, 1053, + (2,0,2,0): 980, 981, 982, 983, 1060, 1061, 1062, 1063, + (2,0,3,0): 990, 991, 992, 993, 1070, 1071, 1072, 1073 + (2,2,0,0): 1120, 1121, 1122, 1123, 1200, 1201, 1202, 1203, + (2,2,1,0): 1130, 1131, 1132, 1133, 1210, 1211, 1212, 1213, + (2,2,2,0): 1140, 1141, 1142, 1143, 1220, 1221, 1222, 1223, + (2,2,3,0): 1150, 1151, 1152, 1153, 1230, 1231, 1232, 1233 + } + } +} +} diff --git a/tools/testfiles/tints4dimsCount2.ddl b/tools/testfiles/tints4dimsCount2.ddl new file mode 100644 index 0000000..500e418 --- /dev/null +++ b/tools/testfiles/tints4dimsCount2.ddl @@ -0,0 +1,22 @@ +HDF5 "tints4dims.h5" { +DATASET "FourDimInts" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 4, 6, 8, 10 ) / ( 4, 6, 8, 10 ) } + SUBSET { + START ( 0, 0, 0, 0 ); + STRIDE ( 1, 1, 1, 1 ); + COUNT ( 2, 2, 2, 2 ); + BLOCK ( 1, 1, 1, 1 ); + DATA { + (0,0,0,0): 0, 1, + (0,0,1,0): 10, 11 + (0,1,0,0): 80, 81, + (0,1,1,0): 90, 91 + (1,0,0,0): 480, 481, + (1,0,1,0): 490, 491 + (1,1,0,0): 560, 561, + (1,1,1,0): 570, 571 + } + } +} +} diff --git a/tools/testfiles/tints4dimsCountEq.ddl b/tools/testfiles/tints4dimsCountEq.ddl new file mode 100644 index 0000000..8b17bfc --- /dev/null +++ b/tools/testfiles/tints4dimsCountEq.ddl @@ -0,0 +1,30 @@ +HDF5 "tints4dims.h5" { +DATASET "FourDimInts" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 4, 6, 8, 10 ) / ( 4, 6, 8, 10 ) } + SUBSET { + START ( 0, 0, 0, 0 ); + STRIDE ( 2, 2, 1, 1 ); + COUNT ( 2, 2, 4, 4 ); + BLOCK ( 1, 2, 1, 1 ); + DATA { + (0,0,0,0): 0, 1, 2, 3, 80, 81, 82, 83, + (0,0,1,0): 10, 11, 12, 13, 90, 91, 92, 93, + (0,0,2,0): 20, 21, 22, 23, 100, 101, 102, 103, + (0,0,3,0): 30, 31, 32, 33, 110, 111, 112, 113 + (0,2,0,0): 160, 161, 162, 163, 240, 241, 242, 243, + (0,2,1,0): 170, 171, 172, 173, 250, 251, 252, 253, + (0,2,2,0): 180, 181, 182, 183, 260, 261, 262, 263, + (0,2,3,0): 190, 191, 192, 193, 270, 271, 272, 273 + (2,0,0,0): 960, 961, 962, 963, 1040, 1041, 1042, 1043, + (2,0,1,0): 970, 971, 972, 973, 1050, 1051, 1052, 1053, + (2,0,2,0): 980, 981, 982, 983, 1060, 1061, 1062, 1063, + (2,0,3,0): 990, 991, 992, 993, 1070, 1071, 1072, 1073 + (2,2,0,0): 1120, 1121, 1122, 1123, 1200, 1201, 1202, 1203, + (2,2,1,0): 1130, 1131, 1132, 1133, 1210, 1211, 1212, 1213, + (2,2,2,0): 1140, 1141, 1142, 1143, 1220, 1221, 1222, 1223, + (2,2,3,0): 1150, 1151, 1152, 1153, 1230, 1231, 1232, 1233 + } + } +} +} diff --git a/tools/testfiles/tints4dimsStride2.ddl b/tools/testfiles/tints4dimsStride2.ddl new file mode 100644 index 0000000..7ec98fc --- /dev/null +++ b/tools/testfiles/tints4dimsStride2.ddl @@ -0,0 +1,22 @@ +HDF5 "tints4dims.h5" { +DATASET "FourDimInts" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 4, 6, 8, 10 ) / ( 4, 6, 8, 10 ) } + SUBSET { + START ( 0, 0, 0, 0 ); + STRIDE ( 2, 2, 2, 2 ); + COUNT ( 2, 2, 2, 2 ); + BLOCK ( 1, 1, 1, 1 ); + DATA { + (0,0,0,0): 0, 2, + (0,0,2,0): 20, 22 + (0,2,0,0): 160, 162, + (0,2,2,0): 180, 182 + (2,0,0,0): 960, 962, + (2,0,2,0): 980, 982 + (2,2,0,0): 1120, 1122, + (2,2,2,0): 1140, 1142 + } + } +} +} -- cgit v0.12