philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1 10 Merges from develop (#424)

Browse Source 
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merge updates

#358 patches from vtk
#361 fix header guard spelling

* format fix

* Fix missing underscore and make H5public.h closer to dev

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
JNI cleanup

* format alignment

* Add missing test ref file
This commit is contained in:
Allen Byrne
2021-03-04 16:06:47 -06:00
committed by GitHub
parent 7b23ce1686
commit 583e9d5c32
133 changed files with 1131 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/test/h5diff/CMakeTests.cmake
View File

@@ -282,6 +282,7 @@
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_80.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_830.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt
@@ -907,6 +908,8 @@
h5diff_800.out.err
h5diff_801.out
h5diff_801.out.err
h5diff_830.out
h5diff_830.out.err
h5diff_8625.out
h5diff_8625.out.err
h5diff_8639.out
@@ -1529,6 +1532,11 @@ ADD_H5_TEST (h5diff_646 1 -v --use-system-epsilon -p 0.05 ${FILE1} ${FILE2} /g1/
ADD_H5_TEST (h5diff_800 1 -v ${FILE7} ${FILE8} /g1/array /g1/array)
ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array)
# ##############################################################################
# # dataset subsets
# ##############################################################################
#TRILABS_227 ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;])
# ##############################################################################
# # VDS tests
# ##############################################################################

12
tools/test/h5diff/testfiles/h5diff_10.txt
View File

@@ -131,6 +131,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_600.txt
View File

@@ -131,6 +131,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_603.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_606.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_612.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_615.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_621.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_622.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_623.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

12
tools/test/h5diff/testfiles/h5diff_624.txt
View File

@@ -132,6 +132,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
(The option --follow-symlinks overrides the default behavior when
symbolic links are compared.).
Subsetting options:
Subsetting is available by using the fcompact form of subsetting, as follows:
obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
It is not required to use all parameters, but until the last parameter value used,
all of the semicolons (;) are required, even when a parameter value is not specified. Example:
obj1 /foo/mydataset[START;;COUNT;BLOCK]
obj1 /foo/mydataset[START]
The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
each dimension. START is optional and will default to 0 in each dimension.
Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
one integer for each dimension of the dataset.
Exit code:
0 if no differences, 1 if differences found, 2 if error

30
tools/test/h5diff/testfiles/h5diff_830.txt Normal file
View File

@@ -0,0 +1,30 @@
dataset: </g1/array3D> and </g1/array3D>
size: [4x3x2] [4x3x2]
position array3D array3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 0 ] 2 0 2
[ 0 0 0 ] 3 0 3
[ 0 0 1 ] 4 0 4
[ 0 0 1 ] 5 0 5
[ 0 0 1 ] 6 0 6
[ 0 2 0 ] 13 0 13
[ 0 2 0 ] 14 0 14
[ 0 2 0 ] 15 0 15
[ 0 2 1 ] 16 0 16
[ 0 2 1 ] 17 0 17
[ 0 2 1 ] 18 0 18
[ 2 0 0 ] 37 0 37
[ 2 0 0 ] 38 0 38
[ 2 0 0 ] 39 0 39
[ 2 0 1 ] 40 0 40
[ 2 0 1 ] 41 0 41
[ 2 0 1 ] 42 0 42
[ 2 2 0 ] 49 0 49
[ 2 2 0 ] 50 0 50
[ 2 2 0 ] 51 0 51
[ 2 2 1 ] 52 0 52
[ 2 2 1 ] 53 0 53
[ 2 2 1 ] 54 0 54
24 differences found
EXIT CODE: 1

6
tools/test/h5diff/testh5diff.sh.in
View File

@@ -341,6 +341,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_710.txt
$SRC_H5DIFF_TESTFILES/h5diff_80.txt
$SRC_H5DIFF_TESTFILES/h5diff_800.txt
$SRC_H5DIFF_TESTFILES/h5diff_801.txt
$SRC_H5DIFF_TESTFILES/h5diff_830.txt
$SRC_H5DIFF_TESTFILES/h5diff_90.txt
$SRC_H5DIFF_TESTFILES/h5diff_8625.txt
$SRC_H5DIFF_TESTFILES/h5diff_8639.txt
@@ -1185,6 +1186,11 @@ TOOLTEST h5diff_646.txt -v --use-system-epsilon -p 0.05 h5diff_basic1.h5 h5diff_
TOOLTEST h5diff_800.txt -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/array /g1/array
TOOLTEST h5diff_801.txt -v h5diff_dset1.h5 h5diff_dset3.h5 /g1/array /g1/array
# ##############################################################################
# # dataset subsets
# ##############################################################################
#TRILABS_227 TOOLTEST h5diff_830.txt --enable-error-stack -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;]
# ##############################################################################
# VDS tests
# ##############################################################################