From 955c0736022947649441634f7ee3dc5c973085d4 Mon Sep 17 00:00:00 2001 From: Vailin Choi Date: Mon, 6 Jan 2014 13:21:40 -0500 Subject: [svn-r24613] Bring revision #24609 from revise_chunks. h5committested. --- CMakeInstallation.cmake | 35 +- MANIFEST | 4 +- bin/reconfigure | 42 +-- release_docs/RELEASE.txt | 12 +- tools/h5dump/CMakeTests.cmake | 3 +- tools/h5dump/errfiles/treadfilter.err | 59 --- tools/h5dump/testh5dump.sh.in | 3 +- tools/h5repack/CMakeTests.cmake | 8 +- tools/h5repack/testfiles/h5repack_layout.UD.h5 | Bin 0 -> 43744 bytes .../h5repack_layout.UD.h5-plugin_none.ddl | 130 +++++++ .../plugin_none.h5repack_layout.UD.h5.tst | 14 + tools/testfiles/treadfilter.ddl | 402 +++------------------ 12 files changed, 246 insertions(+), 466 deletions(-) delete mode 100644 tools/h5dump/errfiles/treadfilter.err create mode 100644 tools/h5repack/testfiles/h5repack_layout.UD.h5 create mode 100644 tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl create mode 100644 tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 1a4c2fa..5929380 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -230,23 +230,24 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) SET (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif") SET (CPACK_SET_DESTDIR TRUE) # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/". -# LIST (APPEND CPACK_GENERATOR "Bundle") - SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}") - SET (CPACK_BUNDLE_LOCATION "/") # make sure CMAKE_INSTALL_PREFIX ends in / - SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/") - SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif") - SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist") -# SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh") - SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities") - SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.") - SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}") - #----------------------------------------------------------------------------- - # Configure the Info.plist file for the install bundle - #----------------------------------------------------------------------------- - CONFIGURE_FILE ( - ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in - ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY - ) + IF (HDF5_PACK_MACOSX_BUNDLE) + LIST (APPEND CPACK_GENERATOR "Bundle") + SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}") + SET (CPACK_BUNDLE_LOCATION "/") # make sure CMAKE_INSTALL_PREFIX ends in / + SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/") + SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif") + SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist") + SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities") + SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.") + SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}") + #----------------------------------------------------------------------------- + # Configure the Info.plist file for the install bundle + #----------------------------------------------------------------------------- + CONFIGURE_FILE ( + ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in + ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY + ) + ENDIF(HDF5_PACK_MACOSX_BUNDLE) ELSE (WIN32) LIST (APPEND CPACK_GENERATOR "STGZ") SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr") diff --git a/MANIFEST b/MANIFEST index e112829..ff1baff 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1734,7 +1734,6 @@ ./tools/h5dump/errfiles/tpbitsOffsetExceeded.err ./tools/h5dump/errfiles/tpbitsOffsetNegative.err ./tools/h5dump/errfiles/tperror.err -./tools/h5dump/errfiles/treadfilter.err ./tools/h5dump/errfiles/tqmarkfile.err ./tools/h5dump/errfiles/tslink-D.err @@ -2199,6 +2198,7 @@ ./tools/h5repack/testfiles/h5repack_layouto.h5 ./tools/h5repack/testfiles/h5repack_layout2.h5 ./tools/h5repack/testfiles/h5repack_layout3.h5 +./tools/h5repack/testfiles/h5repack_layout.UD.h5 ./tools/h5repack/testfiles/h5repack_named_dtypes.h5 ./tools/h5repack/testfiles/h5repack_nbit.h5 ./tools/h5repack/testfiles/h5repack_objs.h5 @@ -2208,10 +2208,12 @@ ./tools/h5repack/testfiles/h5repack_szip.h5 ./tools/h5repack/testfiles/ublock.bin ./tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl +./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_layout.h5.ddl +./tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl ./tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl # jam utility and tests diff --git a/bin/reconfigure b/bin/reconfigure index c058a1e..dba5a67 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -29,9 +29,9 @@ # HDF5 currently uses the following versions of the autotools: AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.69" -AUTOMAKE_VERSION="automake (GNU automake) 1.13.4" +AUTOMAKE_VERSION="automake (GNU automake) 1.12.3" AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.69" -ACLOCAL_VERSION="aclocal (GNU automake) 1.13.4" +ACLOCAL_VERSION="aclocal (GNU automake) 1.12.3" LIBTOOL_VERSION="(GNU libtool) 2.4.2" M4_VERSION="m4 (GNU M4) 1.4.16" @@ -42,26 +42,23 @@ M4_VERSION="m4 (GNU M4) 1.4.16" # If paths to autotools are not specified by the user, assume tools are # running on jam in /mnt/hdf/packages and set paths accordingly. -if test -z ${AUTORECONF}; then - AUTORECONF=/usr/bin/autoreconf -fi if test -z ${AUTOCONF}; then - AUTOCONF=/usr/bin/autoconf + AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoconf fi if test -z ${AUTOMAKE}; then - AUTOMAKE=/usr/bin/automake-1.13 + AUTOMAKE=/mnt/hdf/packages/automake/automake-1.12.3/bin/automake-1.12 fi if test -z ${AUTOHEADER}; then - AUTOHEADER=/usr/bin/autoheader + AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoheader fi if test -z ${ACLOCAL}; then - ACLOCAL=/usr/bin/aclocal-1.13 + ACLOCAL=/mnt/hdf/packages/automake/automake-1.12.3/bin/aclocal-1.12 fi if test -z ${LIBTOOL}; then - LIBTOOL=/usr/bin/libtool + LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.4.2/bin/libtool fi if test -z ${M4}; then - M4=/usr/bin/m4 + M4=/mnt/hdf/packages/m4/m4-1.4.16/bin/m4 fi # Check version numbers of all autotools against the "correct" versions @@ -103,20 +100,17 @@ M4_DIR=`dirname ${M4}` PATH=${AUTOCONF_DIR}:${M4_DIR}:$PATH # Run autoconf/automake commands in order -# echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal -# ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal || exit 1 -# -# echo ${AUTOHEADER} -# ${AUTOHEADER} || exit 1 -# -# echo ${AUTOMAKE} --add-missing -# ${AUTOMAKE} --add-missing || exit 1 -# -# echo ${AUTOCONF} -# ${AUTOCONF} || exit 1 + echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal + ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal || exit 1 + + echo ${AUTOHEADER} + ${AUTOHEADER} || exit 1 + + echo ${AUTOMAKE} --add-missing + ${AUTOMAKE} --add-missing || exit 1 - echo ${AUTORECONF} - ${AUTORECONF} || exit 1 + echo ${AUTOCONF} + ${AUTOCONF} || exit 1 # Clean up top-level Makefile.in # pmake wants an argument to be the first non-comment line it encounters diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index bb496cc..8e265e7b 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1311,14 +1311,14 @@ The following platforms are not supported but have been tested for this release. GNU Fortran (SUSE Linux) 4.7.2 (cmake and autotools) - Ubuntu 13.04 3.8.0-30-generic #44-Ubuntu SMP i686 GNU/Linux - gcc (Ubuntu/Linaro 4.7.3-1ubuntu1) 4.7.3 - GNU Fortran (Ubuntu/Linaro 4.6.3-1ubuntu1) 4.7.3 + Ubuntu 13.10 3.11.0-13-generic #20-Ubuntu SMP i686 GNU/Linux + gcc (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1 + GNU Fortran (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1 (cmake and autotools) - Ubuntu 13.04 3.8.0-30-generic #44-Ubuntu SMP x86_64 GNU/Linux - gcc (Ubuntu/Linaro 4.7.3-1ubuntu1) 4.7.3 - GNU Fortran (Ubuntu/Linaro 4.7.3-1ubuntu1) 4.7.3 + Ubuntu 13.10 3.11.0-13-generic #20-Ubuntu SMP x86_64 GNU/Linux + gcc (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1 + GNU Fortran (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1 (cmake and autotools) Cray Linux Environment (CLE) PrgEnv-pgi/4.0.46 diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index 9626183..13c3d41 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -303,7 +303,6 @@ ${PROJECT_SOURCE_DIR}/errfiles/torderlinks2.err ${PROJECT_SOURCE_DIR}/errfiles/tgroup-2.err ${PROJECT_SOURCE_DIR}/errfiles/tperror.err - ${PROJECT_SOURCE_DIR}/errfiles/treadfilter.err ${PROJECT_SOURCE_DIR}/errfiles/tslink-D.err ) @@ -1356,7 +1355,7 @@ ADD_H5_TEST (treadintfilter 0 --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5) IF (HDF5_ENABLE_SZIP_SUPPORT) # data read all filters - ADD_H5ERR_MASK_TEST (treadfilter 1 --enable-error-stack tfilters.h5) + ADD_H5_TEST (treadfilter 0 --enable-error-stack -d all -d szip tfilters.h5) ENDIF (HDF5_ENABLE_SZIP_SUPPORT) ENDIF (USE_FILTER_DEFLATE AND USE_FILTER_SHUFFLE AND USE_FILTER_FLETCHER32 AND USE_FILTER_NBIT AND USE_FILTER_SCALEOFFSET) diff --git a/tools/h5dump/errfiles/treadfilter.err b/tools/h5dump/errfiles/treadfilter.err deleted file mode 100644 index 9f3fe31..0000000 --- a/tools/h5dump/errfiles/treadfilter.err +++ /dev/null @@ -1,59 +0,0 @@ -HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): - #000: (file name) line (number) in H5Dread(): can't read data - major: Dataset - minor: Read failed - #001: (file name) line (number) in H5D__read(): can't read data - major: Dataset - minor: Read failed - #002: (file name) line (number) in H5D__contig_read(): contiguous read failed - major: Dataset - minor: Read failed - #003: (file name) line (number) in H5D__select_read(): read error - major: Dataspace - minor: Read failed - #004: (file name) line (number) in H5D__select_io(): read error - major: Dataspace - minor: Read failed - #005: (file name) line (number) in H5D__efl_readvv(): can't perform vectorized EFL read - major: Dataset - minor: Can't operate on object - #006: (file name) line (number) in H5V_opvv(): can't perform operation - major: Internal error (too specific to document in detail) - minor: Can't operate on object - #007: (file name) line (number) in H5D__efl_readvv_cb(): EFL read failed - major: Dataset - minor: Read failed - #008: (file name) line (number) in H5D__efl_read(): unable to open external raw data file - major: External file list - minor: Unable to open file -h5dump error: unable to print data -HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): - #000: (file name) line (number) in H5Dread(): can't read data - major: Dataset - minor: Read failed - #001: (file name) line (number) in H5D__read(): can't read data - major: Dataset - minor: Read failed - #002: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk - major: Low-level I/O - minor: Read failed - #003: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed - major: Data filters - minor: Filter operation failed - #004: (file name) line (number) in H5Z_pipeline(): required filter 'myfilter' is not registered - major: Data filters - minor: Read failed - #005: (file name) line (number) in H5PL_load(): search in paths failed - major: Plugin for dynamically loaded library - minor: Can't get value - #006: (file name) line (number) in H5PL__find(): can't open directory - major: Plugin for dynamically loaded library - minor: Can't open directory or file -h5dump error: unable to print data -H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs): - #000: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed - major: Failure in tools library - minor: error in function - #001: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed - major: Failure in tools library - minor: error in function diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 88711c7..0c72a8d 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -372,7 +372,6 @@ ${SRC_H5DUMP_ERRORFILES}/tgroup-2.err ${SRC_H5DUMP_ERRORFILES}/torderlinks1.err ${SRC_H5DUMP_ERRORFILES}/torderlinks2.err ${SRC_H5DUMP_ERRORFILES}/tperror.err -${SRC_H5DUMP_ERRORFILES}/treadfilter.err ${SRC_H5DUMP_ERRORFILES}/tqmarkfile.err ${SRC_H5DUMP_ERRORFILES}/tslink-D.err " @@ -1190,7 +1189,7 @@ if test $USE_FILTER_DEFLATE = "yes" -a $USE_FILTER_SHUFFLE = "yes" -a $USE_FILTE TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5 if test $USE_FILTER_SZIP = "yes"; then # data read - TOOLTEST4 treadfilter.ddl --enable-error-stack tfilters.h5 + TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5 fi fi diff --git a/tools/h5repack/CMakeTests.cmake b/tools/h5repack/CMakeTests.cmake index 7f8f71b..8690181 100644 --- a/tools/h5repack/CMakeTests.cmake +++ b/tools/h5repack/CMakeTests.cmake @@ -55,6 +55,7 @@ ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layouto.h5 ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout2.h5 ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout3.h5 + ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5 ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_named_dtypes.h5 ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nbit.h5 ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_objs.h5 @@ -88,6 +89,8 @@ ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5.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 ) FOREACH (h5_file ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) @@ -341,7 +344,7 @@ IF (HDF5_BUILD_TOOLS AND NOT HDF5_ENABLE_USING_MEMCHECKER) # Remove any output file left over from previous test run ADD_TEST ( - NAME H5REPACK_UD-clearall-objects + NAME H5REPACK_UD-${testname}-clearall-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile} @@ -364,7 +367,7 @@ -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) - SET_TESTS_PROPERTIES (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-clearall-objects) + SET_TESTS_PROPERTIES (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clearall-objects) ADD_TEST ( NAME H5REPACK_UD-h5dump-${testname} COMMAND "${CMAKE_COMMAND}" @@ -1063,6 +1066,7 @@ ADD_H5_VERIFY_TEST (ckdim_smaller "TEST" 0 h5repack_layout3.h5 chunk_unlimit3 CO ############################################################################## IF (BUILD_SHARED_LIBS) ADD_H5_UD_TEST (plugin_test 0 h5repack_layout.h5 -v -f UD=257,1,9) +# ADD_H5_UD_TEST (plugin_none 0 h5repack_layout.UD.h5 -v -f NONE) ELSE (BUILD_SHARED_LIBS) MESSAGE (STATUS " **** Plugins libraries must be built as shared libraries **** ") ADD_TEST ( diff --git a/tools/h5repack/testfiles/h5repack_layout.UD.h5 b/tools/h5repack/testfiles/h5repack_layout.UD.h5 new file mode 100644 index 0000000..caf2024 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_layout.UD.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl b/tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl new file mode 100644 index 0000000..0d85352 --- /dev/null +++ b/tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl @@ -0,0 +1,130 @@ +HDF5 "testfiles/out-plugin_none.h5repack_layout.UD.h5" { +GROUP "/" { + DATASET "dset1" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 40, 20 ) / ( 40, 20 ) } + STORAGE_LAYOUT { + CHUNKED ( 40, 20 ) + SIZE 3200 + } + FILTERS { + NONE + } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } + } + DATASET "dset2" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 40, 20 ) / ( 40, 20 ) } + STORAGE_LAYOUT { + CHUNKED ( 40, 20 ) + SIZE 3200 + } + FILTERS { + NONE + } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } + } + DATASET "dset3" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 40, 20 ) / ( 40, 20 ) } + STORAGE_LAYOUT { + CHUNKED ( 40, 20 ) + SIZE 3200 + } + FILTERS { + NONE + } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } + } + DATASET "dset4" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 40, 20 ) / ( 40, 20 ) } + STORAGE_LAYOUT { + CHUNKED ( 40, 20 ) + SIZE 3200 + } + FILTERS { + NONE + } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } + } + DATASET "dset_chunk" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) } + STORAGE_LAYOUT { + CHUNKED ( 20, 10 ) + SIZE 3200 + } + FILTERS { + NONE + } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } + } + DATASET "dset_compact" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 40, 20 ) / ( 40, 20 ) } + STORAGE_LAYOUT { + CHUNKED ( 40, 20 ) + SIZE 3200 + } + FILTERS { + NONE + } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } + } + DATASET "dset_contiguous" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 40, 20 ) / ( 40, 20 ) } + STORAGE_LAYOUT { + CHUNKED ( 40, 20 ) + SIZE 3200 + } + FILTERS { + NONE + } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } + } +} +} diff --git a/tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst new file mode 100644 index 0000000..4fb6906 --- /dev/null +++ b/tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst @@ -0,0 +1,14 @@ +Objects to modify layout are... +Objects to apply filter are... + Uncompress all +----------------------------------------- + Type Filter (Compression) Name +----------------------------------------- + group / + dset (1.000:1) /dset1 + dset (1.000:1) /dset2 + dset (1.000:1) /dset3 + dset (1.000:1) /dset4 + dset (1.000:1) /dset_chunk + dset (1.000:1) /dset_compact + dset (1.000:1) /dset_contiguous diff --git a/tools/testfiles/treadfilter.ddl b/tools/testfiles/treadfilter.ddl index 25875f3..88ca2e9 100644 --- a/tools/testfiles/treadfilter.ddl +++ b/tools/testfiles/treadfilter.ddl @@ -1,358 +1,54 @@ HDF5 "tfilters.h5" { -GROUP "/" { - DATASET "all" { - 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 - } +DATASET "all" { + 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 } - DATASET "alloc_time_early" { - 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 - } - } - DATASET "alloc_time_incr" { - 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 - } - } - DATASET "alloc_time_late" { - 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 - } - } - DATASET "chunked" { - COMMENT "This is a dataset with chunked 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 - } - } - 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 - } - } - DATASET "contiguous" { - COMMENT "This is a dataset with contiguous 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 - } - } - DATASET "deflate" { - 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 - } - } - DATASET "external" { - DATATYPE H5T_STD_I32LE - DATASPACE SIMPLE { ( 100 ) / ( 100 ) } - DATA { - } - } - DATASET "fletcher32" { - 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 - } - } - DATASET "myfilter" { - DATATYPE H5T_STD_I32LE - DATASPACE SIMPLE { ( 20, 10 ) / ( 20, 10 ) } - DATA { - } - } - DATATYPE "mytype" H5T_STD_B8LE; - DATASET "nbit" { - DATATYPE 32-bit little-endian integer - DATASPACE SIMPLE { ( 20, 10 ) / ( 20, 10 ) } - DATA { - (0,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1, - (1,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3, - (2,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3, - (3,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1, - (4,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1, - (5,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3, - (6,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3, - (7,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1, - (8,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1, - (9,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3, - (10,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3, - (11,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1, - (12,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1, - (13,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3, - (14,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3, - (15,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1, - (16,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1, - (17,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3, - (18,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3, - (19,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1 - } - } - DATASET "scaleoffset" { - 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): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - (3,0): 14, 15, 0, 1, 2, 19, 0, 5, 6, 7, - (4,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (5,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - (6,0): 12, 13, 14, 15, 0, 17, 18, 19, 0, 5, - (7,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - (8,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - (9,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - (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): 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, - (13,0): 114, 0, 100, 101, 102, 119, 0, 105, 106, 107, - (14,0): 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - (15,0): 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - (16,0): 112, 113, 114, 0, 100, 117, 118, 119, 0, 105, - (17,0): 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, - (18,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - (19,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119 - } - } - DATASET "shuffle" { - 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 - } - } - DATASET "szip" { - 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 - } +} +DATASET "szip" { + 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 } } } -- cgit v0.12