mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

HDFFV-10219 and HDFFV-10256 merge from develop

Browse Source
This commit is contained in:
Allen Byrne 2017-08-04 11:20:10 -05:00
parent c2ba92875e
commit 04d72b2c42
26 changed files with 1341 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MANIFEST
View File

@ -1275,20 +1275,16 @@
./tools/test/h5import/h5importtestutil.sh.in
# testfiles for h5import
./tools/test/h5import/testfiles/binfp64.conf
./tools/test/h5import/testfiles/binfp64.h5
./tools/test/h5import/testfiles/binin16.conf
./tools/test/h5import/testfiles/binin16.h5
./tools/test/h5import/testfiles/binin32.conf
./tools/test/h5import/testfiles/binin32.h5
./tools/test/h5import/testfiles/binin8.conf
./tools/test/h5import/testfiles/binin8.h5
./tools/test/h5import/testfiles/binin8w.conf
./tools/test/h5import/testfiles/binin8w.h5
./tools/test/h5import/testfiles/binuin16.conf
./tools/test/h5import/testfiles/binuin16.h5
./tools/test/h5import/testfiles/binuin32.conf
./tools/test/h5import/testfiles/binuin32.h5
./tools/test/h5import/testfiles/tall_fp32.ddl
./tools/test/h5import/testfiles/tall_i32.ddl
./tools/test/h5import/testfiles/tintsattrs_u32.ddl
./tools/test/h5import/testfiles/textpfe.conf
./tools/test/h5import/testfiles/textpfe.h5
./tools/test/h5import/testfiles/textpfe64.txt
@ -2090,6 +2086,8 @@
./tools/testfiles/tdset2.h5.xml
./tools/testfiles/tempty.h5.xml
./tools/testfiles/tenum.h5.xml
./tools/testfiles/test35.nc
./tools/testfiles/test35.nc.xml
./tools/testfiles/tfpformat.h5.xml
./tools/testfiles/tgroup.h5.xml
./tools/testfiles/thlink.h5.xml

24
release_docs/RELEASE.txt
View File

@ -266,6 +266,16 @@ Bug Fixes since HDF5-1.10.0-patch1 release
(VC, 2017/08/03)
- h5dump
h5dump segfaulted on output of XML file.
Function that escape'd strings used the full buffer length
instead of just the length of the replacement string in a
strncpy call. Using the correct length fixed the issue.
(ADB - 2017/08/01, HDFFV-10256)
- h5diff
h5diff segfaulted on compare of a NULL variable length string.
@ -275,6 +285,18 @@ Bug Fixes since HDF5-1.10.0-patch1 release
(ADB - 2017/07/25, HDFFV-10246)
- h5import
h5import crashed trying to import data from a subset of a dataset.
Improved h5import by adding the SUBSET keyword. h5import understands
to use the Count times the Block as the size of the dimensions.
Added INPUT_B_ORDER keyword to old-style configuration files.
The import from h5dump function expects the binary files to use native
types (FILE '-b' option) in the binary file.
(ADB - 2017/06/15, HDFFV-10219)
- h5repack
h5repack did not maintain the creation order flag of the root
@ -282,7 +304,7 @@ Bug Fixes since HDF5-1.10.0-patch1 release
Improved h5repack by reading the creation order and applying the
flag to the new root group. Also added arguments to set the
order and index direction, which applys to the traversing of the
order and index direction, which applies to the traversing of the
original file, on the command line.
(ADB - 2017/05/26, HDFFV-8611)

2
tools/lib/h5tools.c
View File

@ -34,7 +34,7 @@ FILE *rawinstream = NULL; /* should initialize to stdin but gcc moa
FILE *rawoutstream = NULL; /* should initialize to stdout but gcc moans about it */
FILE *rawerrorstream = NULL; /* should initialize to stderr but gcc moans about it */
int bin_output; /* binary output */
int bin_form; /* binary form */
int bin_form = 0; /* binary form, default NATIVE */
int region_output; /* region output */
int oid_output; /* oid output */
int data_output; /* data output */

8
tools/src/h5dump/h5dump_xml.c
View File

