mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r29884] VDS correction for get_space_status, with test change.

Browse Source 
Add new files for repack tests.
Add repack tests for VDS files.
This commit is contained in:
Allen Byrne 2016-05-04 11:38:08 -05:00
parent f962c3d963
commit 2f1b517021
12 changed files with 738 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MANIFEST
View File

@ -2239,10 +2239,16 @@
./tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
./tools/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
./tools/h5repack/testfiles/h5repack-help.txt
./tools/h5repack/testfiles/h5repack_filters.h5.tst
./tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
./tools/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10x5.tst
./tools/h5repack/testfiles/h5repack_layout.h5.ddl
./tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
./tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
./tools/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
./tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
./tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
./tools/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
./tools/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
# jam utility and tests
./tools/h5jam/h5jam.c

60
src/H5Dint.c
View File

@ -528,39 +528,47 @@ H5D__get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hid_t dxpl_id
HDassert(dset);
/* Get the dataset's dataspace */
HDassert(dset->shared->space);
/* Check for chunked layout */
if(dset->shared->layout.type == H5D_CHUNKED) {
/* For chunked layout set the space status by the storage size */
/* Get the dataset's dataspace */
HDassert(dset->shared->space);
/* Get the total number of elements in dataset's dataspace */
if((snelmts = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve number of elements in dataspace")
nelmts = (hsize_t)snelmts;
/* Get the total number of elements in dataset's dataspace */
if((snelmts = H5S_GET_EXTENT_NPOINTS(dset->shared->space)) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve number of elements in dataspace")
nelmts = (hsize_t)snelmts;
/* Get the size of the dataset's datatype */
if(0 == (dt_size = H5T_GET_SIZE(dset->shared->type)))
HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve size of datatype")
/* Get the size of the dataset's datatype */
if(0 == (dt_size = H5T_GET_SIZE(dset->shared->type)))
HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to retrieve size of datatype")
/* Compute the maximum size of the dataset in bytes */
full_size = nelmts * dt_size;
/* Compute the maximum size of the dataset in bytes */
full_size = nelmts * dt_size;
/* Check for overflow during multiplication */
if(nelmts != (full_size / dt_size))
HGOTO_ERROR(H5E_DATASET, H5E_OVERFLOW, FAIL, "size of dataset's storage overflowed")
/* Check for overflow during multiplication */
if(nelmts != (full_size / dt_size))
HGOTO_ERROR(H5E_DATASET, H5E_OVERFLOW, FAIL, "size of dataset's storage overflowed")
/* Difficult to error check, since the error value is 0 and 0 is a valid value... :-/ */
if(H5D__get_storage_size(dset, dxpl_id, &space_allocated) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get size of dataset's storage")
/* Difficult to error check, since the error value is 0 and 0 is a valid value... :-/ */
if(H5D__get_storage_size(dset, dxpl_id, &space_allocated) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get size of dataset's storage")
/* Decide on how much of the space is allocated */
if(space_allocated == 0)
*allocation = H5D_SPACE_STATUS_NOT_ALLOCATED;
else if(space_allocated == full_size)
*allocation = H5D_SPACE_STATUS_ALLOCATED;
/* Decide on how much of the space is allocated */
if(space_allocated == 0)
*allocation = H5D_SPACE_STATUS_NOT_ALLOCATED;
else if(space_allocated == full_size)
*allocation = H5D_SPACE_STATUS_ALLOCATED;
else
*allocation = H5D_SPACE_STATUS_PART_ALLOCATED;
} /* end if */
else {
/* Should only happen for chunked datasets currently */
HDassert(dset->shared->layout.type == H5D_CHUNKED);
*allocation = H5D_SPACE_STATUS_PART_ALLOCATED;
/* For non-chunked layouts set space status by result of is_space_alloc
* function */
if(dset->shared->layout.ops->is_space_alloc(&dset->shared->layout.storage))
*allocation = H5D_SPACE_STATUS_ALLOCATED;
else
*allocation = H5D_SPACE_STATUS_NOT_ALLOCATED;
} /* end else */
done:

13
test/vds.c
View File

@ -332,6 +332,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
{
hid_t file = -1; /* File */
hid_t dset = -1; /* Virtual dataset */
H5D_space_status_t space_status; /* Dataset space status */
void *plist_buf = NULL; /* Serialized property list buffer */
H5O_info_t oinfo; /* Object info struct */
htri_t tri_ret;
@ -352,6 +353,12 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
if((dset = H5Dcreate2(file, "vdset", H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
TEST_ERROR
/* Test H5Dget_space_status */
if(H5Dget_space_status(dset, &space_status) < 0)
TEST_ERROR
if(space_status != H5D_SPACE_STATUS_ALLOCATED)
TEST_ERROR
/* Reopen dataset if requested */
if(config >= TEST_API_REOPEN_DSET) {
/* Close dataset */
@ -401,6 +408,12 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
if(oinfo.meta_size.attr.index_size != (hsize_t)0)
TEST_ERROR
/* Test H5Dget_space_status */
if(H5Dget_space_status(dset, &space_status) < 0)
TEST_ERROR
if(space_status != H5D_SPACE_STATUS_ALLOCATED)
TEST_ERROR
/* Close dataset */
if(H5Dclose(dset) < 0)
TEST_ERROR

207
tools/h5repack/CMakeTests.cmake
View File

@ -66,41 +66,41 @@
# h5diff/testfile
${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
# tools/testfiles
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00000.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00001.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00002.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00003.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00004.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00005.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00006.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00007.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00008.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00009.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00010.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5
${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5
# tools/testfiles/vds
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_a.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_b.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_c.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_d.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_e.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_f.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_vds.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_a.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_b.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_c.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_d.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_e.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_vds.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/3_1_vds.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/3_2_vds.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_0.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_1.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_2.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_vds.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_a.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_b.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_c.h5
${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_vds.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5
${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5
${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5
${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5
${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5
${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5
${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5
${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5
${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5
${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5
${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5
${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5
${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5
${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5
${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5
${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5
${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5
${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
)
set (LIST_OTHER_TEST_FILES
@ -110,11 +110,17 @@
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack.info
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5.tst
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5.tst
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5.tst
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_compa-v.ddl
${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_conti-v.ddl
)
foreach (h5_file ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
@ -238,7 +244,7 @@
-D "TEST_OUTPUT=${resultfile}-${testname}.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_FILTER:STRING=${testfilter}"
-D "TEST_REFERENCE=${resultfile}.tst"
-D "TEST_REFERENCE=${resultfile}-${testname}.tst"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif (HDF5_ENABLE_USING_MEMCHECKER)
@ -248,6 +254,40 @@
endif ("${testtype}" STREQUAL "SKIP")
ENDMACRO (ADD_H5_CMP_TEST)
MACRO (ADD_H5_MASK_TEST testname testtype resultcode resultfile)
if ("${testtype}" STREQUAL "SKIP")
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_MASK-${testname}-SKIPPED
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
)
endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
else ("${testtype}" STREQUAL "SKIP")
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_MASK-${testname}
COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile})
else (HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_MASK-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
-D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-D "TEST_OUTPUT=${resultfile}-${testname}.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_MASK_ERROR=true"
-D "TEST_REFERENCE=${resultfile}-${testname}.tst"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif (HDF5_ENABLE_USING_MEMCHECKER)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
endif ("${testtype}" STREQUAL "SKIP")
ENDMACRO (ADD_H5_MASK_TEST)
MACRO (ADD_H5_DMP_TEST testname testtype resultcode resultfile)
if ("${testtype}" STREQUAL "SKIP")
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
@ -349,22 +389,22 @@
if ("${testtype}" STREQUAL "SKIP")
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}-SKIPPED
NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}-SKIPPED
COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
)
endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
else ("${testtype}" STREQUAL "SKIP")
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}
NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}
COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS ${last_test})
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP
NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=-d;${testdset};-p;out-${testname}.${testfile}"
@ -374,8 +414,8 @@
-D "TEST_REFERENCE=${testfile}-${testname}-v.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname})
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname})
endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
endif ("${testtype}" STREQUAL "SKIP")
ENDMACRO (ADD_H5_VERIFY_VDS)
@ -505,6 +545,8 @@
./testfiles/h5repack_layout.h5-deflate_limit.out.err
./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out
./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out.err
./testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.out
./testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.out.err
./testfiles/h5repack_layout.h5-dset2_compa-v.out
./testfiles/h5repack_layout.h5-dset2_compa-v.out.err
./testfiles/h5repack_layout.h5-dset2_conti-v.out
@ -620,36 +662,21 @@
./testfiles/out-meta_short_N.meta_short.h5
./testfiles/out-meta_long_M.meta_long.h5
./testfiles/out-meta_long_N.meta_long.h5
./testfiles/1_vds.h5-vds_dset_compa-v.out
./testfiles/1_vds.h5-vds_dset_compa-v.out.err
./testfiles/1_vds.h5-vds_dset_conti-v.out
./testfiles/1_vds.h5-vds_dset_conti-v.out.err
./testfiles/2_vds.h5-vds_null_compa-v.out
./testfiles/2_vds.h5-vds_null_compa-v.out.err
./testfiles/2_vds.h5-vds_null_conti-v.out
./testfiles/2_vds.h5-vds_null_conti-v.out.err
./testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.out
./testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.out.err
./testfiles/2_vds.h5-vds_chunk3x6x9-v.out
./testfiles/2_vds.h5-vds_chunk3x6x9-v.out.err
./testfiles/3_1_vds.h5-vds_chunk2x5x8-v.out
./testfiles/3_1_vds.h5-vds_chunk2x5x8-v.out.err
./testfiles/4_vds.h5-vds_compa-v.out
./testfiles/4_vds.h5-vds_compa-v.out.err
./testfiles/4_vds.h5-vds_compa_compa-v.out
./testfiles/4_vds.h5-vds_compa_compa-v.out.err
./testfiles/4_vds.h5-vds_compa_conti-v.out
./testfiles/4_vds.h5-vds_compa_conti-v.out.err
./testfiles/4_vds.h5-vds_conti-v.out
./testfiles/4_vds.h5-vds_conti-v.out.err
./testfiles/4_vds.h5-vds_conti_compa-v.out
./testfiles/4_vds.h5-vds_conti_compa-v.out.err
./testfiles/4_vds.h5-vds_conti_conti-v.out
./testfiles/4_vds.h5-vds_conti_conti-v.out.err
./testfiles/out-vds_compa.4_vds.h5
./testfiles/out-vds_compa_compa.4_vds.h5
./testfiles/out-vds_compa_conti.4_vds.h5
./testfiles/out-vds_conti.4_vds.h5
./testfiles/out-vds_conti_compa.4_vds.h5
./testfiles/out-vds_conti_conti.4_vds.h5
./testfiles/out-vds_dset_compa.1_vds.h5
./testfiles/out-vds_dset_conti.1_vds.h5
./testfiles/out-vds_null_compa.2_vds.h5
./testfiles/out-vds_null_conti.2_vds.h5
./testfiles/out-vds_chunk2x5x8.3_1_vds.h5
./testfiles/out-vds_chunk3x6x9.2_vds.h5
./testfiles/out-vds_dset_chunk20x10x5.1_vds.h5
h5repack_attr.h5
h5repack_attr_out.h5
h5repack_attr_refs.h5
@ -941,6 +968,7 @@
ADD_H5_VERIFY_TEST (conti "TEST" 1 ${FILE4} null CONTIGUOUS -l CONTI)
ADD_H5_VERIFY_TEST (dset2_compa "TEST" 0 ${FILE4} dset2 COMPACT -l dset2:COMPA)
ADD_H5_VERIFY_TEST (compa "TEST" 1 ${FILE4} null COMPACT -l COMPA)
ADD_H5_MASK_TEST (dset2_chunk_20x10-errstk "TEST" 0 ${FILE4} --layout=dset2:CHUNK=20x10x5 --enable-error-stack)
################################################################
# layout conversions (file has no filters)
@ -1085,25 +1113,38 @@
# VDS tests
#########################################################
# layout options
#########################################################
# skip tests because of HDFFV-9756
ADD_H5_VERIFY_VDS (vds_dset_conti "SKIP" 0 ${FILEV1} vds_dset CONTIGUOUS -l vds_dset:CONTI)
ADD_H5_VERIFY_VDS (vds_null_conti "SKIP" 1 ${FILEV2} null CONTIGUOUS -l CONTI)
ADD_H5_VERIFY_VDS (vds_dset_compa "SKIP" 0 ${FILEV1} vds_dset COMPACT -l vds_dset:COMPA)
ADD_H5_VERIFY_VDS (vds_null_compa "SKIP" 1 ${FILEV2} null COMPACT -l COMPA)
################################################################
# layout conversions
###############################################################
# skip tests because of HDFFV-9756
ADD_H5_VERIFY_VDS (vds_compa_conti "SKIP" 0 ${FILEV4} vds_dset CONTIGUOUS -l vds_dset:CONTI)
ADD_H5_VERIFY_VDS (vds_compa_compa "SKIP" 0 ${FILEV4} vds_dset COMPACT -l vds_dset:COMPA)
ADD_H5_VERIFY_VDS (vds_conti_compa "SKIP" 0 ${FILEV4} vds_dset COMPACT -l vds_dset:COMPA)
ADD_H5_VERIFY_VDS (vds_conti_conti "SKIP" 0 ${FILEV4} vds_dset CONTIGUOUS -l vds_dset:CONTI)
ADD_H5_VERIFY_VDS (vds_compa "SKIP" 0 ${FILEV4} vds_dset COMPACT -l vds_dset:COMPA)
ADD_H5_VERIFY_VDS (vds_conti "SKIP" 0 ${FILEV4} vds_dset CONTIGUOUS -l vds_dset:CONTI)
set (TESTTYPE "TEST")
if (NOT USE_FILTER_DEFLATE)
set (TESTTYPE "SKIP")
endif (NOT USE_FILTER_DEFLATE)
ADD_H5_VERIFY_VDS (vds_dset_chunk20x10x5 ${TESTTYPE} 0 ${FILEV1} vds_dset CHUNKED -l vds_dset:CHUNK=20x10x5)
set (TESTTYPE "TEST")
if (NOT USE_FILTER_DEFLATE)
set (TESTTYPE "SKIP")
endif (NOT USE_FILTER_DEFLATE)
ADD_H5_VERIFY_VDS (vds_chunk2x5x8 ${TESTTYPE} 0 ${FILEV3_1} vds_dset CHUNKED -l vds_dset:CHUNK=2x5x8)
set (TESTTYPE "TEST")
if (NOT USE_FILTER_DEFLATE)
set (TESTTYPE "SKIP")
endif (NOT USE_FILTER_DEFLATE)
ADD_H5_VERIFY_VDS (vds_chunk3x6x9 ${TESTTYPE} 0 ${FILEV2} vds_dset CHUNKED -l vds_dset:CHUNK=3x6x9)
set (TESTTYPE "TEST")
if (NOT USE_FILTER_DEFLATE)
set (TESTTYPE "SKIP")
endif (NOT USE_FILTER_DEFLATE)
ADD_H5_VERIFY_VDS (vds_compa ${TESTTYPE} 0 ${FILEV4} vds_dset COMPACT -l vds_dset:COMPA)
set (TESTTYPE "TEST")
if (NOT USE_FILTER_DEFLATE)
set (TESTTYPE "SKIP")
endif (NOT USE_FILTER_DEFLATE)
ADD_H5_VERIFY_VDS (vds_conti ${TESTTYPE} 0 ${FILEV4} vds_dset CONTIGUOUS -l vds_dset:CONTI)
##############################################################################
### P L U G I N T E S T S

155
tools/h5repack/h5repack.sh.in
View File

@ -147,9 +147,15 @@ $SRC_H5REPACK_TESTFILES/ublock.bin
$SRC_H5REPACK_TESTFILES/h5repack.info
$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl
$SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl
$SRC_H5REPACK_TESTFILES/h5repack_filters.h5.tst
$SRC_H5REPACK_TESTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
$SRC_H5REPACK_TESTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
$SRC_H5REPACK_TESTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl
$SRC_H5REPACK_TESTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl
$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_compa-v.ddl
$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_conti-v.ddl
"
#
@ -173,7 +179,7 @@ COPY_TESTFILES_TO_TESTDIR()
INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
$CP -f $tstfile $TESTDIR
$CP -f $tstfile $TESTDIR
if [ $? -ne 0 ]; then
echo "Error: FAILED to copy $tstfile ."
@ -190,7 +196,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
# skip rm if srcdir is same as destdir
# this occurs when build/test performed in source dir and
# make cp fail
SDIR=`$DIRNAME $SRC_H5REPACK_TESTFILES/h5repack-help.txt`
SDIR=$SRC_H5REPACK_TESTFILES
INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
@ -535,11 +541,11 @@ TOOLTEST1()
)
RET=$?
if [ $RET != 0 ] ; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
else
echo " PASSED"
DIFFTEST $infile $outfile
echo " PASSED"
DIFFTEST $infile $outfile
fi
rm -f $outfile
}
@ -549,7 +555,7 @@ TOOLTEST1()
#
TOOLTESTV()
{
expect="$TESTDIR/$2.tst"
expect="$TESTDIR/$2-$1.tst"
actual="$TESTDIR/`basename $2 .ddl`.out"
actual_err="$TESTDIR/`basename $2 .ddl`.err"
@ -566,11 +572,11 @@ TOOLTESTV()
) >$actual 2>$actual_err
RET=$?
if [ $RET != 0 ] ; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
else
echo " PASSED"
DIFFTEST $infile $outfile
echo " PASSED"
DIFFTEST $infile $outfile
fi
# display output compare
@ -591,6 +597,62 @@ TOOLTESTV()
rm -f $outfile
}
# same as TOOLTESTV but filters error stack output and compares to an error file
# Extract file name, line number, version and thread IDs because they may be different
# ADD_H5ERR_MASK_TEST
TOOLTESTM() {
expect="$TESTDIR/$2-$1.tst"
actual="$TESTDIR/`basename $2 .tst`.out"
actual_err="$TESTDIR/`basename $2 .tst`.oerr"
actual_sav=${actual}-sav
actual_err_sav=${actual_err}-sav
infile=$2
outfile=out-$1.$2
shift
shift
# Run test.
TESTING $H5REPACK $@
(
cd $TESTDIR
$RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
) >$actual 2>$actual_err
# save actual and actual_err in case they are needed later.
cp $actual $actual_sav
cp $actual_err $actual_err_sav
# Extract file name, line number, version and thread IDs because they may be different
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
-e 's/line [0-9]*/line (number)/' \
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
-e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
-e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
$actual_err > $actual
if [ ! -f $expect ]; then
# Create the expect file if it doesn't yet exist.
echo " CREATED"
cp $actual $expect
elif $CMP $expect $actual; then
echo " PASSED"
else
echo "*FAILED*"
echo " Expected result (*.tst) differs from actual result (*.out)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
fi
# Clean up output file
if test -z "$HDF5_NOCLEANUP"; then
rm -f $actual $actual_err $actual_sav $actual_err_sav
fi
}
# This is same as TOOLTESTV() with comparing h5dump output
# from -pH option
#
@ -700,16 +762,17 @@ TOOLTEST_META()
# verify sizes.
MESSAGE "Verify the sizes of both output files ($size1 vs $size2)"
if [ $size1 -lt $size2 ]; then
# pass
echo " PASSED"
# pass
echo " PASSED"
else
#fail
echo "*FAILED*"
#fail
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
fi
rm -f $outfile
}
# ADD_HELP_TEST
TOOLTEST_HELP() {
@ -777,7 +840,7 @@ USE_FILTER_SZIP_ENCODER=`$RUNSERIAL $H5DETECTSZIP_BIN`
fi
##############################################################################
### T H E T E S T S
### T H E T E S T S
##############################################################################
# prepare for test
COPY_TESTFILES_TO_TESTDIR
@ -999,6 +1062,8 @@ VERIFY_LAYOUT_DSET dset2_compa h5repack_layout.h5 dset2 COMPACT -l dset2:COMPA
VERIFY_LAYOUT_ALL compa h5repack_layout.h5 COMPACT -l COMPA
TOOLTESTM dset2_chunk_20x10-errstk h5repack_layout.h5 --layout=dset2:CHUNK=20x10x5 --enable-error-stack
################################################################
# layout conversions (file has no filters)
###############################################################
@ -1154,36 +1219,38 @@ TOOLTEST_META meta_long h5repack_layout.h5 --metadata_block_size=8192
# VDS tests
#########################################################
# layout options
#########################################################
# skip tests because of HDFFV-9756
#VERIFY_LAYOUT_VDS vds_dset_conti 1_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
#VERIFY_LAYOUT_ALL vds_null_conti 2_vds.h5 CONTIGUOUS -l CONTI
# skip test because of HDFFV-9756
#VERIFY_LAYOUT_VDS vds_dset_compa 1_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
#VERIFY_LAYOUT_ALL vds_null_compa 2_vds.h5 COMPACT -l COMPA
SKIP vds_dset_conti 1_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
SKIP vds_null_conti 2_vds.h5 CONTIGUOUS -l CONTI
SKIP vds_dset_compa 1_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
SKIP vds_null_compa 2_vds.h5 COMPACT -l COMPA
################################################################
# layout conversions
###############################################################
# skip tests because of HDFFV-9756
#VERIFY_LAYOUT_VDS vds_compa_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
#VERIFY_LAYOUT_VDS vds_compa_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
#VERIFY_LAYOUT_VDS vds_conti_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
#VERIFY_LAYOUT_VDS vds_conti_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
#VERIFY_LAYOUT_VDS vds_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
#VERIFY_LAYOUT_VDS vds_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
SKIP vds_compa_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
SKIP vds_compa_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
SKIP vds_conti_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
SKIP vds_conti_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
SKIP vds_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
SKIP vds_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
if test $USE_FILTER_DEFLATE != "yes" ; then
SKIP vds_dset_chunk_20x10x5
else
VERIFY_LAYOUT_VDS vds_dset_chunk_20x10x5 1_vds.h5 vds_dset CHUNKED --layout vds_dset:CHUNK=20x10x5
fi
if test $USE_FILTER_DEFLATE != "yes" ; then
SKIP vds_chunk2x5x8
else
VERIFY_LAYOUT_VDS vds_chunk2x5x8 3_1_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=2x5x8
fi
if test $USE_FILTER_DEFLATE != "yes" ; then
SKIP vds_chunk3x6x9
else
VERIFY_LAYOUT_VDS vds_chunk3x6x9 2_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=3x6x9
fi
if test $USE_FILTER_DEFLATE != "yes" ; then
SKIP vds_compa 4_vds.h5
else
VERIFY_LAYOUT_VDS vds_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
fi
if test $USE_FILTER_DEFLATE != "yes" ; then
SKIP vds_conti 4_vds.h5
else
VERIFY_LAYOUT_VDS vds_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
fi
# Clean up temporary files/directories
CLEAN_TESTFILES_AND_TESTDIR

112
tools/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl Normal file
View File

@ -0,0 +1,112 @@
HDF5 "out-vds_dset_chunk20x10x5.1_vds.h5" {
DATASET "vds_dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 5, 18, 8 ) / ( H5S_UNLIMITED, 18, 8 ) }
STORAGE_LAYOUT {
CHUNKED ( 20, 10, 5 )
SIZE 16000
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE -9
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_INCR
}
DATA {
(0,0,0): 10, 10, 10, 10, 10, 10, 10, 10,
(0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
(0,2,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,3,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,4,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,5,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,6,0): 30, 30, 30, 30, 30, 30, 30, 30,
(0,7,0): 30, 30, 30, 30, 30, 30, 30, 30,
(0,8,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,9,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,10,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,11,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,12,0): 50, 50, 50, 50, 50, 50, 50, 50,
(0,13,0): 50, 50, 50, 50, 50, 50, 50, 50,
(0,14,0): 60, 60, 60, 60, 60, 60, 60, 60,
(0,15,0): 60, 60, 60, 60, 60, 60, 60, 60,
(0,16,0): 60, 60, 60, 60, 60, 60, 60, 60,
(0,17,0): 60, 60, 60, 60, 60, 60, 60, 60,
(1,0,0): 11, 11, 11, 11, 11, 11, 11, 11,
(1,1,0): 11, 11, 11, 11, 11, 11, 11, 11,
(1,2,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,3,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,4,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,5,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,6,0): 31, 31, 31, 31, 31, 31, 31, 31,
(1,7,0): 31, 31, 31, 31, 31, 31, 31, 31,
(1,8,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,9,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,10,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,11,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,12,0): 51, 51, 51, 51, 51, 51, 51, 51,
(1,13,0): 51, 51, 51, 51, 51, 51, 51, 51,
(1,14,0): 61, 61, 61, 61, 61, 61, 61, 61,
(1,15,0): 61, 61, 61, 61, 61, 61, 61, 61,
(1,16,0): 61, 61, 61, 61, 61, 61, 61, 61,
(1,17,0): 61, 61, 61, 61, 61, 61, 61, 61,
(2,0,0): 12, 12, 12, 12, 12, 12, 12, 12,
(2,1,0): 12, 12, 12, 12, 12, 12, 12, 12,
(2,2,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,3,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,4,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,5,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,6,0): 32, 32, 32, 32, 32, 32, 32, 32,
(2,7,0): 32, 32, 32, 32, 32, 32, 32, 32,
(2,8,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,9,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,10,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,11,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,12,0): 52, 52, 52, 52, 52, 52, 52, 52,
(2,13,0): 52, 52, 52, 52, 52, 52, 52, 52,
(2,14,0): 62, 62, 62, 62, 62, 62, 62, 62,
(2,15,0): 62, 62, 62, 62, 62, 62, 62, 62,
(2,16,0): 62, 62, 62, 62, 62, 62, 62, 62,
(2,17,0): 62, 62, 62, 62, 62, 62, 62, 62,
(3,0,0): 13, 13, 13, 13, 13, 13, 13, 13,
(3,1,0): 13, 13, 13, 13, 13, 13, 13, 13,
(3,2,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,3,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,4,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,5,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,6,0): 33, 33, 33, 33, 33, 33, 33, 33,
(3,7,0): 33, 33, 33, 33, 33, 33, 33, 33,
(3,8,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,9,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,10,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,11,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,12,0): 53, 53, 53, 53, 53, 53, 53, 53,
(3,13,0): 53, 53, 53, 53, 53, 53, 53, 53,
(3,14,0): 63, 63, 63, 63, 63, 63, 63, 63,
(3,15,0): 63, 63, 63, 63, 63, 63, 63, 63,
(3,16,0): 63, 63, 63, 63, 63, 63, 63, 63,
(3,17,0): 63, 63, 63, 63, 63, 63, 63, 63,
(4,0,0): 14, 14, 14, 14, 14, 14, 14, 14,
(4,1,0): 14, 14, 14, 14, 14, 14, 14, 14,
(4,2,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,3,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,4,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,5,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,6,0): 34, 34, 34, 34, 34, 34, 34, 34,
(4,7,0): 34, 34, 34, 34, 34, 34, 34, 34,
(4,8,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,9,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,10,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,11,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,12,0): 54, 54, 54, 54, 54, 54, 54, 54,
(4,13,0): 54, 54, 54, 54, 54, 54, 54, 54,
(4,14,0): 64, 64, 64, 64, 64, 64, 64, 64,
(4,15,0): 64, 64, 64, 64, 64, 64, 64, 64,
(4,16,0): 64, 64, 64, 64, 64, 64, 64, 64,
(4,17,0): 64, 64, 64, 64, 64, 64, 64, 64
}
}
}

70
tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl Normal file
View File

@ -0,0 +1,70 @@
HDF5 "out-vds_chunk3x6x9.2_vds.h5" {
DATASET "vds_dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6, 8, 14 ) / ( H5S_UNLIMITED, 8, 14 ) }
STORAGE_LAYOUT {
CHUNKED ( 3, 6, 9 )
SIZE 5184
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE -9
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_INCR
}
DATA {
(0,0,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
(0,1,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
(0,2,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
(0,3,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
(0,4,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
(0,5,0): 20, 20, 20, 20, 20, 20, 20, 50, 50, 50, 50, 50, 50, 50,
(0,6,0): 30, 30, 30, 30, 30, 30, 30, 50, 50, 50, 50, 50, 50, 50,
(0,7,0): 30, 30, 30, 30, 30, 30, 30, 50, 50, 50, 50, 50, 50, 50,
(1,0,0): 11, 11, 11, 11, 11, 11, 11, 41, 41, 41, 41, 41, 41, 41,
(1,1,0): 11, 11, 11, 11, 11, 11, 11, 41, 41, 41, 41, 41, 41, 41,
(1,2,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
(1,3,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
(1,4,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
(1,5,0): 21, 21, 21, 21, 21, 21, 21, 51, 51, 51, 51, 51, 51, 51,
(1,6,0): 31, 31, 31, 31, 31, 31, 31, 51, 51, 51, 51, 51, 51, 51,
(1,7,0): 31, 31, 31, 31, 31, 31, 31, 51, 51, 51, 51, 51, 51, 51,
(2,0,0): 12, 12, 12, 12, 12, 12, 12, 42, 42, 42, 42, 42, 42, 42,
(2,1,0): 12, 12, 12, 12, 12, 12, 12, 42, 42, 42, 42, 42, 42, 42,
(2,2,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
(2,3,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
(2,4,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
(2,5,0): 22, 22, 22, 22, 22, 22, 22, 52, 52, 52, 52, 52, 52, 52,
(2,6,0): 32, 32, 32, 32, 32, 32, 32, 52, 52, 52, 52, 52, 52, 52,
(2,7,0): 32, 32, 32, 32, 32, 32, 32, 52, 52, 52, 52, 52, 52, 52,
(3,0,0): 13, 13, 13, 13, 13, 13, 13, 43, 43, 43, 43, 43, 43, 43,
(3,1,0): 13, 13, 13, 13, 13, 13, 13, 43, 43, 43, 43, 43, 43, 43,
(3,2,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
(3,3,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
(3,4,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
(3,5,0): 23, 23, 23, 23, 23, 23, 23, 53, 53, 53, 53, 53, 53, 53,
(3,6,0): 33, 33, 33, 33, 33, 33, 33, 53, 53, 53, 53, 53, 53, 53,
(3,7,0): 33, 33, 33, 33, 33, 33, 33, 53, 53, 53, 53, 53, 53, 53,
(4,0,0): 14, 14, 14, 14, 14, 14, 14, 44, 44, 44, 44, 44, 44, 44,
(4,1,0): 14, 14, 14, 14, 14, 14, 14, 44, 44, 44, 44, 44, 44, 44,
(4,2,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
(4,3,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
(4,4,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
(4,5,0): 24, 24, 24, 24, 24, 24, 24, 54, 54, 54, 54, 54, 54, 54,
(4,6,0): 34, 34, 34, 34, 34, 34, 34, 54, 54, 54, 54, 54, 54, 54,
(4,7,0): 34, 34, 34, 34, 34, 34, 34, 54, 54, 54, 54, 54, 54, 54,
(5,0,0): 15, 15, 15, 15, 15, 15, 15, 45, 45, 45, 45, 45, 45, 45,
(5,1,0): 15, 15, 15, 15, 15, 15, 15, 45, 45, 45, 45, 45, 45, 45,
(5,2,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
(5,3,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
(5,4,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
(5,5,0): 25, 25, 25, 25, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55,
(5,6,0): 35, 35, 35, 35, 35, 35, 35, 55, 55, 55, 55, 55, 55, 55,
(5,7,0): 35, 35, 35, 35, 35, 35, 35, 55, 55, 55, 55, 55, 55, 55
}
}
}

147
tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl Normal file
View File

@ -0,0 +1,147 @@
HDF5 "out-vds_chunk2x5x8.3_1_vds.h5" {
DATASET "vds_dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 5, 25, 8 ) / ( H5S_UNLIMITED, 25, 8 ) }
STORAGE_LAYOUT {
CHUNKED ( 2, 5, 8 )
SIZE 4800
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE -9
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_INCR
}
DATA {
(0,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
(0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
(0,2,0): 10, 10, 10, 10, 10, 10, 10, 10,
(0,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
(0,4,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,5,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,6,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,7,0): 20, 20, 20, 20, 20, 20, 20, 20,
(0,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
(0,9,0): 30, 30, 30, 30, 30, 30, 30, 30,
(0,10,0): 30, 30, 30, 30, 30, 30, 30, 30,
(0,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
(0,12,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,13,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,14,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,15,0): 40, 40, 40, 40, 40, 40, 40, 40,
(0,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
(0,17,0): 50, 50, 50, 50, 50, 50, 50, 50,
(0,18,0): 50, 50, 50, 50, 50, 50, 50, 50,
(0,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
(0,20,0): 60, 60, 60, 60, 60, 60, 60, 60,
(0,21,0): 60, 60, 60, 60, 60, 60, 60, 60,
(0,22,0): 60, 60, 60, 60, 60, 60, 60, 60,
(0,23,0): 60, 60, 60, 60, 60, 60, 60, 60,
(0,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
(1,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
(1,1,0): 11, 11, 11, 11, 11, 11, 11, 11,
(1,2,0): 11, 11, 11, 11, 11, 11, 11, 11,
(1,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
(1,4,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,5,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,6,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,7,0): 21, 21, 21, 21, 21, 21, 21, 21,
(1,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
(1,9,0): 31, 31, 31, 31, 31, 31, 31, 31,
(1,10,0): 31, 31, 31, 31, 31, 31, 31, 31,
(1,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
(1,12,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,13,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,14,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,15,0): 41, 41, 41, 41, 41, 41, 41, 41,
(1,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
(1,17,0): 51, 51, 51, 51, 51, 51, 51, 51,
(1,18,0): 51, 51, 51, 51, 51, 51, 51, 51,
(1,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
(1,20,0): 61, 61, 61, 61, 61, 61, 61, 61,
(1,21,0): 61, 61, 61, 61, 61, 61, 61, 61,
(1,22,0): 61, 61, 61, 61, 61, 61, 61, 61,
(1,23,0): 61, 61, 61, 61, 61, 61, 61, 61,
(1,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
(2,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
(2,1,0): 12, 12, 12, 12, 12, 12, 12, 12,
(2,2,0): 12, 12, 12, 12, 12, 12, 12, 12,
(2,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
(2,4,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,5,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,6,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,7,0): 22, 22, 22, 22, 22, 22, 22, 22,
(2,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
(2,9,0): 32, 32, 32, 32, 32, 32, 32, 32,
(2,10,0): 32, 32, 32, 32, 32, 32, 32, 32,
(2,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
(2,12,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,13,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,14,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,15,0): 42, 42, 42, 42, 42, 42, 42, 42,
(2,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
(2,17,0): 52, 52, 52, 52, 52, 52, 52, 52,
(2,18,0): 52, 52, 52, 52, 52, 52, 52, 52,
(2,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
(2,20,0): 62, 62, 62, 62, 62, 62, 62, 62,
(2,21,0): 62, 62, 62, 62, 62, 62, 62, 62,
(2,22,0): 62, 62, 62, 62, 62, 62, 62, 62,
(2,23,0): 62, 62, 62, 62, 62, 62, 62, 62,
(2,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
(3,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
(3,1,0): 13, 13, 13, 13, 13, 13, 13, 13,
(3,2,0): 13, 13, 13, 13, 13, 13, 13, 13,
(3,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
(3,4,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,5,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,6,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,7,0): 23, 23, 23, 23, 23, 23, 23, 23,
(3,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
(3,9,0): 33, 33, 33, 33, 33, 33, 33, 33,
(3,10,0): 33, 33, 33, 33, 33, 33, 33, 33,
(3,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
(3,12,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,13,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,14,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,15,0): 43, 43, 43, 43, 43, 43, 43, 43,
(3,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
(3,17,0): 53, 53, 53, 53, 53, 53, 53, 53,
(3,18,0): 53, 53, 53, 53, 53, 53, 53, 53,
(3,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
(3,20,0): 63, 63, 63, 63, 63, 63, 63, 63,
(3,21,0): 63, 63, 63, 63, 63, 63, 63, 63,
(3,22,0): 63, 63, 63, 63, 63, 63, 63, 63,
(3,23,0): 63, 63, 63, 63, 63, 63, 63, 63,
(3,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
(4,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
(4,1,0): 14, 14, 14, 14, 14, 14, 14, 14,
(4,2,0): 14, 14, 14, 14, 14, 14, 14, 14,
(4,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
(4,4,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,5,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,6,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,7,0): 24, 24, 24, 24, 24, 24, 24, 24,
(4,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
(4,9,0): 34, 34, 34, 34, 34, 34, 34, 34,
(4,10,0): 34, 34, 34, 34, 34, 34, 34, 34,
(4,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
(4,12,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,13,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,14,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,15,0): 44, 44, 44, 44, 44, 44, 44, 44,
(4,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
(4,17,0): 54, 54, 54, 54, 54, 54, 54, 54,
(4,18,0): 54, 54, 54, 54, 54, 54, 54, 54,
(4,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
(4,20,0): 64, 64, 64, 64, 64, 64, 64, 64,
(4,21,0): 64, 64, 64, 64, 64, 64, 64, 64,
(4,22,0): 64, 64, 64, 64, 64, 64, 64, 64,
(4,23,0): 64, 64, 64, 64, 64, 64, 64, 64,
(4,24,0): -9, -9, -9, -9, -9, -9, -9, -9
}
}
}

58
tools/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl Normal file
View File

@ -0,0 +1,58 @@
HDF5 "out-vds_compa.4_vds.h5" {
DATASET "vds_dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
STORAGE_LAYOUT {
COMPACT
SIZE 576
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE -9
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_EARLY
}
DATA {
(0,0,0): 10, 10, 10, 10,
(0,1,0): 10, 10, 10, 10,
(0,2,0): 10, 10, 10, 10,
(0,3,0): 10, 10, 10, 10,
(1,0,0): 11, 11, 11, 11,
(1,1,0): 11, 11, 11, 11,
(1,2,0): 11, 11, 11, 11,
(1,3,0): 11, 11, 11, 11,
(2,0,0): 12, 12, 12, 12,
(2,1,0): 12, 12, 12, 12,
(2,2,0): 12, 12, 12, 12,
(2,3,0): 12, 12, 12, 12,
(3,0,0): 20, 20, 20, 20,
(3,1,0): 20, 20, 20, 20,
(3,2,0): 20, 20, 20, 20,
(3,3,0): 20, 20, 20, 20,
(4,0,0): 21, 21, 21, 21,
(4,1,0): 21, 21, 21, 21,
(4,2,0): 21, 21, 21, 21,
(4,3,0): 21, 21, 21, 21,
(5,0,0): 22, 22, 22, 22,
(5,1,0): 22, 22, 22, 22,
(5,2,0): 22, 22, 22, 22,
(5,3,0): 22, 22, 22, 22,
(6,0,0): 30, 30, 30, 30,
(6,1,0): 30, 30, 30, 30,
(6,2,0): 30, 30, 30, 30,
(6,3,0): 30, 30, 30, 30,
(7,0,0): 31, 31, 31, 31,
(7,1,0): 31, 31, 31, 31,
(7,2,0): 31, 31, 31, 31,
(7,3,0): 31, 31, 31, 31,
(8,0,0): 32, 32, 32, 32,
(8,1,0): 32, 32, 32, 32,
(8,2,0): 32, 32, 32, 32,
(8,3,0): 32, 32, 32, 32
}
}
}

59
tools/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl Normal file
View File

@ -0,0 +1,59 @@
HDF5 "out-vds_conti.4_vds.h5" {
DATASET "vds_dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 576
OFFSET 2144
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE -9
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
DATA {
(0,0,0): 10, 10, 10, 10,
(0,1,0): 10, 10, 10, 10,
(0,2,0): 10, 10, 10, 10,
(0,3,0): 10, 10, 10, 10,
(1,0,0): 11, 11, 11, 11,
(1,1,0): 11, 11, 11, 11,
(1,2,0): 11, 11, 11, 11,
(1,3,0): 11, 11, 11, 11,
(2,0,0): 12, 12, 12, 12,
(2,1,0): 12, 12, 12, 12,
(2,2,0): 12, 12, 12, 12,
(2,3,0): 12, 12, 12, 12,
(3,0,0): 20, 20, 20, 20,
(3,1,0): 20, 20, 20, 20,
(3,2,0): 20, 20, 20, 20,
(3,3,0): 20, 20, 20, 20,
(4,0,0): 21, 21, 21, 21,
(4,1,0): 21, 21, 21, 21,
(4,2,0): 21, 21, 21, 21,
(4,3,0): 21, 21, 21, 21,
(5,0,0): 22, 22, 22, 22,
(5,1,0): 22, 22, 22, 22,
(5,2,0): 22, 22, 22, 22,
(5,3,0): 22, 22, 22, 22,
(6,0,0): 30, 30, 30, 30,
(6,1,0): 30, 30, 30, 30,
(6,2,0): 30, 30, 30, 30,
(6,3,0): 30, 30, 30, 30,
(7,0,0): 31, 31, 31, 31,
(7,1,0): 31, 31, 31, 31,
(7,2,0): 31, 31, 31, 31,
(7,3,0): 31, 31, 31, 31,
(8,0,0): 32, 32, 32, 32,
(8,1,0): 32, 32, 32, 32,
(8,2,0): 32, 32, 32, 32,
(8,3,0): 32, 32, 32, 32
}
}
}

3
tools/h5repack/testfiles/h5repack-help.txt
View File

@ -33,6 +33,9 @@ usage: h5repack [OPTIONS] file1 file2
F - is the shared object header message type, any of <dspace|dtype|fill|
pline|attr>. If F is not specified, S applies to all messages
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
FS_STRGY is the file space management strategy to use for the output file.
It is a string as listed below:
ALL_PERSIST - Use persistent free-space managers, aggregators and virtual file driver

13
tools/h5repack/testfiles/h5repack_filters.h5.tst
View File

@ -1,13 +0,0 @@
Objects to modify layout are...
Objects to apply filter are...
</dset_deflate> with GZIP filter
</dset_deflate>...Found
-----------------------------------------
Type Filter (Compression) Name
-----------------------------------------
group /
dset /dset_all
dset GZIP (0.995:1) /dset_deflate
dset /dset_fletcher32
dset /dset_nbit
dset /dset_shuffle