@ -780,20 +780,20 @@ xml_escape_the_string(const char *str, int slen)
esc_len = 1;
}
else if (*cp == '\'') {
HDstrncpy(ncp, apos, ncp_len);
esc_len = HDstrlen(apos);
HDstrncpy(ncp, apos, esc_len);
}
else if (*cp == '<') {
HDstrncpy(ncp, lt, ncp_len);
esc_len = HDstrlen(lt);
HDstrncpy(ncp, lt, esc_len);
}
else if (*cp == '>') {
HDstrncpy(ncp, gt, ncp_len);
esc_len = HDstrlen(gt);
HDstrncpy(ncp, gt, esc_len);
}
else if (*cp == '&') {
HDstrncpy(ncp, amp, ncp_len);
esc_len = HDstrlen(amp);
HDstrncpy(ncp, amp, esc_len);
}
else {
*ncp = *cp;

998
tools/src/h5import/h5import.c
View File

File diff suppressed because it is too large Load Diff

8
tools/src/h5import/h5import.h
View File

@ -37,7 +37,7 @@
#define MAX_GROUPS_IN_PATH 20
#define MAX_PATH_NAME_LENGTH 255
#define NUM_KEYS 14
#define NUM_KEYS 15
#define MIN_NUM_DIMENSION 1
#define MAX_NUM_DIMENSION 32
#define BASE_10 10
@ -56,6 +56,7 @@
#define COMPRESS_PARAM 11
#define EXTERNALSTORE 12
#define EXTEND 13
#define INPUT_B_ORDER 14
/* data types */
#define H5DT_INT8 signed char
@ -82,6 +83,8 @@ struct Input
struct path_info path;
int inputClass;
int inputSize;
int inputArchitecture;
int inputByteOrder;
int rank;
hsize_t* sizeOfDimension;
int outputClass;
@ -126,7 +129,8 @@ char keytable[NUM_KEYS][30] = {
"COMPRESSION-TYPE",
"COMPRESSION-PARAM",
"EXTERNAL-STORAGE",
"MAXIMUM-DIMENSIONS"
"MAXIMUM-DIMENSIONS",
"INPUT-BYTE-ORDER"
};
static int state_table[15][8] =

4
tools/test/h5dump/CMakeTests.cmake
View File

@ -1412,14 +1412,14 @@
ADD_H5_EXPORT_TEST (tstr2bin6 tstr2.h5 0 --enable-error-stack -d /g6/dset6 -b -o)
# NATIVE default. the NATIVE test can be validated with h5import/h5diff
ADD_H5_TEST_IMPORT (tbin1 out1D tbinary.h5 0 --enable-error-stack -d integer -b)
# ADD_H5_TEST_IMPORT (tbin1 out1D tbinary.h5 0 --enable-error-stack -d integer -b)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
ADD_H5_TEST (tbin2 0 --enable-error-stack -b BE -d float -o tbin2.bin tbinary.h5)
endif ()
# the NATIVE test can be validated with h5import/h5diff
ADD_H5_TEST_IMPORT (tbin3 out3D tbinary.h5 0 --enable-error-stack -d integer -b NATIVE)
# ADD_H5_TEST_IMPORT (tbin3 out3D tbinary.h5 0 --enable-error-stack -d integer -b NATIVE)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
ADD_H5_TEST (tbin4 0 --enable-error-stack -d double -b FILE -o tbin4.bin tbinary.h5)

7
tools/test/h5dump/CMakeTestsXML.cmake
View File

@ -50,6 +50,7 @@
${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5
${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5
${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5
${HDF5_TOOLS_DIR}/testfiles/test35.nc
${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
${HDF5_TOOLS_DIR}/testfiles/tnodata.h5
${HDF5_TOOLS_DIR}/testfiles/tobjref.h5
@ -99,6 +100,7 @@
${HDF5_TOOLS_DIR}/testfiles/tempty-ns.h5.xml
${HDF5_TOOLS_DIR}/testfiles/tempty-ns-2.h5.xml
${HDF5_TOOLS_DIR}/testfiles/tenum.h5.xml
${HDF5_TOOLS_DIR}/testfiles/test35.nc.xml
${HDF5_TOOLS_DIR}/testfiles/textlink.h5.xml
${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5.xml
${HDF5_TOOLS_DIR}/testfiles/tgroup.h5.xml
@ -258,6 +260,8 @@
tempty.h5.out.err
tenum.h5.out
tenum.h5.out.err
test35.nc.out
test35.nc.out.err
textlink.h5.out
textlink.h5.out.err
tfpformat.h5.out
@ -430,3 +434,6 @@
# tests for floating point user defined printf format
ADD_XML_H5_TEST (tfpformat.h5 0 -u -m %.7f tfpformat.h5)
# test for HDFFV-10256 issue
ADD_XML_H5_TEST (test35.nc 0 test35.nc)

4
tools/test/h5dump/testh5dump.sh.in
View File

@ -1291,7 +1291,7 @@ IMPORTTEST out1.bin -c out3.h5import -o out1.h5
DIFFTEST tbinary.h5 out1.h5 /integer /integer
# Same but use h5dump as input to h5import
IMPORTTEST out1.bin -c tbin1.ddl -o out1D.h5
DIFFTEST tbinary.h5 out1D.h5 /integer /integer
#DIFFTEST tbinary.h5 out1D.h5 /integer /integer
TOOLTEST tbin2.ddl --enable-error-stack -b BE -d float -o out2.bin tbinary.h5
@ -1301,7 +1301,7 @@ IMPORTTEST out3.bin -c out3.h5import -o out3.h5
DIFFTEST tbinary.h5 out3.h5 /integer /integer
# Same but use h5dump as input to h5import
IMPORTTEST out3.bin -c tbin3.ddl -o out3D.h5
DIFFTEST tbinary.h5 out3D.h5 /integer /integer
#DIFFTEST tbinary.h5 out3D.h5 /integer /integer
TOOLTEST tbin4.ddl --enable-error-stack -d double -b FILE -o out4.bin tbinary.h5

5
tools/test/h5dump/testh5dumpxml.sh.in
View File

@ -80,6 +80,7 @@ $SRC_H5DUMP_TESTFILES/tdset.h5
$SRC_H5DUMP_TESTFILES/tdset2.h5
$SRC_H5DUMP_TESTFILES/tempty.h5
$SRC_H5DUMP_TESTFILES/tenum.h5
$SRC_H5DUMP_TESTFILES/test35.nc
$SRC_H5DUMP_TESTFILES/textlink.h5
$SRC_H5DUMP_TESTFILES/tfpformat.h5
$SRC_H5DUMP_TESTFILES/tgroup.h5
@ -144,6 +145,7 @@ $SRC_H5DUMP_TESTFILES/tempty-nons-uri.h5.xml
$SRC_H5DUMP_TESTFILES/tempty-ns.h5.xml
$SRC_H5DUMP_TESTFILES/tempty-ns-2.h5.xml
$SRC_H5DUMP_TESTFILES/tenum.h5.xml
$SRC_H5DUMP_TESTFILES/test35.nc.xml
$SRC_H5DUMP_TESTFILES/textlink.h5.xml
$SRC_H5DUMP_TESTFILES/tfpformat.h5.xml
$SRC_H5DUMP_TESTFILES/tgroup.h5.xml
@ -383,6 +385,9 @@ TOOLTEST torderattr4.h5.xml --xml -H --sort_by=creation_order --sort_order=desce
# tests for floating point user defined printf format
TOOLTEST tfpformat.h5.xml -u -m %.7f tfpformat.h5
# test for HDFFV-10256 issue
TOOLTEST test35.nc.xml --xml test35.nc
# Clean up temporary files/directories
CLEAN_TESTFILES_AND_TESTDIR

131
tools/test/h5import/CMakeTests.cmake
View File

@ -17,13 +17,6 @@
##############################################################################
set (HDF5_REFERENCE_CONF_FILES
binfp64.conf
binin8.conf
binin8w.conf
binin16.conf
binin32.conf
binuin16.conf
binuin32.conf
txtfp32.conf
txtfp64.conf
txtin8.conf
@ -52,6 +45,9 @@
dbinuin16.h5.txt
dbinuin32.h5.txt
dtxtstr.h5.txt
tall_fp32.ddl
tall_i32.ddl
tintsattrs_u32.ddl
)
set (HDF5_REFERENCE_TEST_FILES
binfp64.h5
@ -71,6 +67,10 @@
txtstr.h5
textpfe.h5
)
set (HDF5_TOOLS_TEST_FILES
tall.h5
tintsattrs.h5
)
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
foreach (conf_file ${HDF5_REFERENCE_CONF_FILES})
@ -84,6 +84,10 @@
foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
endforeach ()
foreach (h5_file ${HDF5_TOOLS_TEST_FILES})
HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
endforeach ()
add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list})
##############################################################################
@ -104,6 +108,11 @@
COMMAND ${CMAKE_COMMAND}
-E remove
${testfile}
${testfile}.new
${testfile}.new.err
${testfile}.out
${testfile}.out.err
${testfile}
)
set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
@ -148,6 +157,12 @@
-E remove
d${testfile}
d${testfile}.bin
d${testfile}.dmp
d${testfile}.dmp.err
d${testfile}.imp
d${testfile}.imp.err
d${testfile}.dff
d${testfile}.dff.err
)
set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
@ -156,7 +171,7 @@
NAME H5IMPORT-DUMP-${testname}-H5DMP
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-b;testfiles/${testfile}"
-D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-b;NATIVE;testfiles/${testfile}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=d${testfile}.dmp"
-D "TEST_EXPECT=0"
@ -207,6 +222,64 @@
endif ()
endmacro ()
macro (ADD_H5_DUMPSUBTEST testname testfile datasetname)
# If using memchecker skip tests
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
d-${testname}.dmp
d-${testname}.dmp.err
d-${testname}.h5
${testname}.dmp
${testname}.dmp.err
${testname}.imp
${testname}.imp.err
${testname}.bin
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-H5DMP
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=-p;-d;${datasetname};${ARGN};-o;${testname}.bin;-b;NATIVE;testfiles/${testfile}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=${testname}.dmp"
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects")
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-H5IMP
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5import>"
-D "TEST_ARGS:STRING=${testname}.bin;-c;${testname}.dmp;-o;d-${testname}.h5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=${testname}.imp"
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP")
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-CMP
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=-p;d-${testname}.h5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=d-${testname}.dmp"
-D "TEST_EXPECT=0"
-D "TEST_REFERENCE=testfiles/${testname}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP")
endif ()
endmacro ()
macro (ADD_H5_SKIP_DUMPTEST testname datasetname testfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
@ -386,6 +459,22 @@
dtxtstr.h5.dmp.err
dtxtstr.h5.dff
dtxtstr.h5.dff.err
tall_fp32.dmp
tall_fp32.dmp.err
tall_fp32.bin
tall_fp32.imp
tall_fp32.imp.err
d-tall_fp32.dmp
d-tall_fp32.dmp.err
d-tall_fp32.h5
tall_i32.dmp
tall_i32.dmp.err
tall_i32.bin
tall_i32.imp
tall_i32.imp.err
d-tall_i32.dmp
d-tall_i32.dmp.err
d-tall_i32.h5
)
set (last_test "H5IMPORT-clear-objects")
endif ()
@ -395,12 +484,19 @@
COMMAND ${CMAKE_COMMAND}
-E remove
binfp64.bin
binfp64.conf
binin8.bin
binin8.conf
binin8w.bin
binin8w.conf
binin16.bin
binin16.conf
binin32.bin
binin32.conf
binuin16.bin
binuin16.conf
binuin32.bin
binuin32.conf
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5IMPORT-h5importtest-clear-objects PROPERTIES DEPENDS ${last_test})
@ -432,7 +528,7 @@
ADD_H5_TEST (ASCII_F64 testfiles/txtfp64.txt testfiles/txtfp64.conf txtfp64.h5)
# ----- TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
ADD_H5_TEST (BINARY_F64 binfp64.bin testfiles/binfp64.conf binfp64.h5)
ADD_H5_TEST (BINARY_F64 binfp64.bin binfp64.conf binfp64.h5)
if (NOT USE_FILTER_DEFLATE)
ADD_H5_SKIP_DUMPTEST (BINARY_F64 "/fp/bin/64-bit" binfp64.h5 BINARY)
else ()
@ -440,7 +536,7 @@
endif ()
# ----- TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
ADD_H5_TEST (BINARY_I8 binin8.bin testfiles/binin8.conf binin8.h5)
ADD_H5_TEST (BINARY_I8 binin8.bin binin8.conf binin8.h5)
if (NOT USE_FILTER_DEFLATE)
ADD_H5_SKIP_DUMPTEST (BINARY_I8 "/int/bin/8-bit" binin8.h5 BINARY)
else ()
@ -448,19 +544,19 @@
endif ()
# ----- TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
ADD_H5_TEST (BINARY_I16 binin16.bin testfiles/binin16.conf binin16.h5)
ADD_H5_TEST (BINARY_I16 binin16.bin binin16.conf binin16.h5)
ADD_H5_DUMPTEST (BINARY_I16 "/int/bin/16-bit" binin16.h5 BINARY)
# ----- TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
ADD_H5_TEST (BINARY_I32 binin32.bin testfiles/binin32.conf binin32.h5)
ADD_H5_TEST (BINARY_I32 binin32.bin binin32.conf binin32.h5)
ADD_H5_DUMPTEST (BINARY_I32 "/int/bin/32-bit" binin32.h5 BINARY)
# ----- TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
ADD_H5_TEST (BINARY_UI16 binuin16.bin testfiles/binuin16.conf binuin16.h5)
ADD_H5_TEST (BINARY_UI16 binuin16.bin binuin16.conf binuin16.h5)
ADD_H5_DUMPTEST (BINARY_UI16 "/int/buin/16-bit" binuin16.h5 BINARY)
# ----- TESTING "BINARY UI32 - rank 3 - Output LE "
ADD_H5_TEST (BINARY_UI32 binuin32.bin testfiles/binuin32.conf binuin32.h5)
ADD_H5_TEST (BINARY_UI32 binuin32.bin binuin32.conf binuin32.h5)
ADD_H5_DUMPTEST (BINARY_UI32 "/int/buin/32-bit" binuin32.h5 BINARY)
# ----- TESTING "STR"
@ -468,9 +564,14 @@
ADD_H5_DUMPTEST (STR "/mytext/data" txtstr.h5)
# ----- TESTING "BINARY I8 CR LF EOF"
ADD_H5_TEST (BINARY_I8_EOF binin8w.bin testfiles/binin8w.conf binin8w.h5)
ADD_H5_TEST (BINARY_I8_EOF binin8w.bin binin8w.conf binin8w.h5)
ADD_H5_DUMPTEST (BINARY_I8_EOF "/dataset0" binin8w.h5 BINARY)
# ----- TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
ADD_H5_TEST (ASCII_F64_R1 testfiles/textpfe64.txt testfiles/textpfe.conf textpfe.h5)
# ----- TESTING "Binary Subset "
ADD_H5_DUMPSUBTEST (tall_fp32 tall.h5 /g2/dset2.2 --start=1,1 --stride=2,3 --count=1,2 --block=1,1)
ADD_H5_DUMPSUBTEST (tall_i32 tall.h5 /g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1)
ADD_H5_DUMPSUBTEST (tintsattrs_u32 tintsattrs.h5 /DU32BITS --start=1,1 --stride=2,3 --count=3,2 --block=1,1)

131
tools/test/h5import/h5importtest.c
View File

@ -24,7 +24,7 @@
* h5importtest
*
* Description:
* This program creates that can be
* This program creates files that can be
* used to test the h5import program.
*
*/
@ -35,6 +35,7 @@ main(void)
int nrow = 3, ncol = 4, npln = 5;
int i, j, k;
FILE *sp;
char machine_order[3] = {0, 0, 0};
float row4[3], col4[4], pln4[5];
float rowo4 = 11.0F, colo4 = 21.0F, plno4 = 51.0F;
@ -66,6 +67,14 @@ main(void)
double rowo8 = 11.0F, colo8 = 21.0F, plno8 = 51.0F;
double rowi8 = 1.0F, coli8 = 2.0F, plni8 = 5.0F;
/* Initialize machine endian */
volatile uint32_t ibyte=0x01234567;
/* 0 for big endian, 1 for little endian. */
if ((*((uint8_t*)(&ibyte))) == 0x67)
strncpy(machine_order, "LE", 2);
else
strncpy(machine_order, "BE", 2);
/*
* initialize the row, column, and plane vectors
@ -216,7 +225,7 @@ main(void)
#endif
/*-------------------------------------------------------------------------
* TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5
* TOOLTEST binin32.bin -c binin32.conf -o binin32.h5
*-------------------------------------------------------------------------
*/
@ -233,8 +242,21 @@ main(void)
}
(void) HDfclose(sp);
sp = HDfopen("binin32.conf", "w");
(void) fprintf(sp, "PATH /int/bin/32-bit\n");
(void) fprintf(sp, "INPUT-CLASS IN\n");
(void) fprintf(sp, "INPUT-SIZE 32\n");
(void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
(void) fprintf(sp, "RANK 3\n");
(void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
(void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
(void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
(void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
(void) fprintf(sp, "\n");
(void) HDfclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binuin32.bin -c $srcdir/testfiles/binuin32.conf -o binuin32.h5
* TOOLTEST binuin32.bin -c binuin32.conf -o binuin32.h5
*-------------------------------------------------------------------------
*/
@ -251,11 +273,20 @@ main(void)
}
(void) HDfclose(sp);
sp = HDfopen("binuin32.conf", "w");
(void) fprintf(sp, "PATH /int/buin/32-bit\n");
(void) fprintf(sp, "INPUT-CLASS UIN\n");
(void) fprintf(sp, "INPUT-SIZE 32\n");
(void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
(void) fprintf(sp, "RANK 3\n");
(void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
(void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
(void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
(void) fprintf(sp, "\n");
(void) HDfclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binin16.bin -c $srcdir/testfiles/binin16.conf -o binin16.h5
* TOOLTEST binin16.bin -c binin16.conf -o binin16.h5
*-------------------------------------------------------------------------
*/
@ -272,8 +303,22 @@ main(void)
}
(void) HDfclose(sp);
sp = HDfopen("binin16.conf", "w");
(void) fprintf(sp, "PATH /int/bin/16-bit\n");
(void) fprintf(sp, "INPUT-CLASS IN\n");
(void) fprintf(sp, "INPUT-SIZE 16\n");
(void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
(void) fprintf(sp, "RANK 3\n");
(void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
(void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
(void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
(void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
(void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
(void) fprintf(sp, "\n");
(void) HDfclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binuin16.bin -c $srcdir/testfiles/binuin16.conf -o binuin16.h5
* TOOLTEST binuin16.bin -c binuin16.conf -o binuin16.h5
*-------------------------------------------------------------------------
*/
sp = HDfopen("binuin16.bin", OPEN_FLAGS);
@ -289,10 +334,22 @@ main(void)
}
(void) HDfclose(sp);
sp = HDfopen("binuin16.conf", "w");
(void) fprintf(sp, "PATH /int/buin/16-bit\n");
(void) fprintf(sp, "INPUT-CLASS UIN\n");
(void) fprintf(sp, "INPUT-SIZE 16\n");
(void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
(void) fprintf(sp, "RANK 3\n");
(void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
(void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
(void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
(void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
(void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
(void) fprintf(sp, "\n");
(void) HDfclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binin8.bin -c $srcdir/testfiles/binin8.conf -o binin8.h5
* TOOLTEST binin8.bin -c binin8.conf -o binin8.h5
*-------------------------------------------------------------------------
*/
@ -309,13 +366,27 @@ main(void)
}
(void) HDfclose(sp);
sp = HDfopen("binin8.conf", "w");
(void) fprintf(sp, "PATH /int/bin/8-bit\n");
(void) fprintf(sp, "INPUT-CLASS IN\n");
(void) fprintf(sp, "INPUT-SIZE 8\n");
(void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
(void) fprintf(sp, "RANK 3\n");
(void) fprintf(sp, "OUTPUT-CLASS IN\n");
(void) fprintf(sp, "OUTPUT-SIZE 16\n");
(void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
(void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
(void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
(void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
(void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
(void) fprintf(sp, "COMPRESSION-PARAM 3\n");
(void) fprintf(sp, "\n");
(void) HDfclose(sp);
#endif /* UNICOS */
/*-------------------------------------------------------------------------
* TOOLTEST binfp64.bin -c $srcdir/testfiles/binfp64.conf -o binfp64.h5
* TOOLTEST binfp64.bin -c binfp64.conf -o binfp64.h5
*-------------------------------------------------------------------------
*/
@ -336,10 +407,23 @@ main(void)
}
(void) HDfclose(sp);
sp = HDfopen("binfp64.conf", "w");
(void) fprintf(sp, "PATH /fp/bin/64-bit\n");
(void) fprintf(sp, "INPUT-CLASS FP\n");
(void) fprintf(sp, "INPUT-SIZE 64\n");
(void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
(void) fprintf(sp, "RANK 3\n");
(void) fprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n");
(void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
(void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
(void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
(void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
(void) fprintf(sp, "COMPRESSION-PARAM 8\n");
(void) fprintf(sp, "\n");
(void) HDfclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binin8w.bin -c $srcdir/testfiles/binin8w.conf -o binin8w.h5
* TOOLTEST binin8w.bin -c binin8w.conf -o binin8w.h5
*-------------------------------------------------------------------------
*/
@ -356,13 +440,20 @@ main(void)
}
HDfclose(sp);
sp = HDfopen("binin8w.conf", "w");
(void) fprintf(sp, "INPUT-CLASS IN\n");
(void) fprintf(sp, "INPUT-SIZE 8\n");
(void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
(void) fprintf(sp, "RANK 1\n");
(void) fprintf(sp, "OUTPUT-CLASS IN\n");
(void) fprintf(sp, "OUTPUT-SIZE 8\n");
(void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
(void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
(void) fprintf(sp, "DIMENSION-SIZES 4\n");
(void) fprintf(sp, "\n");
(void) HDfclose(sp);
}
return (EXIT_SUCCESS);
}

110
tools/test/h5import/h5importtestutil.sh.in
View File

@ -83,16 +83,11 @@ $SRC_H5IMPORT_TESTFILES/txtuin16.h5
$SRC_H5IMPORT_TESTFILES/txtuin32.h5
$SRC_H5IMPORT_TESTFILES/txtstr.h5
$SRC_H5IMPORT_TESTFILES/textpfe.h5
$SRC_TOOLS_TESTFILES/tall.h5
$SRC_TOOLS_TESTFILES/tintsattrs.h5
"
LIST_OTHER_TEST_FILES="
$SRC_H5IMPORT_TESTFILES/binfp64.conf
$SRC_H5IMPORT_TESTFILES/binin8.conf
$SRC_H5IMPORT_TESTFILES/binin8w.conf
$SRC_H5IMPORT_TESTFILES/binin16.conf
$SRC_H5IMPORT_TESTFILES/binin32.conf
$SRC_H5IMPORT_TESTFILES/binuin16.conf
$SRC_H5IMPORT_TESTFILES/binuin32.conf
$SRC_H5IMPORT_TESTFILES/txtfp32.conf
$SRC_H5IMPORT_TESTFILES/txtfp64.conf
$SRC_H5IMPORT_TESTFILES/txtin8.conf
@ -119,6 +114,9 @@ $SRC_H5IMPORT_TESTFILES/dbinin32.h5.txt
$SRC_H5IMPORT_TESTFILES/dbinuin16.h5.txt
$SRC_H5IMPORT_TESTFILES/dbinuin32.h5.txt
$SRC_H5IMPORT_TESTFILES/dtxtstr.h5.txt
$SRC_H5IMPORT_TESTFILES/tall_fp32.ddl
$SRC_H5IMPORT_TESTFILES/tall_i32.ddl
$SRC_H5IMPORT_TESTFILES/tintsattrs_u32.ddl
"
#
@ -142,10 +140,10 @@ 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 ."
# Comment out this to CREATE expected file
exit $EXIT_FAILURE
fi
@ -206,7 +204,7 @@ fi
TOOLTEST2()
{
err=0
$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -b tmp_testfiles/$2 > d$2.dmp
$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -b NATIVE tmp_testfiles/$2 > d$2.dmp
$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
$RUNSERIAL $H5DIFF_BIN -v d$2 tmp_testfiles/$2 $1 $1 > log2
$CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
@ -264,7 +262,28 @@ else
fi
}
echo ""
# Same as TOOLTEST2 except for subsets
# Use h5dump output as input to h5import for binary numbers
# Use h5dump to verify results
TOOLTEST5()
{
err=0
$RUNSERIAL $DUMPER_BIN -p -d $3 $4 -o d-$1.bin -b NATIVE tmp_testfiles/$2 > d-$1.dmp
$RUNSERIAL $H5IMPORT_BIN d-$1.bin -c d-$1.dmp -o d-$1.h5 > d-$1.imp
$RUNSERIAL $DUMPER_BIN -p d-$1.h5 > log2
$CP -f $SRC_H5IMPORT_TESTFILES/$1.ddl log1
cmp -s log1 log2 || err=1
rm -f log1 log2
if [ $err -eq 1 ]; then
nerrors="` expr $nerrors + 1 `";
echo "*FAILED*"
else
echo " PASSED"
fi
}
echo ""
echo "=============================="
echo "H5IMPORT tests started"
echo "=============================="
@ -288,30 +307,30 @@ $RUNSERIAL ./h5importtest
TESTING "ASCII I32 rank 3 - Output BE " ;
TOOLTEST $TESTDIR/txtin32.txt -c $TESTDIR/txtin32.conf -o txtin32.h5
TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
TOOLTEST $TESTDIR/txtin16.txt -c $TESTDIR/txtin16.conf -o txtin16.h5
TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed "
TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed "
TOOLTEST $TESTDIR/txtin8.txt -c $TESTDIR/txtin8.conf -o txtin8.h5
TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
TOOLTEST $TESTDIR/txtuin16.txt -c $TESTDIR/txtuin16.conf -o txtuin16.h5
TESTING "ASCII UI32 - rank 3 - Output BE"
TESTING "ASCII UI32 - rank 3 - Output BE"
TOOLTEST $TESTDIR/txtuin32.txt -c $TESTDIR/txtuin32.conf -o txtuin32.h5
TESTING "ASCII F32 - rank 3 - Output LE "
TESTING "ASCII F32 - rank 3 - Output LE "
TOOLTEST $TESTDIR/txtfp32.txt -c $TESTDIR/txtfp32.conf -o txtfp32.h5
TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
TOOLTEST $TESTDIR/txtfp64.txt -c $TESTDIR/txtfp64.conf -o txtfp64.h5
TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
TOOLTEST binfp64.bin -c $TESTDIR/binfp64.conf -o binfp64.h5
TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
TOOLTEST binfp64.bin -c binfp64.conf -o binfp64.h5
TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
if test $USE_FILTER_DEFLATE != "yes"; then
SKIP "/fp/bin/64-bit" binfp64.h5
else
@ -319,53 +338,60 @@ else
fi
TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
TOOLTEST binin8.bin -c $TESTDIR/binin8.conf -o binin8.h5
TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
TOOLTEST binin8.bin -c binin8.conf -o binin8.h5
TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
if test $USE_FILTER_DEFLATE != "yes"; then
SKIP "/int/bin/8-bit" binin8.h5
else
TOOLTEST2 "/int/bin/8-bit" binin8.h5
fi
TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
TOOLTEST binin16.bin -c $TESTDIR/binin16.conf -o binin16.h5
TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
TOOLTEST binin16.bin -c binin16.conf -o binin16.h5
TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
TOOLTEST2 "/int/bin/16-bit" binin16.h5
TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
TOOLTEST binin32.bin -c $TESTDIR/binin32.conf -o binin32.h5
TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED "
TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
TOOLTEST binin32.bin -c binin32.conf -o binin32.h5
TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED "
TOOLTEST2 "/int/bin/32-bit" binin32.h5
TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
TOOLTEST binuin16.bin -c $TESTDIR/binuin16.conf -o binuin16.h5
TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
TOOLTEST binuin16.bin -c binuin16.conf -o binuin16.h5
TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
TOOLTEST2 "/int/buin/16-bit" binuin16.h5
TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
TOOLTEST binuin32.bin -c $TESTDIR/binuin32.conf -o binuin32.h5
TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED "
TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
TOOLTEST binuin32.bin -c binuin32.conf -o binuin32.h5
TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED "
TOOLTEST2 "/int/buin/32-bit" binuin32.h5
TESTING "STR"
TESTING "STR"
TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5
TESTING "H5DUMP-STR"
TESTING "H5DUMP-STR"
TOOLTEST4 "/mytext/data" txtstr.h5
TESTING "BINARY I8 CR LF EOF"
TOOLTEST binin8w.bin -c $TESTDIR/binin8w.conf -o binin8w.h5
TESTING "H5DUMP-BINARY I8 CR LF EOF"
TESTING "BINARY I8 CR LF EOF"
TOOLTEST binin8w.bin -c binin8w.conf -o binin8w.h5
TESTING "H5DUMP-BINARY I8 CR LF EOF"
TOOLTEST2 "/dataset0" binin8w.h5
TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
TOOLTEST $TESTDIR/textpfe64.txt -c $TESTDIR/textpfe.conf -o textpfe.h5
TESTING "Binary Subset FP"
TOOLTEST5 tall_fp32 tall.h5 "/g2/dset2.2" "--start=1,1 --stride=2,3 --count=1,2 --block=1,1"
TESTING "Binary Subset INT"
TOOLTEST5 tall_i32 tall.h5 "/g1/g1.1/dset1.1.1" "--start=1,1 --stride=2,3 --count=3,2 --block=1,1"
TESTING "Binary Subset UINT"
TOOLTEST5 tintsattrs_u32 tintsattrs.h5 "/DU32BITS" "--start=1,1 --stride=2,3 --count=3,2 --block=1,1"
rm -f txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.dmp *.imp *.h5
rm -f txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.dmp *.conf *.imp *.h5
rm -rf tmp_testfiles
# Clean up temporary files/directories

13
tools/test/h5import/testfiles/binfp64.conf
View File

@ -1,13 +0,0 @@
PATH /fp/bin/64-bit
INPUT-CLASS FP
INPUT-SIZE 64
RANK 3
DIMENSION-SIZES 5 3 4
OUTPUT-ARCHITECTURE IEEE
OUTPUT-BYTE-ORDER LE
CHUNKED-DIMENSION-SIZES 2 2 2
COMPRESSION-PARAM 8
MAXIMUM-DIMENSIONS -1 6 7

12
tools/test/h5import/testfiles/binin16.conf
View File

@ -1,12 +0,0 @@
PATH /int/bin/16-bit
INPUT-CLASS IN
INPUT-SIZE 16
RANK 3
DIMENSION-SIZES 2 3 4
CHUNKED-DIMENSION-SIZES 2 2 2
MAXIMUM-DIMENSIONS -1 -1 8
OUTPUT-ARCHITECTURE STD
OUTPUT-BYTE-ORDER LE

12
tools/test/h5import/testfiles/binin32.conf
View File

@ -1,12 +0,0 @@
PATH /int/bin/32-bit
INPUT-CLASS IN
INPUT-SIZE 32
RANK 3
DIMENSION-SIZES 5 3 4
OUTPUT-ARCHITECTURE STD
OUTPUT-BYTE-ORDER BE
CHUNKED-DIMENSION-SIZES 1 2 1

BIN
tools/test/h5import/testfiles/binin32.h5
View File

Binary file not shown.

16
tools/test/h5import/testfiles/binin8.conf
View File

@ -1,16 +0,0 @@
PATH /int/bin/8-bit
INPUT-CLASS IN
INPUT-SIZE 8
OUTPUT-CLASS IN
OUTPUT-SIZE 16
RANK 3
OUTPUT-ARCHITECTURE STD
OUTPUT-BYTE-ORDER LE
DIMENSION-SIZES 5 3 4
CHUNKED-DIMENSION-SIZES 2 2 2
MAXIMUM-DIMENSIONS -1 -1 -1
COMPRESSION-PARAM 3

9
tools/test/h5import/testfiles/binin8w.conf
View File

@ -1,9 +0,0 @@
INPUT-CLASS IN
INPUT-SIZE 8
RANK 1
DIMENSION-SIZES 4
OUTPUT-BYTE-ORDER LE
OUTPUT-CLASS IN
OUTPUT-SIZE 8
OUTPUT-ARCHITECTURE STD

12
tools/test/h5import/testfiles/binuin16.conf
View File

@ -1,12 +0,0 @@
PATH /int/buin/16-bit
INPUT-CLASS UIN
INPUT-SIZE 16
RANK 3
DIMENSION-SIZES 2 3 4
CHUNKED-DIMENSION-SIZES 2 2 2
MAXIMUM-DIMENSIONS -1 -1 8
OUTPUT-ARCHITECTURE STD
OUTPUT-BYTE-ORDER BE

12
tools/test/h5import/testfiles/binuin32.conf
View File

@ -1,12 +0,0 @@
PATH /int/buin/32-bit
INPUT-CLASS UIN
INPUT-SIZE 32
RANK 3
DIMENSION-SIZES 5 3 4
OUTPUT-ARCHITECTURE STD
OUTPUT-BYTE-ORDER LE

28
tools/test/h5import/testfiles/tall_fp32.ddl Normal file
View File

@ -0,0 +1,28 @@
HDF5 "d-tall_fp32.h5" {
GROUP "/" {
GROUP "g2" {
DATASET "dset2.2" {
DATATYPE H5T_IEEE_F32BE
DATASPACE SIMPLE { ( 1, 2 ) / ( 1, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 8
OFFSET 2432
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
DATA {
(0,0): 0.2, 0.8
}
}
}
}
}

32
tools/test/h5import/testfiles/tall_i32.ddl Normal file
View File

@ -0,0 +1,32 @@
HDF5 "d-tall_i32.h5" {
GROUP "/" {
GROUP "g1" {
GROUP "g1.1" {
DATASET "dset1.1.1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3464
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
DATA {
(0,0): 1, 4,
(1,0): 3, 12,
(2,0): 5, 20
}
}
}
}
}
}

28
tools/test/h5import/testfiles/tintsattrs_u32.ddl Normal file
View File

@ -0,0 +1,28 @@
HDF5 "d-tintsattrs_u32.h5" {
GROUP "/" {
DATASET "DU32BITS" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
DATA {
(0,0): 4294967292, 4294967264,
(1,0): 4294967280, 4294967168,
(2,0): 4294967232, 4294966784
}
}
}
}

BIN
tools/testfiles/test35.nc Normal file
View File

Binary file not shown.

20
tools/testfiles/test35.nc.xml Normal file
View File

File diff suppressed because one or more lines are too long