From c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 30 Jun 2008 14:05:39 -0500 Subject: [svn-r15300] Description: Bring revisions 15210:15289 from the trunk into the metadata journaling branch. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode --- MANIFEST | 192 +- README.txt | 2 +- config/gnu-flags | 130 +- config/lt_vers.am | 2 +- configure | 20 +- configure.in | 2 +- fortran/src/H5Tf.c | 26 + fortran/src/H5Tff.f90 | 58 + fortran/src/H5_f.c | 2 + fortran/src/H5f90global.f90 | 7 +- fortran/src/H5f90proto.h | 2 + release_docs/RELEASE.txt | 2 +- src/H5.c | 14 +- src/H5A.c | 17 +- src/H5AC.c | 8 +- src/H5ACpkg.h | 9 +- src/H5Adense.c | 9 +- src/H5Aint.c | 13 +- src/H5B2.c | 4 +- src/H5B2cache.c | 6 +- src/H5B2int.c | 38 +- src/H5D.c | 2 +- src/H5Fprivate.h | 2 + src/H5Tcompound.c | 6 +- src/H5Tnative.c | 2 +- src/H5Tpkg.h | 6 +- src/H5Tprivate.h | 2 +- src/H5Vprivate.h | 10 +- src/H5Znbit.c | 4 +- src/H5checksum.c | 10 +- src/H5public.h | 4 +- src/H5system.c | 8 +- src/H5trace.c | 44 +- src/Makefile.in | 2 +- test/fillval.c | 7 +- test/ohdr.c | 2 +- tools/h52jpeg/Makefile.am | 11 +- tools/h52jpeg/Makefile.in | 55 +- tools/h52jpeg/h52jpeg.c | 592 +- tools/h52jpeg/h52jpeg.sh | 87 + tools/h52jpeg/h52jpegtst.c | 204 +- tools/h52jpeg/image24pixel.txt | 101475 +++++++++++++++ tools/h52jpeg/image8.txt | 120006 ++++++++++++++++++ tools/h52jpeg/testfiles/h52jpegtst.h5 | Bin 0 -> 227613 bytes tools/h5copy/testfiles/h5copytst.h5 | Bin 0 -> 30448 bytes tools/h5copy/testfiles/h5copytst.out.ls | 432 + tools/h5copy/testh5copy.sh | 2 +- tools/h5diff/testfiles/h5diff_10.txt | 55 + tools/h5diff/testfiles/h5diff_100.txt | 1037 + tools/h5diff/testfiles/h5diff_101.txt | 9 + tools/h5diff/testfiles/h5diff_102.txt | 9 + tools/h5diff/testfiles/h5diff_11.txt | 2 + tools/h5diff/testfiles/h5diff_12.txt | 2 + tools/h5diff/testfiles/h5diff_13.txt | 10 + tools/h5diff/testfiles/h5diff_14.txt | 10 + tools/h5diff/testfiles/h5diff_15.txt | 9 + tools/h5diff/testfiles/h5diff_16_1.txt | 13 + tools/h5diff/testfiles/h5diff_16_2.txt | 13 + tools/h5diff/testfiles/h5diff_16_3.txt | 13 + tools/h5diff/testfiles/h5diff_17.txt | 39 + tools/h5diff/testfiles/h5diff_18.txt | 0 tools/h5diff/testfiles/h5diff_20.txt | 4 + tools/h5diff/testfiles/h5diff_21.txt | 4 + tools/h5diff/testfiles/h5diff_22.txt | 4 + tools/h5diff/testfiles/h5diff_23.txt | 2 + tools/h5diff/testfiles/h5diff_24.txt | 2 + tools/h5diff/testfiles/h5diff_25.txt | 2 + tools/h5diff/testfiles/h5diff_26.txt | 2 + tools/h5diff/testfiles/h5diff_27.txt | 2 + tools/h5diff/testfiles/h5diff_28.txt | 2 + tools/h5diff/testfiles/h5diff_50.txt | 12 + tools/h5diff/testfiles/h5diff_51.txt | 9 + tools/h5diff/testfiles/h5diff_52.txt | 9 + tools/h5diff/testfiles/h5diff_53.txt | 9 + tools/h5diff/testfiles/h5diff_54.txt | 9 + tools/h5diff/testfiles/h5diff_55.txt | 9 + tools/h5diff/testfiles/h5diff_56.txt | 9 + tools/h5diff/testfiles/h5diff_57.txt | 9 + tools/h5diff/testfiles/h5diff_58.txt | 10 + tools/h5diff/testfiles/h5diff_600.txt | 56 + tools/h5diff/testfiles/h5diff_603.txt | 56 + tools/h5diff/testfiles/h5diff_604.txt | 56 + tools/h5diff/testfiles/h5diff_605.txt | 56 + tools/h5diff/testfiles/h5diff_606.txt | 56 + tools/h5diff/testfiles/h5diff_607.txt | 2 + tools/h5diff/testfiles/h5diff_608.txt | 2 + tools/h5diff/testfiles/h5diff_609.txt | 0 tools/h5diff/testfiles/h5diff_610.txt | 2 + tools/h5diff/testfiles/h5diff_612.txt | 56 + tools/h5diff/testfiles/h5diff_613.txt | 56 + tools/h5diff/testfiles/h5diff_614.txt | 56 + tools/h5diff/testfiles/h5diff_615.txt | 56 + tools/h5diff/testfiles/h5diff_616.txt | 2 + tools/h5diff/testfiles/h5diff_617.txt | 2 + tools/h5diff/testfiles/h5diff_618.txt | 0 tools/h5diff/testfiles/h5diff_619.txt | 2 + tools/h5diff/testfiles/h5diff_621.txt | 56 + tools/h5diff/testfiles/h5diff_622.txt | 56 + tools/h5diff/testfiles/h5diff_623.txt | 56 + tools/h5diff/testfiles/h5diff_624.txt | 56 + tools/h5diff/testfiles/h5diff_625.txt | 2 + tools/h5diff/testfiles/h5diff_626.txt | 2 + tools/h5diff/testfiles/h5diff_627.txt | 2 + tools/h5diff/testfiles/h5diff_628.txt | 2 + tools/h5diff/testfiles/h5diff_629.txt | 1 + tools/h5diff/testfiles/h5diff_70.txt | 2030 + tools/h5diff/testfiles/h5diff_80.txt | 868 + tools/h5diff/testfiles/h5diff_90.txt | 22 + tools/h5diff/testfiles/h5diff_attr1.h5 | Bin 0 -> 26000 bytes tools/h5diff/testfiles/h5diff_attr2.h5 | Bin 0 -> 26000 bytes tools/h5diff/testfiles/h5diff_basic1.h5 | Bin 0 -> 9392 bytes tools/h5diff/testfiles/h5diff_basic2.h5 | Bin 0 -> 5728 bytes tools/h5diff/testfiles/h5diff_dset1.h5 | Bin 0 -> 22752 bytes tools/h5diff/testfiles/h5diff_dset2.h5 | Bin 0 -> 22752 bytes tools/h5diff/testfiles/h5diff_dtypes.h5 | Bin 0 -> 10776 bytes tools/h5diff/testfiles/h5diff_empty.h5 | Bin 0 -> 800 bytes tools/h5diff/testfiles/h5diff_hyper1.h5 | Bin 0 -> 1052720 bytes tools/h5diff/testfiles/h5diff_hyper2.h5 | Bin 0 -> 1052720 bytes tools/h5diff/testfiles/h5diff_types.h5 | Bin 0 -> 4778 bytes tools/h5diff/testh5diff.sh | 134 +- tools/h5repack/h5repack.sh.in | 12 +- tools/h5repack/testfiles/h5repack.info | 1 + tools/h5repack/testfiles/h5repack_attr.h5 | Bin 0 -> 20056 bytes tools/h5repack/testfiles/h5repack_deflate.h5 | Bin 0 -> 5962 bytes tools/h5repack/testfiles/h5repack_early.h5 | Bin 0 -> 2067224 bytes tools/h5repack/testfiles/h5repack_ext.bin | Bin 0 -> 8 bytes tools/h5repack/testfiles/h5repack_ext.h5 | Bin 0 -> 1464 bytes tools/h5repack/testfiles/h5repack_fill.h5 | Bin 0 -> 2072 bytes tools/h5repack/testfiles/h5repack_filters.h5 | Bin 0 -> 29744 bytes tools/h5repack/testfiles/h5repack_fletcher.h5 | Bin 0 -> 7880 bytes tools/h5repack/testfiles/h5repack_hlink.h5 | Bin 0 -> 6576 bytes tools/h5repack/testfiles/h5repack_layout.h5 | Bin 0 -> 29384 bytes tools/h5repack/testfiles/h5repack_nbit.h5 | Bin 0 -> 13776 bytes tools/h5repack/testfiles/h5repack_objs.h5 | Bin 0 -> 19589 bytes tools/h5repack/testfiles/h5repack_shuffle.h5 | Bin 0 -> 7864 bytes tools/h5repack/testfiles/h5repack_soffset.h5 | Bin 0 -> 11052 bytes tools/h5repack/testfiles/h5repack_szip.h5 | Bin 0 -> 5588 bytes tools/testfiles/h5copytst.h5 | Bin 30448 -> 0 bytes tools/testfiles/h5copytst.out.ls | 432 - tools/testfiles/h5diff_10.txt | 58 - tools/testfiles/h5diff_100.txt | 1040 - tools/testfiles/h5diff_101.txt | 12 - tools/testfiles/h5diff_102.txt | 12 - tools/testfiles/h5diff_11.txt | 5 - tools/testfiles/h5diff_12.txt | 5 - tools/testfiles/h5diff_13.txt | 13 - tools/testfiles/h5diff_14.txt | 13 - tools/testfiles/h5diff_15.txt | 12 - tools/testfiles/h5diff_16_1.txt | 16 - tools/testfiles/h5diff_16_2.txt | 16 - tools/testfiles/h5diff_16_3.txt | 16 - tools/testfiles/h5diff_17.txt | 42 - tools/testfiles/h5diff_18.txt | 3 - tools/testfiles/h5diff_20.txt | 7 - tools/testfiles/h5diff_21.txt | 7 - tools/testfiles/h5diff_22.txt | 7 - tools/testfiles/h5diff_23.txt | 5 - tools/testfiles/h5diff_24.txt | 5 - tools/testfiles/h5diff_25.txt | 5 - tools/testfiles/h5diff_26.txt | 5 - tools/testfiles/h5diff_27.txt | 5 - tools/testfiles/h5diff_28.txt | 5 - tools/testfiles/h5diff_50.txt | 15 - tools/testfiles/h5diff_51.txt | 12 - tools/testfiles/h5diff_52.txt | 12 - tools/testfiles/h5diff_53.txt | 12 - tools/testfiles/h5diff_54.txt | 12 - tools/testfiles/h5diff_55.txt | 12 - tools/testfiles/h5diff_56.txt | 12 - tools/testfiles/h5diff_57.txt | 12 - tools/testfiles/h5diff_58.txt | 13 - tools/testfiles/h5diff_600.txt | 59 - tools/testfiles/h5diff_602.txt | 59 - tools/testfiles/h5diff_603.txt | 59 - tools/testfiles/h5diff_604.txt | 59 - tools/testfiles/h5diff_605.txt | 59 - tools/testfiles/h5diff_606.txt | 59 - tools/testfiles/h5diff_607.txt | 5 - tools/testfiles/h5diff_608.txt | 5 - tools/testfiles/h5diff_609.txt | 3 - tools/testfiles/h5diff_610.txt | 5 - tools/testfiles/h5diff_611.txt | 59 - tools/testfiles/h5diff_612.txt | 59 - tools/testfiles/h5diff_613.txt | 59 - tools/testfiles/h5diff_614.txt | 59 - tools/testfiles/h5diff_615.txt | 59 - tools/testfiles/h5diff_616.txt | 5 - tools/testfiles/h5diff_617.txt | 5 - tools/testfiles/h5diff_618.txt | 3 - tools/testfiles/h5diff_619.txt | 5 - tools/testfiles/h5diff_620.txt | 59 - tools/testfiles/h5diff_621.txt | 59 - tools/testfiles/h5diff_622.txt | 59 - tools/testfiles/h5diff_623.txt | 59 - tools/testfiles/h5diff_624.txt | 59 - tools/testfiles/h5diff_625.txt | 5 - tools/testfiles/h5diff_626.txt | 5 - tools/testfiles/h5diff_627.txt | 5 - tools/testfiles/h5diff_628.txt | 5 - tools/testfiles/h5diff_629.txt | 4 - tools/testfiles/h5diff_70.txt | 2033 - tools/testfiles/h5diff_80.txt | 871 - tools/testfiles/h5diff_90.txt | 25 - tools/testfiles/h5diff_attr1.h5 | Bin 26000 -> 0 bytes tools/testfiles/h5diff_attr2.h5 | Bin 26000 -> 0 bytes tools/testfiles/h5diff_basic1.h5 | Bin 9392 -> 0 bytes tools/testfiles/h5diff_basic2.h5 | Bin 5728 -> 0 bytes tools/testfiles/h5diff_dset1.h5 | Bin 22752 -> 0 bytes tools/testfiles/h5diff_dset2.h5 | Bin 22752 -> 0 bytes tools/testfiles/h5diff_dtypes.h5 | Bin 10776 -> 0 bytes tools/testfiles/h5diff_empty.h5 | Bin 800 -> 0 bytes tools/testfiles/h5diff_hyper1.h5 | Bin 1052720 -> 0 bytes tools/testfiles/h5diff_hyper2.h5 | Bin 1052720 -> 0 bytes tools/testfiles/h5diff_types.h5 | Bin 4778 -> 0 bytes tools/testfiles/h5repack_attr.h5 | Bin 20056 -> 0 bytes tools/testfiles/h5repack_deflate.h5 | Bin 5962 -> 0 bytes tools/testfiles/h5repack_early.h5 | Bin 2067224 -> 0 bytes tools/testfiles/h5repack_ext.bin | Bin 8 -> 0 bytes tools/testfiles/h5repack_ext.h5 | Bin 1464 -> 0 bytes tools/testfiles/h5repack_fill.h5 | Bin 2072 -> 0 bytes tools/testfiles/h5repack_filters.h5 | Bin 29744 -> 0 bytes tools/testfiles/h5repack_fletcher.h5 | Bin 7880 -> 0 bytes tools/testfiles/h5repack_hlink.h5 | Bin 6576 -> 0 bytes tools/testfiles/h5repack_layout.h5 | Bin 29384 -> 0 bytes tools/testfiles/h5repack_nbit.h5 | Bin 13776 -> 0 bytes tools/testfiles/h5repack_objs.h5 | Bin 19589 -> 0 bytes tools/testfiles/h5repack_shuffle.h5 | Bin 7864 -> 0 bytes tools/testfiles/h5repack_soffset.h5 | Bin 11052 -> 0 bytes tools/testfiles/h5repack_szip.h5 | Bin 5588 -> 0 bytes tools/testfiles/info.h5repack | 1 - .../h5fort_type_defines/h5fort_type_defines.vfproj | 24 +- .../h5fortran_detect/h5fortran_detect.vfproj | 24 +- .../typegen/h5match_types/h5match_types.vcproj | 8 +- windows/misc/typegen/h5tinit/h5tinit.vcproj | 8 +- .../proj/hdf5_fortrandll/hdf5_fortrandll.vfproj | 28 +- windows/tools/h5copy/testh5copy.bat | 2 +- windows/tools/h5diff/testh5diff.bat | 159 +- windows/tools/h5repack/h5repack.bat | 9 +- windows_vnet/proj/all/all.sln | 2 - 239 files changed, 228393 insertions(+), 6347 deletions(-) create mode 100644 tools/h52jpeg/h52jpeg.sh create mode 100644 tools/h52jpeg/image24pixel.txt create mode 100644 tools/h52jpeg/image8.txt create mode 100644 tools/h52jpeg/testfiles/h52jpegtst.h5 create mode 100644 tools/h5copy/testfiles/h5copytst.h5 create mode 100644 tools/h5copy/testfiles/h5copytst.out.ls create mode 100644 tools/h5diff/testfiles/h5diff_10.txt create mode 100644 tools/h5diff/testfiles/h5diff_100.txt create mode 100644 tools/h5diff/testfiles/h5diff_101.txt create mode 100644 tools/h5diff/testfiles/h5diff_102.txt create mode 100644 tools/h5diff/testfiles/h5diff_11.txt create mode 100644 tools/h5diff/testfiles/h5diff_12.txt create mode 100644 tools/h5diff/testfiles/h5diff_13.txt create mode 100644 tools/h5diff/testfiles/h5diff_14.txt create mode 100644 tools/h5diff/testfiles/h5diff_15.txt create mode 100644 tools/h5diff/testfiles/h5diff_16_1.txt create mode 100644 tools/h5diff/testfiles/h5diff_16_2.txt create mode 100644 tools/h5diff/testfiles/h5diff_16_3.txt create mode 100644 tools/h5diff/testfiles/h5diff_17.txt create mode 100644 tools/h5diff/testfiles/h5diff_18.txt create mode 100644 tools/h5diff/testfiles/h5diff_20.txt create mode 100644 tools/h5diff/testfiles/h5diff_21.txt create mode 100644 tools/h5diff/testfiles/h5diff_22.txt create mode 100644 tools/h5diff/testfiles/h5diff_23.txt create mode 100644 tools/h5diff/testfiles/h5diff_24.txt create mode 100644 tools/h5diff/testfiles/h5diff_25.txt create mode 100644 tools/h5diff/testfiles/h5diff_26.txt create mode 100644 tools/h5diff/testfiles/h5diff_27.txt create mode 100644 tools/h5diff/testfiles/h5diff_28.txt create mode 100644 tools/h5diff/testfiles/h5diff_50.txt create mode 100644 tools/h5diff/testfiles/h5diff_51.txt create mode 100644 tools/h5diff/testfiles/h5diff_52.txt create mode 100644 tools/h5diff/testfiles/h5diff_53.txt create mode 100644 tools/h5diff/testfiles/h5diff_54.txt create mode 100644 tools/h5diff/testfiles/h5diff_55.txt create mode 100644 tools/h5diff/testfiles/h5diff_56.txt create mode 100644 tools/h5diff/testfiles/h5diff_57.txt create mode 100644 tools/h5diff/testfiles/h5diff_58.txt create mode 100644 tools/h5diff/testfiles/h5diff_600.txt create mode 100644 tools/h5diff/testfiles/h5diff_603.txt create mode 100644 tools/h5diff/testfiles/h5diff_604.txt create mode 100644 tools/h5diff/testfiles/h5diff_605.txt create mode 100644 tools/h5diff/testfiles/h5diff_606.txt create mode 100644 tools/h5diff/testfiles/h5diff_607.txt create mode 100644 tools/h5diff/testfiles/h5diff_608.txt create mode 100644 tools/h5diff/testfiles/h5diff_609.txt create mode 100644 tools/h5diff/testfiles/h5diff_610.txt create mode 100644 tools/h5diff/testfiles/h5diff_612.txt create mode 100644 tools/h5diff/testfiles/h5diff_613.txt create mode 100644 tools/h5diff/testfiles/h5diff_614.txt create mode 100644 tools/h5diff/testfiles/h5diff_615.txt create mode 100644 tools/h5diff/testfiles/h5diff_616.txt create mode 100644 tools/h5diff/testfiles/h5diff_617.txt create mode 100644 tools/h5diff/testfiles/h5diff_618.txt create mode 100644 tools/h5diff/testfiles/h5diff_619.txt create mode 100644 tools/h5diff/testfiles/h5diff_621.txt create mode 100644 tools/h5diff/testfiles/h5diff_622.txt create mode 100644 tools/h5diff/testfiles/h5diff_623.txt create mode 100644 tools/h5diff/testfiles/h5diff_624.txt create mode 100644 tools/h5diff/testfiles/h5diff_625.txt create mode 100644 tools/h5diff/testfiles/h5diff_626.txt create mode 100644 tools/h5diff/testfiles/h5diff_627.txt create mode 100644 tools/h5diff/testfiles/h5diff_628.txt create mode 100644 tools/h5diff/testfiles/h5diff_629.txt create mode 100644 tools/h5diff/testfiles/h5diff_70.txt create mode 100644 tools/h5diff/testfiles/h5diff_80.txt create mode 100644 tools/h5diff/testfiles/h5diff_90.txt create mode 100644 tools/h5diff/testfiles/h5diff_attr1.h5 create mode 100644 tools/h5diff/testfiles/h5diff_attr2.h5 create mode 100644 tools/h5diff/testfiles/h5diff_basic1.h5 create mode 100644 tools/h5diff/testfiles/h5diff_basic2.h5 create mode 100644 tools/h5diff/testfiles/h5diff_dset1.h5 create mode 100644 tools/h5diff/testfiles/h5diff_dset2.h5 create mode 100644 tools/h5diff/testfiles/h5diff_dtypes.h5 create mode 100644 tools/h5diff/testfiles/h5diff_empty.h5 create mode 100644 tools/h5diff/testfiles/h5diff_hyper1.h5 create mode 100644 tools/h5diff/testfiles/h5diff_hyper2.h5 create mode 100644 tools/h5diff/testfiles/h5diff_types.h5 create mode 100644 tools/h5repack/testfiles/h5repack.info create mode 100644 tools/h5repack/testfiles/h5repack_attr.h5 create mode 100644 tools/h5repack/testfiles/h5repack_deflate.h5 create mode 100644 tools/h5repack/testfiles/h5repack_early.h5 create mode 100644 tools/h5repack/testfiles/h5repack_ext.bin create mode 100644 tools/h5repack/testfiles/h5repack_ext.h5 create mode 100644 tools/h5repack/testfiles/h5repack_fill.h5 create mode 100644 tools/h5repack/testfiles/h5repack_filters.h5 create mode 100644 tools/h5repack/testfiles/h5repack_fletcher.h5 create mode 100644 tools/h5repack/testfiles/h5repack_hlink.h5 create mode 100644 tools/h5repack/testfiles/h5repack_layout.h5 create mode 100644 tools/h5repack/testfiles/h5repack_nbit.h5 create mode 100644 tools/h5repack/testfiles/h5repack_objs.h5 create mode 100644 tools/h5repack/testfiles/h5repack_shuffle.h5 create mode 100644 tools/h5repack/testfiles/h5repack_soffset.h5 create mode 100644 tools/h5repack/testfiles/h5repack_szip.h5 delete mode 100644 tools/testfiles/h5copytst.h5 delete mode 100644 tools/testfiles/h5copytst.out.ls delete mode 100644 tools/testfiles/h5diff_10.txt delete mode 100644 tools/testfiles/h5diff_100.txt delete mode 100644 tools/testfiles/h5diff_101.txt delete mode 100644 tools/testfiles/h5diff_102.txt delete mode 100644 tools/testfiles/h5diff_11.txt delete mode 100644 tools/testfiles/h5diff_12.txt delete mode 100644 tools/testfiles/h5diff_13.txt delete mode 100644 tools/testfiles/h5diff_14.txt delete mode 100644 tools/testfiles/h5diff_15.txt delete mode 100644 tools/testfiles/h5diff_16_1.txt delete mode 100644 tools/testfiles/h5diff_16_2.txt delete mode 100644 tools/testfiles/h5diff_16_3.txt delete mode 100644 tools/testfiles/h5diff_17.txt delete mode 100644 tools/testfiles/h5diff_18.txt delete mode 100644 tools/testfiles/h5diff_20.txt delete mode 100644 tools/testfiles/h5diff_21.txt delete mode 100644 tools/testfiles/h5diff_22.txt delete mode 100644 tools/testfiles/h5diff_23.txt delete mode 100644 tools/testfiles/h5diff_24.txt delete mode 100644 tools/testfiles/h5diff_25.txt delete mode 100644 tools/testfiles/h5diff_26.txt delete mode 100644 tools/testfiles/h5diff_27.txt delete mode 100644 tools/testfiles/h5diff_28.txt delete mode 100644 tools/testfiles/h5diff_50.txt delete mode 100644 tools/testfiles/h5diff_51.txt delete mode 100644 tools/testfiles/h5diff_52.txt delete mode 100644 tools/testfiles/h5diff_53.txt delete mode 100644 tools/testfiles/h5diff_54.txt delete mode 100644 tools/testfiles/h5diff_55.txt delete mode 100644 tools/testfiles/h5diff_56.txt delete mode 100644 tools/testfiles/h5diff_57.txt delete mode 100644 tools/testfiles/h5diff_58.txt delete mode 100644 tools/testfiles/h5diff_600.txt delete mode 100644 tools/testfiles/h5diff_602.txt delete mode 100644 tools/testfiles/h5diff_603.txt delete mode 100644 tools/testfiles/h5diff_604.txt delete mode 100644 tools/testfiles/h5diff_605.txt delete mode 100644 tools/testfiles/h5diff_606.txt delete mode 100644 tools/testfiles/h5diff_607.txt delete mode 100644 tools/testfiles/h5diff_608.txt delete mode 100644 tools/testfiles/h5diff_609.txt delete mode 100644 tools/testfiles/h5diff_610.txt delete mode 100644 tools/testfiles/h5diff_611.txt delete mode 100644 tools/testfiles/h5diff_612.txt delete mode 100644 tools/testfiles/h5diff_613.txt delete mode 100644 tools/testfiles/h5diff_614.txt delete mode 100644 tools/testfiles/h5diff_615.txt delete mode 100644 tools/testfiles/h5diff_616.txt delete mode 100644 tools/testfiles/h5diff_617.txt delete mode 100644 tools/testfiles/h5diff_618.txt delete mode 100644 tools/testfiles/h5diff_619.txt delete mode 100644 tools/testfiles/h5diff_620.txt delete mode 100644 tools/testfiles/h5diff_621.txt delete mode 100644 tools/testfiles/h5diff_622.txt delete mode 100644 tools/testfiles/h5diff_623.txt delete mode 100644 tools/testfiles/h5diff_624.txt delete mode 100644 tools/testfiles/h5diff_625.txt delete mode 100644 tools/testfiles/h5diff_626.txt delete mode 100644 tools/testfiles/h5diff_627.txt delete mode 100644 tools/testfiles/h5diff_628.txt delete mode 100644 tools/testfiles/h5diff_629.txt delete mode 100644 tools/testfiles/h5diff_70.txt delete mode 100644 tools/testfiles/h5diff_80.txt delete mode 100644 tools/testfiles/h5diff_90.txt delete mode 100644 tools/testfiles/h5diff_attr1.h5 delete mode 100644 tools/testfiles/h5diff_attr2.h5 delete mode 100644 tools/testfiles/h5diff_basic1.h5 delete mode 100644 tools/testfiles/h5diff_basic2.h5 delete mode 100644 tools/testfiles/h5diff_dset1.h5 delete mode 100644 tools/testfiles/h5diff_dset2.h5 delete mode 100644 tools/testfiles/h5diff_dtypes.h5 delete mode 100644 tools/testfiles/h5diff_empty.h5 delete mode 100644 tools/testfiles/h5diff_hyper1.h5 delete mode 100644 tools/testfiles/h5diff_hyper2.h5 delete mode 100644 tools/testfiles/h5diff_types.h5 delete mode 100644 tools/testfiles/h5repack_attr.h5 delete mode 100644 tools/testfiles/h5repack_deflate.h5 delete mode 100644 tools/testfiles/h5repack_early.h5 delete mode 100644 tools/testfiles/h5repack_ext.bin delete mode 100644 tools/testfiles/h5repack_ext.h5 delete mode 100644 tools/testfiles/h5repack_fill.h5 delete mode 100644 tools/testfiles/h5repack_filters.h5 delete mode 100644 tools/testfiles/h5repack_fletcher.h5 delete mode 100644 tools/testfiles/h5repack_hlink.h5 delete mode 100644 tools/testfiles/h5repack_layout.h5 delete mode 100644 tools/testfiles/h5repack_nbit.h5 delete mode 100644 tools/testfiles/h5repack_objs.h5 delete mode 100644 tools/testfiles/h5repack_shuffle.h5 delete mode 100644 tools/testfiles/h5repack_soffset.h5 delete mode 100644 tools/testfiles/h5repack_szip.h5 delete mode 100644 tools/testfiles/info.h5repack diff --git a/MANIFEST b/MANIFEST index fb22acd..424338b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1386,103 +1386,100 @@ #test files for h5diff -./tools/testfiles/h5diff_10.txt -./tools/testfiles/h5diff_11.txt -./tools/testfiles/h5diff_12.txt -./tools/testfiles/h5diff_13.txt -./tools/testfiles/h5diff_14.txt -./tools/testfiles/h5diff_15.txt -./tools/testfiles/h5diff_16_1.txt -./tools/testfiles/h5diff_16_2.txt -./tools/testfiles/h5diff_16_3.txt -./tools/testfiles/h5diff_17.txt -./tools/testfiles/h5diff_18.txt -./tools/testfiles/h5diff_20.txt -./tools/testfiles/h5diff_21.txt -./tools/testfiles/h5diff_22.txt -./tools/testfiles/h5diff_23.txt -./tools/testfiles/h5diff_24.txt -./tools/testfiles/h5diff_25.txt -./tools/testfiles/h5diff_26.txt -./tools/testfiles/h5diff_27.txt -./tools/testfiles/h5diff_28.txt -./tools/testfiles/h5diff_50.txt -./tools/testfiles/h5diff_51.txt -./tools/testfiles/h5diff_52.txt -./tools/testfiles/h5diff_53.txt -./tools/testfiles/h5diff_54.txt -./tools/testfiles/h5diff_55.txt -./tools/testfiles/h5diff_56.txt -./tools/testfiles/h5diff_57.txt -./tools/testfiles/h5diff_58.txt -./tools/testfiles/h5diff_600.txt -./tools/testfiles/h5diff_602.txt -./tools/testfiles/h5diff_603.txt -./tools/testfiles/h5diff_604.txt -./tools/testfiles/h5diff_605.txt -./tools/testfiles/h5diff_606.txt -./tools/testfiles/h5diff_607.txt -./tools/testfiles/h5diff_608.txt -./tools/testfiles/h5diff_609.txt -./tools/testfiles/h5diff_610.txt -./tools/testfiles/h5diff_611.txt -./tools/testfiles/h5diff_612.txt -./tools/testfiles/h5diff_613.txt -./tools/testfiles/h5diff_614.txt -./tools/testfiles/h5diff_615.txt -./tools/testfiles/h5diff_616.txt -./tools/testfiles/h5diff_617.txt -./tools/testfiles/h5diff_618.txt -./tools/testfiles/h5diff_619.txt -./tools/testfiles/h5diff_620.txt -./tools/testfiles/h5diff_621.txt -./tools/testfiles/h5diff_622.txt -./tools/testfiles/h5diff_623.txt -./tools/testfiles/h5diff_624.txt -./tools/testfiles/h5diff_625.txt -./tools/testfiles/h5diff_626.txt -./tools/testfiles/h5diff_627.txt -./tools/testfiles/h5diff_628.txt -./tools/testfiles/h5diff_629.txt -./tools/testfiles/h5diff_70.txt -./tools/testfiles/h5diff_80.txt -./tools/testfiles/h5diff_90.txt -./tools/testfiles/h5diff_100.txt -./tools/testfiles/h5diff_101.txt -./tools/testfiles/h5diff_102.txt - - -./tools/testfiles/h5diff_basic1.h5 -./tools/testfiles/h5diff_basic2.h5 -./tools/testfiles/h5diff_dtypes.h5 -./tools/testfiles/h5diff_dset1.h5 -./tools/testfiles/h5diff_dset2.h5 -./tools/testfiles/h5diff_empty.h5 -./tools/testfiles/h5diff_hyper1.h5 -./tools/testfiles/h5diff_attr1.h5 -./tools/testfiles/h5diff_hyper2.h5 -./tools/testfiles/h5diff_attr2.h5 -./tools/testfiles/h5diff_types.h5 +./tools/h5diff/testfiles/h5diff_10.txt +./tools/h5diff/testfiles/h5diff_11.txt +./tools/h5diff/testfiles/h5diff_12.txt +./tools/h5diff/testfiles/h5diff_13.txt +./tools/h5diff/testfiles/h5diff_14.txt +./tools/h5diff/testfiles/h5diff_15.txt +./tools/h5diff/testfiles/h5diff_16_1.txt +./tools/h5diff/testfiles/h5diff_16_2.txt +./tools/h5diff/testfiles/h5diff_16_3.txt +./tools/h5diff/testfiles/h5diff_17.txt +./tools/h5diff/testfiles/h5diff_18.txt +./tools/h5diff/testfiles/h5diff_20.txt +./tools/h5diff/testfiles/h5diff_21.txt +./tools/h5diff/testfiles/h5diff_22.txt +./tools/h5diff/testfiles/h5diff_23.txt +./tools/h5diff/testfiles/h5diff_24.txt +./tools/h5diff/testfiles/h5diff_25.txt +./tools/h5diff/testfiles/h5diff_26.txt +./tools/h5diff/testfiles/h5diff_27.txt +./tools/h5diff/testfiles/h5diff_28.txt +./tools/h5diff/testfiles/h5diff_50.txt +./tools/h5diff/testfiles/h5diff_51.txt +./tools/h5diff/testfiles/h5diff_52.txt +./tools/h5diff/testfiles/h5diff_53.txt +./tools/h5diff/testfiles/h5diff_54.txt +./tools/h5diff/testfiles/h5diff_55.txt +./tools/h5diff/testfiles/h5diff_56.txt +./tools/h5diff/testfiles/h5diff_57.txt +./tools/h5diff/testfiles/h5diff_58.txt +./tools/h5diff/testfiles/h5diff_600.txt +./tools/h5diff/testfiles/h5diff_603.txt +./tools/h5diff/testfiles/h5diff_604.txt +./tools/h5diff/testfiles/h5diff_605.txt +./tools/h5diff/testfiles/h5diff_606.txt +./tools/h5diff/testfiles/h5diff_607.txt +./tools/h5diff/testfiles/h5diff_608.txt +./tools/h5diff/testfiles/h5diff_609.txt +./tools/h5diff/testfiles/h5diff_610.txt +./tools/h5diff/testfiles/h5diff_612.txt +./tools/h5diff/testfiles/h5diff_613.txt +./tools/h5diff/testfiles/h5diff_614.txt +./tools/h5diff/testfiles/h5diff_615.txt +./tools/h5diff/testfiles/h5diff_616.txt +./tools/h5diff/testfiles/h5diff_617.txt +./tools/h5diff/testfiles/h5diff_618.txt +./tools/h5diff/testfiles/h5diff_619.txt +./tools/h5diff/testfiles/h5diff_621.txt +./tools/h5diff/testfiles/h5diff_622.txt +./tools/h5diff/testfiles/h5diff_623.txt +./tools/h5diff/testfiles/h5diff_624.txt +./tools/h5diff/testfiles/h5diff_625.txt +./tools/h5diff/testfiles/h5diff_626.txt +./tools/h5diff/testfiles/h5diff_627.txt +./tools/h5diff/testfiles/h5diff_628.txt +./tools/h5diff/testfiles/h5diff_629.txt +./tools/h5diff/testfiles/h5diff_70.txt +./tools/h5diff/testfiles/h5diff_80.txt +./tools/h5diff/testfiles/h5diff_90.txt +./tools/h5diff/testfiles/h5diff_100.txt +./tools/h5diff/testfiles/h5diff_101.txt +./tools/h5diff/testfiles/h5diff_102.txt + + +./tools/h5diff/testfiles/h5diff_basic1.h5 +./tools/h5diff/testfiles/h5diff_basic2.h5 +./tools/h5diff/testfiles/h5diff_dtypes.h5 +./tools/h5diff/testfiles/h5diff_dset1.h5 +./tools/h5diff/testfiles/h5diff_dset2.h5 +./tools/h5diff/testfiles/h5diff_empty.h5 +./tools/h5diff/testfiles/h5diff_hyper1.h5 +./tools/h5diff/testfiles/h5diff_attr1.h5 +./tools/h5diff/testfiles/h5diff_hyper2.h5 +./tools/h5diff/testfiles/h5diff_attr2.h5 +./tools/h5diff/testfiles/h5diff_types.h5 #test files for h5repack -./tools/testfiles/h5repack_fill.h5 -./tools/testfiles/h5repack_objs.h5 -./tools/testfiles/h5repack_attr.h5 -./tools/testfiles/h5repack_hlink.h5 -./tools/testfiles/h5repack_layout.h5 -./tools/testfiles/h5repack_early.h5 -./tools/testfiles/h5repack_szip.h5 -./tools/testfiles/h5repack_deflate.h5 -./tools/testfiles/h5repack_shuffle.h5 -./tools/testfiles/h5repack_fletcher.h5 -./tools/testfiles/h5repack_filters.h5 -./tools/testfiles/h5repack_nbit.h5 -./tools/testfiles/h5repack_soffset.h5 -./tools/testfiles/info.h5repack -./tools/testfiles/h5repack_ext.bin -./tools/testfiles/h5repack_ext.h5 +./tools/h5repack/testfiles/h5repack_fill.h5 +./tools/h5repack/testfiles/h5repack_objs.h5 +./tools/h5repack/testfiles/h5repack_attr.h5 +./tools/h5repack/testfiles/h5repack_hlink.h5 +./tools/h5repack/testfiles/h5repack_layout.h5 +./tools/h5repack/testfiles/h5repack_early.h5 +./tools/h5repack/testfiles/h5repack_szip.h5 +./tools/h5repack/testfiles/h5repack_deflate.h5 +./tools/h5repack/testfiles/h5repack_shuffle.h5 +./tools/h5repack/testfiles/h5repack_fletcher.h5 +./tools/h5repack/testfiles/h5repack_filters.h5 +./tools/h5repack/testfiles/h5repack_nbit.h5 +./tools/h5repack/testfiles/h5repack_soffset.h5 +./tools/h5repack/testfiles/h5repack.info +./tools/h5repack/testfiles/h5repack_ext.bin +./tools/h5repack/testfiles/h5repack_ext.h5 @@ -1505,8 +1502,8 @@ ./tools/testfiles/u513.txt # test files for h5copy -./tools/testfiles/h5copytst.h5 -./tools/testfiles/h5copytst.out.ls +./tools/h5copy/testfiles/h5copytst.h5 +./tools/h5copy/testfiles/h5copytst.out.ls # test files for h5mkgrp ./tools/testfiles/h5mkgrp_help.ls @@ -1523,8 +1520,13 @@ #h52jpeg ./tools/h52jpeg/Makefile.in ./tools/h52jpeg/Makefile.am +./tools/h52jpeg/h52jpeg.sh ./tools/h52jpeg/h52jpeg.c ./tools/h52jpeg/h52jpegtst.c +./tools/h52jpeg/image24pixel.txt +./tools/h52jpeg/image8.txt +./tools/h52jpeg/testfiles/h52jpegtst.h5 + # high level libraries ./hl/COPYING diff --git a/README.txt b/README.txt index ddcc8b4..35f2791 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.9.7 currently under development +HDF5 version 1.9.8 currently under development Please refer to the release_docs/INSTALL file for installation instructions. ------------------------------------------------------------------------------ diff --git a/config/gnu-flags b/config/gnu-flags index 401bafe..a8e16cb 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -138,7 +138,7 @@ case "$cc_vendor-$cc_version" in esac # General - H5_CFLAGS="$H5_CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline" + H5_CFLAGS="$H5_CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline" # Production case "$cc_vendor-$cc_version" in @@ -187,7 +187,7 @@ case "$cc_vendor-$cc_version" in # Closer to the gcc 4.4 release, we should check for additional flags to # include and break it out into it's own section, like the other versions # below. -QAK - gcc-4.[123]*) + gcc-4.3*) # Replace -ansi flag with -std=c99 flag H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`" @@ -202,13 +202,13 @@ case "$cc_vendor-$cc_version" in H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute" # Append warning flags from gcc-3.2* case - H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" + H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization" - # Enable mort format checking flags, beyond the basic -Wformat included + # Enable more format checking flags, beyond the basic -Wformat included # in -Wall - H5_CFLAGS="$H5_CFLAGS -Wformat-nonliteral -Wformat-security -Wformat-y2k" + H5_CFLAGS="$H5_CFLAGS -Wformat=2" - # The "unreachable code" warning does not appear to be reliable yet... + # The "unreachable code" warning appears to be reliable now... H5_CFLAGS="$H5_CFLAGS -Wunreachable-code" # Append warning flags from gcc-3.3* case @@ -221,9 +221,111 @@ case "$cc_vendor-$cc_version" in H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`" # Append more extra warning flags that only gcc4.0+ know about - H5_CFLAGS="$H5_CFLAGS -Wmissing-field-initializers -Wvariadic-macros" + H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros" - # Append more extra warning flags that only gcc4.1+ know about + # Append more extra warning flags that only gcc 4.1+ know about + H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var" + + # Append more extra warning flags that only gcc 4.2+ know about + H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow" + + # Append more extra warning flags that only gcc 4.3+ know about + # + # Technically, variable-length arrays are part of the C99 standard, but + # we should approach them a bit cautiously... -QAK + H5_CFLAGS="$H5_CFLAGS -Wlogical-op -Wvla" + + # Try out the new "stack protector" feature in gcc 4.1 + # (Strictly speaking this isn't really a "warning" flag, so it's added to + # the debugging flags) + #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all" + ;; + + gcc-4.2*) + # Replace -ansi flag with -std=c99 flag + H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`" + + # Disable warnings about using 'long long' type + H5_CFLAGS="$H5_CFLAGS -Wno-long-long" + + # Append warning flags from gcc-3* case + # (don't use -Wpadded flag for normal builds, many of the warnings its + # issuing can't be fixed and they are making it hard to detect other, + # more important warnings) + #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded" + H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute" + + # Append warning flags from gcc-3.2* case + H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization" + + # Enable more format checking flags, beyond the basic -Wformat included + # in -Wall + H5_CFLAGS="$H5_CFLAGS -Wformat=2" + + # The "unreachable code" warning does not appear to be reliable yet... + H5_CFLAGS="$H5_CFLAGS -Wunreachable-code" + + # Append warning flags from gcc-3.3* case + H5_CFLAGS="$H5_CFLAGS -Wendif-labels" + + # Append warning flags from gcc-3.4* case + H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch" + + # Replace old -W flag with new -Wextra flag + H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`" + + # Append more extra warning flags that only gcc 4.0+ know about + H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros" + + # Append more extra warning flags that only gcc 4.1+ know about + H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var" + + # Append more extra warning flags that only gcc 4.2+ know about + H5_CFLAGS="$H5_CFLAGS -Wstrict-overflow" + + # Try out the new "stack protector" feature in gcc 4.1 + # (Strictly speaking this isn't really a "warning" flag, so it's added to + # the debugging flags) + #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all" + ;; + + gcc-4.1*) + # Replace -ansi flag with -std=c99 flag + H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`" + + # Disable warnings about using 'long long' type + H5_CFLAGS="$H5_CFLAGS -Wno-long-long" + + # Append warning flags from gcc-3* case + # (don't use -Wpadded flag for normal builds, many of the warnings its + # issuing can't be fixed and they are making it hard to detect other, + # more important warnings) + #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded" + H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute" + + # Append warning flags from gcc-3.2* case + H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization" + + # Enable more format checking flags, beyond the basic -Wformat included + # in -Wall + H5_CFLAGS="$H5_CFLAGS -Wformat=2" + + # The "unreachable code" warning does not appear to be reliable yet... + H5_CFLAGS="$H5_CFLAGS -Wunreachable-code" + + # Append warning flags from gcc-3.3* case + H5_CFLAGS="$H5_CFLAGS -Wendif-labels" + + # Append warning flags from gcc-3.4* case + H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch" + + # Replace old -W flag with new -Wextra flag + H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`" + + # Append more extra warning flags that only gcc 4.0+ know about + H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros" + + # Append more extra warning flags that only gcc 4.1+ know about H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var" # Try out the new "stack protector" feature in gcc 4.1 @@ -247,7 +349,7 @@ case "$cc_vendor-$cc_version" in H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute" # Append warning flags from gcc-3.2* case - H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" + H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization" # The "format=2" warning generates too many warnings about valid # usage in the library. @@ -265,8 +367,8 @@ case "$cc_vendor-$cc_version" in # Replace old -W flag with new -Wextra flag H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`" - # Append more extra warning flags that only gcc4.0+ know about - H5_CFLAGS="$H5_CFLAGS -Wmissing-field-initializers -Wvariadic-macros" + # Append more extra warning flags that only gcc 4.0+ know about + H5_CFLAGS="$H5_CFLAGS -Wvariadic-macros -Wnonnull -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-macros" ;; gcc-3.4*) @@ -284,7 +386,7 @@ case "$cc_vendor-$cc_version" in H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute" # Append warning flags from gcc-3.2* case - H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" + H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization" # The "format=2" warning generates too many warnings about valid # usage in the library. @@ -318,7 +420,7 @@ case "$cc_vendor-$cc_version" in H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute" # Append warning flags from gcc-3.2* case - H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" + H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization" # The "format=2" warning generates too many warnings about valid # usage in the library. @@ -346,7 +448,7 @@ case "$cc_vendor-$cc_version" in H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute" # Append more extra warning flags that only gcc3.2+ know about - H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" + H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization" # The "format=2" warning generates too many warnings about valid # usage in the library. diff --git a/config/lt_vers.am b/config/lt_vers.am index e8922b4..75a15e8 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -17,7 +17,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 5 -LT_VERS_REVISION = 8 +LT_VERS_REVISION = 9 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and diff --git a/configure b/configure index cc830b5..56b82e8 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in 15262 2008-06-23 19:16:31Z koziol . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for HDF5 1.9.7. +# Generated by GNU Autoconf 2.61 for HDF5 1.9.8. # # Report bugs to . # @@ -724,8 +724,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.9.7' -PACKAGE_STRING='HDF5 1.9.7' +PACKAGE_VERSION='1.9.8' +PACKAGE_STRING='HDF5 1.9.8' PACKAGE_BUGREPORT='help@hdfgroup.org' ac_unique_file="src/H5.c" @@ -1490,7 +1490,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.9.7 to adapt to many kinds of systems. +\`configure' configures HDF5 1.9.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1560,7 +1560,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.9.7:";; + short | recursive ) echo "Configuration of HDF5 1.9.8:";; esac cat <<\_ACEOF @@ -1742,7 +1742,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.9.7 +HDF5 configure 1.9.8 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1756,7 +1756,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.9.7, which was +It was created by HDF5 $as_me 1.9.8, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2451,7 +2451,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.9.7' + VERSION='1.9.8' cat >>confdefs.h <<_ACEOF @@ -51116,7 +51116,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.9.7, which was +This file was extended by HDF5 $as_me 1.9.8, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -51169,7 +51169,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 config.status 1.9.7 +HDF5 config.status 1.9.8 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index dcc4a8c..922db87 100644 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5], [1.9.7], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.9.8], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AM_CONFIG_HEADER([src/H5config.h]) diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c index 633389b..490d739 100644 --- a/fortran/src/H5Tf.c +++ b/fortran/src/H5Tf.c @@ -1840,3 +1840,29 @@ nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag) ret_value = 0; return ret_value; } +/*---------------------------------------------------------------------------- + * Name: h5tget_native_type_c + * Purpose: Call H5Tget_native_type + * Inputs: + * dtype_id - Datatype identifier for the dataset datatype. + * direction - Direction of search. + * Outputs: native_dtype_id - The native datatype identifier for the specified dataset datatype + * Returns: 0 on success, -1 on failure + * Programmer: M.S. Breitenfeld + * June 18, 2008 + * Modifications: + *---------------------------------------------------------------------------*/ + +int_f +nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id) +{ + int ret_value = -1; + hid_t status; + + status = H5Tget_native_type( (hid_t)*dtype_id, (H5T_direction_t)*direction); + if ( status < 0 ) return ret_value; + *native_dtype_id = (hid_t_f)status; + ret_value = 0; + return ret_value; +} + diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90 index 8f12886..7a812ab 100644 --- a/fortran/src/H5Tff.f90 +++ b/fortran/src/H5Tff.f90 @@ -3646,4 +3646,62 @@ CONTAINS END SUBROUTINE h5tcompiler_conv_f +!---------------------------------------------------------------------- +! Name: h5tget_native_type_f +! +! Purpose: Returns the native datatype of a specified datatype. +! +! Inputs: +! dtype_id - Datatype identifier for the dataset datatype. +! * +! direction - Direction of search: +! H5T_DIR_DEFAULT = 0, /*default direction is inscendent */ +! H5T_DIR_ASCEND = 1, /*in inscendent order */ +! H5T_DIR_DESCEND = 2 /*in descendent order */ +! * NOTE: In C it is defined as a structure: H5T_direction_t +! +! Outputs: +! native_dtype_id - The native datatype identifier for the specified dataset datatype +! hdferr: - Error code +! Success: 0 +! Failure: -1 +! Optional parameters: +! NONE +! +! Programmer: M.S. Breitenfeld +! June 18, 2008 +! +! Modifications: N/A +! +!---------------------------------------------------------------------- + + SUBROUTINE h5tget_native_type_f(dtype_id, direction, native_dtype_id, hdferr) +!This definition is needed for Windows DLLs +!DEC$if defined(BUILD_HDF5_DLL) +!DEC$attributes dllexport :: h5tget_native_type_f +!DEC$endif + IMPLICIT NONE + INTEGER(HID_T), INTENT(IN) :: dtype_id ! Datatype identifier + INTEGER, INTENT(IN) :: direction ! Direction of search: + ! H5T_DIR_ASCEND_F = 1 in inscendent order + ! H5T_DIR_DESCEND_F = 2 in descendent order + INTEGER(HID_T), INTENT(OUT) :: native_dtype_id ! The native datatype identifier + INTEGER, INTENT(OUT) :: hdferr ! Error code: + ! 0 on success and -1 on failure + INTERFACE + INTEGER FUNCTION h5tget_native_type_c(dtype_id, direction, native_dtype_id) + USE H5GLOBAL + !DEC$ IF DEFINED(HDF5F90_WINDOWS) + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_NATIVE_TYPE_C'::h5tget_native_type_c + !DEC$ ENDIF + INTEGER(HID_T), INTENT(IN) :: dtype_id + INTEGER, INTENT(IN) :: direction + INTEGER(HID_T), INTENT(OUT) :: native_dtype_id + END FUNCTION h5tget_native_type_c + END INTERFACE + + hdferr = h5tget_native_type_c(dtype_id, direction, native_dtype_id) + END SUBROUTINE h5tget_native_type_f + + END MODULE H5T diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index 8df766c..efc478d 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -484,6 +484,8 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags, h5t_flags[28] = (int_f)H5T_STR_ERROR; h5t_flags[29] = (int_f)H5T_VLEN; h5t_flags[30] = (int_f)H5T_ARRAY; + h5t_flags[31] = (int_f)H5T_DIR_ASCEND; + h5t_flags[32] = (int_f)H5T_DIR_DESCEND; /* * H5Z flags */ diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 251e49c..bf2d715 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -625,11 +625,10 @@ EQUIVALENCE(H5S_flags(19), H5S_SEL_HYPERSLABS_F) EQUIVALENCE(H5S_flags(20), H5S_SEL_ALL_F) - ! ! H5T flags declaration ! - INTEGER, PARAMETER :: H5T_FLAGS_LEN = 31 + INTEGER, PARAMETER :: H5T_FLAGS_LEN = 33 INTEGER H5T_flags(H5T_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ ATTRIBUTES DLLEXPORT :: /H5T_FLAGS/ @@ -667,6 +666,8 @@ INTEGER :: H5T_STR_NULLPAD_F INTEGER :: H5T_STR_SPACEPAD_F INTEGER :: H5T_STR_ERROR_F + INTEGER :: H5T_DIR_ASCEND_F + INTEGER :: H5T_DIR_DESCEND_F EQUIVALENCE(H5T_flags(1), H5T_NO_CLASS_F) EQUIVALENCE(H5T_flags(2), H5T_INTEGER_F) @@ -699,6 +700,8 @@ EQUIVALENCE(H5T_flags(29), H5T_STR_ERROR_F) EQUIVALENCE(H5T_flags(30), H5T_VLEN_F) EQUIVALENCE(H5T_flags(31), H5T_ARRAY_F) + EQUIVALENCE(H5T_flags(32), H5T_DIR_ASCEND_F) + EQUIVALENCE(H5T_flags(33), H5T_DIR_DESCEND_F) ! ! H5Z flags declaration diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index b06be58..3f8f361 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -666,6 +666,7 @@ H5_FCDLL int_f nh5arename_c( hid_t_f *loc_id, # define nh5tencode_c H5_FC_FUNC_(h5tencode_c, H5TENCODE_C) # define nh5tget_create_plist_c H5_FC_FUNC_(h5tget_create_plist_c, H5TGET_CREATE_PLIST_C) # define nh5tcompiler_conv_c H5_FC_FUNC_(h5tcompiler_conv_c, H5TCOMPILER_CONV_C) +# define nh5tget_native_type_c H5_FC_FUNC_(h5tget_native_type_c, H5TGET_NATIVE_TYPE_C) H5_FCDLL int_f nh5tcreate_c(int_f *class, size_t_f *size, hid_t_f *type_id); H5_FCDLL int_f nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id ); @@ -728,6 +729,7 @@ H5_FCDLL int_f nh5tdecode_c ( _fcd buf, hid_t_f *obj_id ); H5_FCDLL int_f nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc ); H5_FCDLL int_f nh5tget_create_plist_c ( hid_t_f *dtype_id, hid_t_f *dtpl_id); H5_FCDLL int_f nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag); +H5_FCDLL int_f nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id); /* diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 5d55094..1cb4650 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.9.7 currently under development +HDF5 version 1.9.8 currently under development ================================================================================ diff --git a/src/H5.c b/src/H5.c index 049501c..dd80b12 100644 --- a/src/H5.c +++ b/src/H5.c @@ -207,7 +207,7 @@ void H5_term_library(void) { int pending, ntries = 0, n; - unsigned at = 0; + size_t at = 0; char loop[1024]; H5E_auto2_t func; @@ -477,7 +477,7 @@ H5_debug_mask(const char *s) FILE *stream = stderr; char pkg_name[32], *rest; size_t i; - int clear; + hbool_t clear; while (s && *s) { if (HDisalpha(*s) || '-'==*s || '+'==*s) { @@ -500,20 +500,20 @@ H5_debug_mask(const char *s) /* Trace, all, or one? */ if (!HDstrcmp(pkg_name, "trace")) { - H5_debug_g.trace = clear?NULL:stream; + H5_debug_g.trace = clear ? NULL : stream; } else if (!HDstrcmp(pkg_name, "ttop")) { H5_debug_g.trace = stream; - H5_debug_g.ttop = !clear; + H5_debug_g.ttop = (hbool_t)!clear; } else if (!HDstrcmp(pkg_name, "ttimes")) { H5_debug_g.trace = stream; - H5_debug_g.ttimes = !clear; + H5_debug_g.ttimes = (hbool_t)!clear; } else if (!HDstrcmp(pkg_name, "all")) { for (i=0; i<(size_t)H5_NPKGS; i++) - H5_debug_g.pkg[i].stream = clear?NULL:stream; + H5_debug_g.pkg[i].stream = clear ? NULL : stream; } else { for (i=0; i<(size_t)H5_NPKGS; i++) { if (!HDstrcmp(H5_debug_g.pkg[i].name, pkg_name)) { - H5_debug_g.pkg[i].stream = clear?NULL:stream; + H5_debug_g.pkg[i].stream = clear ? NULL : stream; break; } } diff --git a/src/H5A.c b/src/H5A.c index 955c809..13b5483 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -361,9 +361,11 @@ hid_t H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, const H5S_t *space, hid_t acpl_id, hid_t dxpl_id) { - H5A_t *attr = NULL; - htri_t tri_ret; /* htri_t return value */ - hid_t ret_value; /* Return value */ + H5A_t *attr = NULL; + hssize_t snelmts; /* elements in attribute */ + size_t nelmts; /* elements in attribute */ + htri_t tri_ret; /* htri_t return value */ + hid_t ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5A_create) @@ -464,9 +466,14 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, attr->dt_size = H5O_msg_raw_size(attr->oloc.file, H5O_DTYPE_ID, FALSE, attr->dt); attr->ds_size = H5O_msg_raw_size(attr->oloc.file, H5O_SDSPACE_ID, FALSE, attr->ds); + /* Get # of elements for attribute's dataspace */ + if((snelmts = H5S_GET_EXTENT_NPOINTS(attr->ds)) < 0) + HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "dataspace is invalid") + H5_ASSIGN_OVERFLOW(nelmts, snelmts, hssize_t, size_t); + HDassert(attr->dt_size > 0); HDassert(attr->ds_size > 0); - H5_ASSIGN_OVERFLOW(attr->data_size, H5S_GET_EXTENT_NPOINTS(attr->ds) * H5T_get_size(attr->dt), hssize_t, size_t); + attr->data_size = nelmts * H5T_get_size(attr->dt); /* Hold the symbol table entry (and file) open */ if(H5O_open(&(attr->oloc)) < 0) @@ -1271,6 +1278,8 @@ H5Aget_type(hid_t attr_id) /* Mark any datatypes as being in memory now */ if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location") + + /* Lock copied type */ if(H5T_lock(dt, FALSE) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to lock transient datatype") diff --git a/src/H5AC.c b/src/H5AC.c index cd79e6a..e4639f3 100644 --- a/src/H5AC.c +++ b/src/H5AC.c @@ -43,8 +43,8 @@ *------------------------------------------------------------------------- */ -#define H5C_PACKAGE /*suppress error about including H5Cpkg */ #define H5AC_PACKAGE /*suppress error about including H5ACpkg */ +#define H5C_PACKAGE /*suppress error about including H5Cpkg */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ /* Interface initialization */ @@ -2319,7 +2319,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, } #endif /* H5AC__TRACE_FILE_ENABLED */ - dirtied = ( ( (flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG ) || + dirtied = (hbool_t)( ( (flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG ) || ( ((H5AC_info_t *)thing)->dirtied ) ); if ( dirtied ) { @@ -3064,7 +3064,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr) { herr_t result; herr_t ret_value = SUCCEED; /* Return value */ - int name_len; + size_t name_len; H5C_auto_size_ctl_t internal_config; FUNC_ENTER_NOAPI(H5AC_validate_config, FAIL) @@ -3109,7 +3109,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr) */ name_len = HDstrlen(config_ptr->trace_file_name); - if ( name_len <= 0 ) { + if ( name_len == 0 ) { HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \ "config_ptr->trace_file_name is empty.") diff --git a/src/H5ACpkg.h b/src/H5ACpkg.h index 973f988..5f226ed 100644 --- a/src/H5ACpkg.h +++ b/src/H5ACpkg.h @@ -34,14 +34,12 @@ #ifndef _H5ACpkg_H #define _H5ACpkg_H -#define H5C_PACKAGE /*suppress error about including H5Cpkg */ - /* Get package's private header */ -#include "H5Cprivate.h" +#include "H5ACprivate.h" /* Get needed headers */ -#include "H5Cpkg.h" /* Cache */ +#include "H5Cprivate.h" /* Cache */ #include "H5SLprivate.h" /* Skip lists */ @@ -323,4 +321,5 @@ typedef struct H5AC_aux_t #endif /* H5_HAVE_PARALLEL */ -#endif /* _H5Cpkg_H */ +#endif /* _H5ACpkg_H */ + diff --git a/src/H5Adense.c b/src/H5Adense.c index de6bc8c..45537be 100644 --- a/src/H5Adense.c +++ b/src/H5Adense.c @@ -504,7 +504,7 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr) udata.common.shared_fheap = shared_fheap; udata.common.name = attr->name; udata.common.name_hash = H5_checksum_lookup3(attr->name, HDstrlen(attr->name), 0); - udata.common.flags = mesg_flags; + H5_ASSIGN_OVERFLOW(udata.common.flags, mesg_flags, unsigned, uint8_t); udata.common.corder = attr->crt_idx; udata.common.found_op = NULL; udata.common.found_op_data = NULL; @@ -1034,6 +1034,13 @@ H5A_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata) case H5A_ATTR_OP_LIB: /* Call the library's callback */ ret_value = (bt2_udata->attr_op->u.lib_op)(fh_udata.attr, bt2_udata->op_data); + break; + + default: + HDassert("unknown attribute op type" && 0); +#ifdef NDEBUG + HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type") +#endif /* NDEBUG */ } /* end switch */ /* Release the space allocated for the attribute */ diff --git a/src/H5Aint.c b/src/H5Aint.c index c08c6cf..71b6689 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -197,8 +197,8 @@ H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type, udata.dxpl_id = dxpl_id; udata.atable = atable; udata.curr_attr = 0; - udata.bogus_crt_idx = (oh->version == H5O_VERSION_1 || - !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE : FALSE; + udata.bogus_crt_idx = (hbool_t)((oh->version == H5O_VERSION_1 || + !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE : FALSE); /* Iterate over existing attributes, checking for attribute with same name */ op.op_type = H5O_MESG_OP_LIB; @@ -564,6 +564,13 @@ H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip, case H5A_ATTR_OP_LIB: /* Call the library's callback */ ret_value = (attr_op->u.lib_op)(&(atable->attrs[u]), op_data); + break; + + default: + HDassert("unknown attribute op type" && 0); +#ifdef NDEBUG + HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type") +#endif /* NDEBUG */ } /* end switch */ /* Increment the number of entries passed through */ @@ -649,7 +656,7 @@ H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo) HDassert(oh); /* Retrieve the "attribute info" structure */ - if((ret_value = H5O_msg_read_real(f, dxpl_id, oh, H5O_AINFO_ID, ainfo))) { + if((ret_value = (H5O_ainfo_t *)H5O_msg_read_real(f, dxpl_id, oh, H5O_AINFO_ID, ainfo))) { /* Check if we don't know how many attributes there are */ if(ret_value->nattrs == HSIZET_MAX) { /* Check if we are using "dense" attribute storage */ diff --git a/src/H5B2.c b/src/H5B2.c index 3bb79ee..ed17d12 100644 --- a/src/H5B2.c +++ b/src/H5B2.c @@ -1282,7 +1282,7 @@ H5B2_iterate_size(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t add cache_udata.type = type; /* Look up the B-tree header */ - if(NULL == (bt2 = H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ))) + if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ))) HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header") /* Safely grab pointer to reference counted shared B-tree info, so we can release the B-tree header if necessary */ @@ -1291,7 +1291,7 @@ H5B2_iterate_size(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t add incr_rc = TRUE; /* Get the pointer to the shared B-tree info */ - shared = H5RC_GET_OBJ(bt2->shared); + shared = (H5B2_shared_t *)H5RC_GET_OBJ(bt2->shared); HDassert(shared); /* Add size of header to B-tree metadata total */ diff --git a/src/H5B2cache.c b/src/H5B2cache.c index fc24f00..ca73b3f 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -322,8 +322,10 @@ H5B2_cache_hdr_serialize(const H5F_t *f, haddr_t UNUSED addr, size_t UNUSED len, UINT16ENCODE(p, shared->depth); /* Split & merge %s */ - *p++ = shared->split_percent; - *p++ = shared->merge_percent; + H5_CHECK_OVERFLOW(shared->split_percent, /* From: */ unsigned, /* To: */ uint8_t); + *p++ = (uint8_t)shared->split_percent; + H5_CHECK_OVERFLOW(shared->merge_percent, /* From: */ unsigned, /* To: */ uint8_t); + *p++ = (uint8_t)shared->merge_percent; /* Root node pointer */ H5F_addr_encode(f, &p, bt2->root.addr); diff --git a/src/H5B2int.c b/src/H5B2int.c index 90e687a..6b0b911 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -149,6 +149,8 @@ H5B2_shared_init (H5F_t *f, H5B2_t *bt2, const H5B2_class_t *type, unsigned split_percent, unsigned merge_percent) { H5B2_shared_t *shared = NULL; /* Shared B-tree information */ + size_t sz_max_nrec; /* Temporary variable for range checking */ + unsigned u_max_nrec_size; /* Temporary variable for range checking */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -182,7 +184,8 @@ HDmemset(shared->page, 0, shared->node_size); HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* Initialize leaf node info */ - shared->node_info[0].max_nrec = H5B2_NUM_LEAF_REC(shared->node_size, shared->rrec_size); + sz_max_nrec = H5B2_NUM_LEAF_REC(shared->node_size, shared->rrec_size); + H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[0].max_nrec, /* From: */ sz_max_nrec, /* From: */ size_t, /* To: */ unsigned) shared->node_info[0].split_nrec = (shared->node_info[0].max_nrec * shared->split_percent) / 100; shared->node_info[0].merge_nrec = (shared->node_info[0].max_nrec * shared->merge_percent) / 100; shared->node_info[0].cum_max_nrec = shared->node_info[0].max_nrec; @@ -203,13 +206,15 @@ HDmemset(shared->page, 0, shared->node_size); /* Compute size to store # of records in each node */ /* (uses leaf # of records because its the largest) */ - shared->max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[0].max_nrec); + u_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[0].max_nrec); + H5_ASSIGN_OVERFLOW(/* To: */ shared->max_nrec_size, /* From: */ u_max_nrec_size, /* From: */ unsigned, /* To: */ unsigned char) HDassert(shared->max_nrec_size <= H5B2_SIZEOF_RECORDS_PER_NODE); /* Initialize internal node info */ if(depth > 0) { for(u = 1; u < (depth + 1); u++) { - shared->node_info[u].max_nrec = H5B2_NUM_INT_REC(f, shared, u); + sz_max_nrec = H5B2_NUM_INT_REC(f, shared, u); + H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[u].max_nrec, /* From: */ sz_max_nrec, /* From: */ size_t, /* To: */ unsigned) HDassert(shared->node_info[u].max_nrec <= shared->node_info[u - 1].max_nrec); shared->node_info[u].split_nrec = (shared->node_info[u].max_nrec * shared->split_percent) / 100; @@ -217,7 +222,8 @@ HDmemset(shared->page, 0, shared->node_size); shared->node_info[u].cum_max_nrec = ((shared->node_info[u].max_nrec + 1) * shared->node_info[u - 1].cum_max_nrec) + shared->node_info[u].max_nrec; - shared->node_info[u].cum_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[u].cum_max_nrec); + u_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[u].cum_max_nrec); + H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[u].cum_max_nrec_size, /* From: */ u_max_nrec_size, /* From: */ unsigned, /* To: */ unsigned char) if((shared->node_info[u].nat_rec_fac = H5FL_fac_init(shared->type->nrec_size * shared->node_info[u].max_nrec)) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create node native key block factory") @@ -559,6 +565,8 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr) H5B2_shared_t *shared; /* Pointer to B-tree's shared information */ unsigned new_root_flags = H5AC2__NO_FLAGS_SET; /* Cache flags for new root node */ H5B2_node_ptr_t old_root_ptr; /* Old node pointer to root node in B-tree */ + size_t sz_max_nrec; /* Temporary variable for range checking */ + unsigned u_max_nrec_size; /* Temporary variable for range checking */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5B2_split_root) @@ -579,12 +587,14 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* Update node info for new depth of tree */ - shared->node_info[shared->depth].max_nrec = H5B2_NUM_INT_REC(f, shared, shared->depth); + sz_max_nrec = H5B2_NUM_INT_REC(f, shared, shared->depth); + H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[shared->depth].max_nrec, /* From: */ sz_max_nrec, /* From: */ size_t, /* To: */ unsigned) shared->node_info[shared->depth].split_nrec = (shared->node_info[shared->depth].max_nrec * shared->split_percent) / 100; shared->node_info[shared->depth].merge_nrec = (shared->node_info[shared->depth].max_nrec * shared->merge_percent) / 100; shared->node_info[shared->depth].cum_max_nrec = ((shared->node_info[shared->depth].max_nrec + 1) * shared->node_info[shared->depth - 1].cum_max_nrec) + shared->node_info[shared->depth].max_nrec; - shared->node_info[shared->depth].cum_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[shared->depth].cum_max_nrec); + u_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[shared->depth].cum_max_nrec); + H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[shared->depth].cum_max_nrec_size, /* From: */ u_max_nrec_size, /* From: */ unsigned, /* To: */ unsigned char) if((shared->node_info[shared->depth].nat_rec_fac = H5FL_fac_init(shared->type->nrec_size * shared->node_info[shared->depth].max_nrec)) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create node native key block factory") if((shared->node_info[shared->depth].node_ptr_fac = H5FL_fac_init(sizeof(H5B2_node_ptr_t) * (shared->node_info[shared->depth].max_nrec + 1))) == NULL) @@ -747,20 +757,20 @@ H5B2_redistribute2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_internal_t *int /* Handle node pointers, if we have an internal node */ if(depth>1) { - hsize_t moved_nrec=move_nrec; /* Total number of records moved, for internal redistrib */ + hsize_t moved_nrec = move_nrec; /* Total number of records moved, for internal redistrib */ unsigned u; /* Local index variable */ /* Count the number of records being moved */ - for(u=0; u= dt->shared->u.compnd.nmembs) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid member number") - if ((memb_dt=H5T_get_member_type(dt, membno))==NULL) + if ((memb_dt=H5T_get_member_type(dt, membno, H5T_COPY_REOPEN))==NULL) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to retrieve member type") if ((ret_value = H5I_register(H5I_DATATYPE, memb_dt)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable register datatype atom") @@ -251,7 +251,7 @@ done: *------------------------------------------------------------------------- */ H5T_t * -H5T_get_member_type(const H5T_t *dt, unsigned membno) +H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method) { H5T_t *ret_value = NULL; @@ -261,7 +261,7 @@ H5T_get_member_type(const H5T_t *dt, unsigned membno) assert(membno < dt->shared->u.compnd.nmembs); /* Copy datatype into an atom */ - if (NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, H5T_COPY_REOPEN))) + if (NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, method))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy member datatype") done: diff --git a/src/H5Tnative.c b/src/H5Tnative.c index da478c4..0deba66 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -277,7 +277,7 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig /* Construct child compound type and retrieve a list of their IDs, offsets, total size, and alignment for compound type. */ for(i=0; i> 32))) if((tt = (unsigned)(n >> 48))) - r = (t = (unsigned)(n >> 56)) ? 56 + LogTable256[t] : 48 + LogTable256[tt & 0xFF]; + r = (t = (unsigned)(n >> 56)) ? 56 + (unsigned)LogTable256[t] : 48 + (unsigned)LogTable256[tt & 0xFF]; else - r = (t = (unsigned)(n >> 40)) ? 40 + LogTable256[t] : 32 + LogTable256[ttt & 0xFF]; + r = (t = (unsigned)(n >> 40)) ? 40 + (unsigned)LogTable256[t] : 32 + (unsigned)LogTable256[ttt & 0xFF]; else if((tt = (unsigned)(n >> 16))) - r = (t = (unsigned)(n >> 24)) ? 24 + LogTable256[t] : 16 + LogTable256[tt & 0xFF]; + r = (t = (unsigned)(n >> 24)) ? 24 + (unsigned)LogTable256[t] : 16 + (unsigned)LogTable256[tt & 0xFF]; else /* Added 'uint8_t' cast to pacify PGCC compiler */ - r = (t = (unsigned)(n >> 8)) ? 8 + LogTable256[t] : LogTable256[(uint8_t)n]; + r = (t = (unsigned)(n >> 8)) ? 8 + (unsigned)LogTable256[t] : (unsigned)LogTable256[(uint8_t)n]; #ifdef H5_BAD_LOG2_CODE_GENERATED } /* end else */ #endif /* H5_BAD_LOG2_CODE_GENERATED */ diff --git a/src/H5Znbit.c b/src/H5Znbit.c index 2423654..fabc7f0 100644 --- a/src/H5Znbit.c +++ b/src/H5Znbit.c @@ -326,7 +326,7 @@ H5Z_calc_parms_compound(const H5T_t *type) /* For each member, calculate parameters */ for(u = 0; u < (unsigned)nmembers; u++) { /* Get member datatype */ - if(NULL == (dtype_member = H5T_get_member_type(type, u))) + if(NULL == (dtype_member = H5T_get_member_type(type, u, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad member datatype") /* Get member datatype's class */ @@ -637,7 +637,7 @@ H5Z_set_parms_compound(const H5T_t *type, unsigned cd_values[]) /* For each member, set parameters */ for(u = 0; u < (unsigned)nmembers; u++) { /* Get member datatype */ - if(NULL == (dtype_member = H5T_get_member_type(type, u))) + if(NULL == (dtype_member = H5T_get_member_type(type, u, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad member datatype") /* Get member datatype's class */ diff --git a/src/H5checksum.c b/src/H5checksum.c index e42f152..3359722 100644 --- a/src/H5checksum.c +++ b/src/H5checksum.c @@ -126,10 +126,10 @@ H5_checksum_fletcher32(const void *_data, size_t _len) * performed without numeric overflow) */ while (len) { - unsigned tlen = len > 360 ? 360 : len; + size_t tlen = len > 360 ? 360 : len; len -= tlen; do { - sum1 += (((uint16_t)data[0]) << 8) | ((uint16_t)data[1]); + sum1 += (uint32_t)(((uint16_t)data[0]) << 8) | ((uint16_t)data[1]); data += 2; sum2 += sum1; } while (--tlen); @@ -139,7 +139,7 @@ H5_checksum_fletcher32(const void *_data, size_t _len) /* Check for odd # of bytes */ if(_len % 2) { - sum1 += ((uint16_t)*data) << 8; + sum1 += (uint32_t)(((uint16_t)*data) << 8); sum2 += sum1; sum1 = (sum1 & 0xffff) + (sum1 >> 16); sum2 = (sum2 & 0xffff) + (sum2 >> 16); @@ -486,8 +486,8 @@ H5_hash_string(const char *str) /* Sanity check */ HDassert(str); - while(c = *str++) - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ + while((c = *str++)) + hash = ((hash << 5) + hash) + (uint32_t)c; /* hash * 33 + c */ FUNC_LEAVE_NOAPI(hash) } /* end H5_hash_string() */ diff --git a/src/H5public.h b/src/H5public.h index a78e186..8b04f38 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -71,10 +71,10 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 9 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 7 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_RELEASE 8 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.9.7" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.9.8" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/src/H5system.c b/src/H5system.c index 4a49d71..6a8a91a 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -497,7 +497,7 @@ HDstrtoll(const char *s, const char **rest, int base) if (sign>0) { acc = ((uint64_t)1<<(8*sizeof(int64_t)-1))-1; } else { - acc = (uint64_t)1<<(8*sizeof(int64_t)-1); + acc = (int64_t)((uint64_t)1<<(8*sizeof(int64_t)-1)); } errno = ERANGE; } @@ -622,9 +622,9 @@ H5_build_extpath(const char *name, char **extpath/*out*/) if ((full_path=H5MM_strdup(name)) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") } else { /* relative pathname */ - if ((cwdpath=H5MM_malloc(MAX_PATH_LEN)) == NULL) + if (NULL == (cwdpath = (char *)H5MM_malloc(MAX_PATH_LEN))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") - if ((new_name=H5MM_strdup(name)) == NULL) + if (NULL == (new_name = (char *)H5MM_strdup(name))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* @@ -652,7 +652,7 @@ H5_build_extpath(const char *name, char **extpath/*out*/) cwdlen = HDstrlen(cwdpath); HDassert(cwdlen); path_len = cwdlen + HDstrlen(new_name) + 2; - if ((full_path=H5MM_malloc(path_len)) == NULL) + if (NULL == (full_path = (char *)H5MM_malloc(path_len))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") HDstrcpy(full_path, cwdpath); diff --git a/src/H5trace.c b/src/H5trace.c index 926a590..4a42f0b 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -319,6 +319,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5D_ALLOC_TIME_INCR: fprintf (out, "H5D_ALLOC_TIME_INCR"); break; + default: + fprintf (out, "%ld", (long)alloc_time); + break; } } break; @@ -368,6 +371,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5D_FILL_TIME_IFSET: fprintf (out, "H5D_FILL_TIME_IFSET"); break; + default: + fprintf (out, "%ld", (long)fill_time); + break; } } break; @@ -394,6 +400,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5D_FILL_VALUE_USER_DEFINED: fprintf (out, "H5D_FILL_VALUE_USER_DEFINED"); break; + default: + fprintf (out, "%ld", (long)fill_value); + break; } } break; @@ -619,6 +628,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5F_CLOSE_STRONG: fprintf(out, "H5F_CLOSE_STRONG"); break; + default: + fprintf(out, "%ld", (long)degree); + break; } } break; @@ -643,6 +655,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) fprintf(out, "H5F_SCOPE_DOWN " "/*FOR INTERNAL USE ONLY!*/"); break; + default: + fprintf(out, "%ld", (long)scope); + break; } } break; @@ -663,6 +678,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5F_LIBVER_LATEST: fprintf(out, "H5F_LIBVER_LATEST"); break; + default: + fprintf(out, "%ld", (long)libver_vers); + break; } } break; @@ -928,7 +946,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...) /* Save the rank of simple data spaces for arrays */ /* This may generate recursive call to the library... -QAK */ { - H5S_t *space = H5I_object(obj); + H5S_t *space = (H5S_t *)H5I_object(obj); if (H5S_SIMPLE==H5S_GET_EXTENT_TYPE(space)) { asize[argno] = H5S_GET_EXTENT_NDIMS(space); } @@ -997,6 +1015,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5_INDEX_N: fprintf(out, "H5_INDEX_N"); break; + default: + fprintf(out, "%ld", (long)idx_type); + break; } /* end switch */ } /* end else */ break; @@ -1026,6 +1047,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5_ITER_N: fprintf(out, "H5_ITER_N"); break; + default: + fprintf(out, "%ld", (long)order); + break; } /* end switch */ } /* end else */ break; @@ -1169,6 +1193,12 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5L_TYPE_SOFT: fprintf(out, "H5L_TYPE_SOFT"); break; + case H5L_TYPE_EXTERNAL: + fprintf(out, "H5L_TYPE_EXTERNAL"); + break; + case H5L_TYPE_MAX: + fprintf(out, "H5L_TYPE_MAX"); + break; default: fprintf(out, "%ld", (long)link_type); break; @@ -1286,6 +1316,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) else { H5O_type_t objtype = va_arg(ap, H5O_type_t); /*lint !e64 Type mismatch not really occuring */ switch(objtype) { + case H5O_TYPE_UNKNOWN: + fprintf(out, "H5O_TYPE_UNKNOWN"); + break; case H5O_TYPE_GROUP: fprintf(out, "H5O_TYPE_GROUP"); break; @@ -1295,6 +1328,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5O_TYPE_NAMED_DATATYPE: fprintf(out, "H5O_TYPE_NAMED_DATATYPE"); break; + case H5O_TYPE_NTYPES: + fprintf(out, "H5O_TYPE_TYPES"); + break; default: fprintf(out, "BADTYPE(%ld)", (long)objtype); break; @@ -1317,13 +1353,13 @@ H5_trace (const double *returning, const char *func, const char *type, ...) } } else { hid_t pclass_id = va_arg (ap, hid_t); - char *class_name=NULL; + char *class_name = NULL; H5P_genclass_t *pclass; /* Get the class name and print it */ /* This may generate recursive call to the library... -QAK */ - if(NULL != (pclass = H5I_object(pclass_id)) && - (class_name=H5P_get_class_name(pclass))!=NULL) { + if(NULL != (pclass = (H5P_genclass_t *)H5I_object(pclass_id)) && + (class_name = H5P_get_class_name(pclass))!=NULL) { fprintf (out, class_name); H5MM_xfree(class_name); } /* end if */ diff --git a/src/Makefile.in b/src/Makefile.in index f11df74..8554d49 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -404,7 +404,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 5 -LT_VERS_REVISION = 8 +LT_VERS_REVISION = 9 LT_VERS_AGE = 0 H5detect_CFLAGS = -g diff --git a/test/fillval.c b/test/fillval.c index 29f37b4..e92872a 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -1513,7 +1513,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, /* Initialize dataspace & hyperslab info */ for(i = 0, nelmts = 1; i < 5; i++) { - hs_size[i] = start_size[i] / 2; + hs_size[i] = (start_size[i] + 1) / 2; hs_offset[i] = 0; hs_stride[i] = 2; nelmts *= hs_size[i]; @@ -1532,7 +1532,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, /* Select elements within file dataspace */ if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, hs_stride, hs_size, NULL) < 0) TEST_ERROR - /* Write to all odd data locations */ + /* Write to all even data locations */ if(H5Dwrite(dset, dtype, mspace, fspace, H5P_DEFAULT, buf) < 0) TEST_ERROR /* Close memory dataspace */ @@ -1721,6 +1721,9 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, /* Verify the element read in is the value written out */ if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, buf) < 0) TEST_ERROR + + /* Set the element back to fillval */ + if(H5Dwrite(dset, dtype, mspace, fspace, H5P_DEFAULT, fillval) < 0) TEST_ERROR /* Release any VL components */ if(H5Dvlen_reclaim(dtype, mspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR diff --git a/test/ohdr.c b/test/ohdr.c index 08fd860..0a25993 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -153,7 +153,7 @@ main(void) */ TESTING("object header overflow in memory"); for(i = 0; i < 40; i++) { - time_new = (i + 1) * 1000 + 1; + time_new = (i + 1) * 1000 + 1000000; if(H5O_msg_create(&oh_loc, H5O_MTIME_ID, 0, 0, &time_new, H5P_DATASET_XFER_DEFAULT) < 0) FAIL_STACK_ERROR } /* end for */ diff --git a/tools/h52jpeg/Makefile.am b/tools/h52jpeg/Makefile.am index b3ccede..05ea153 100644 --- a/tools/h52jpeg/Makefile.am +++ b/tools/h52jpeg/Makefile.am @@ -23,23 +23,24 @@ include $(top_srcdir)/config/commence.am # Include src and tools/lib directories INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src -# These are our main targets, the tools +# These are our main targets +TEST_PROG=h52jpegtst +TEST_SCRIPT=$(srcdir)/h52jpeg.sh -#TEST_SCRIPT=$(srcdir)/h52jpeg.sh check_SCRIPTS=$(TEST_SCRIPT) +check_PROGRAMS=$(TEST_PROG) bin_PROGRAMS=h52jpeg noinst_PROGRAMS=h52jpegtst h52jpeg_SOURCES=h52jpeg.c - h52jpegtst_SOURCES=h52jpegtst.c # Programs all depend on the hdf5 library, the tools library, and the HL # library. -LDADD=$(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) +LDADD=$(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) -ljpeg CHECK_CLEANFILES+=*.h5 -CHECK_CLEANFILES+=*.jpg +CHECK_CLEANFILES+=*.jpeg include $(top_srcdir)/config/conclude.am diff --git a/tools/h52jpeg/Makefile.in b/tools/h52jpeg/Makefile.in index f2b7ea6..606ee95 100644 --- a/tools/h52jpeg/Makefile.in +++ b/tools/h52jpeg/Makefile.in @@ -52,9 +52,10 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/conclude.am +check_PROGRAMS = $(am__EXEEXT_1) bin_PROGRAMS = h52jpeg$(EXEEXT) noinst_PROGRAMS = h52jpegtst$(EXEEXT) -TESTS = $(am__EXEEXT_1) +TESTS = $(check_PROGRAMS) $(check_SCRIPTS) subdir = tools/h52jpeg ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -65,6 +66,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +am__EXEEXT_1 = h52jpegtst$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_h52jpeg_OBJECTS = h52jpeg.$(OBJEXT) h52jpeg_OBJECTS = $(am_h52jpeg_OBJECTS) @@ -90,7 +92,6 @@ SOURCES = $(h52jpeg_SOURCES) $(h52jpegtst_SOURCES) DIST_SOURCES = $(h52jpeg_SOURCES) $(h52jpegtst_SOURCES) ETAGS = etags CTAGS = ctags -am__EXEEXT_1 = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = /home1/packages/automake/automake-1.9.6/bin/aclocal-1.9 -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ @@ -338,21 +339,21 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. # *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.jpg +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.jpeg # Include src and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src -# These are our main targets, the tools - -#TEST_SCRIPT=$(srcdir)/h52jpeg.sh +# These are our main targets +TEST_PROG = h52jpegtst +TEST_SCRIPT = $(srcdir)/h52jpeg.sh check_SCRIPTS = $(TEST_SCRIPT) h52jpeg_SOURCES = h52jpeg.c h52jpegtst_SOURCES = h52jpegtst.c # Programs all depend on the hdf5 library, the tools library, and the HL # library. -LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) +LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) -ljpeg # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., @@ -431,6 +432,13 @@ clean-binPROGRAMS: rm -f $$p $$f ; \ done +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done + clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ @@ -554,7 +562,7 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS) + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(PROGRAMS) all-local @@ -588,8 +596,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS mostlyclean-am +clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -648,19 +656,20 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ - clean clean-binPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS + clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS # List all build rules defined by HDF5 Makefiles as "PHONY" targets here. diff --git a/tools/h52jpeg/h52jpeg.c b/tools/h52jpeg/h52jpeg.c index 56a7498..84fa145 100644 --- a/tools/h52jpeg/h52jpeg.c +++ b/tools/h52jpeg/h52jpeg.c @@ -13,15 +13,21 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* From jpeg documentation + * + * Include file for users of JPEG library. + * You will need to have included system headers that define at least + * the typedefs FILE and size_t before you can include jpeglib.h. + * (stdio.h is sufficient on ANSI-conforming systems.) + * You may also wish to include "jerror.h". + */ + +#include #include #include - - -#if 0 #include "jpeglib.h" #include "jerror.h" -#endif #include "H5private.h" #include "h5tools.h" @@ -30,7 +36,6 @@ #include "H5IMpublic.h" - const char *progname = "h52jpeg"; int d_status = EXIT_SUCCESS; @@ -54,14 +59,15 @@ typedef struct const char *image_name; int image_type; int verbose; - - } h52jpeg_opt_t; /* prototypes */ static void usage(const char *prog); -static int h52jpeg(h52jpeg_opt_t options); +static int h52jpeg(h52jpeg_opt_t opt); +static void make_jpeg_name( const char* template_name, const char* image_name, char* jpeg_name); +static int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name); +static void write_JPEG_file(char *filename, JSAMPLE *image_buffer, int image_height, int image_width, int planes); /*------------------------------------------------------------------------- @@ -75,19 +81,19 @@ static int h52jpeg(h52jpeg_opt_t options); * *------------------------------------------------------------------------- */ -int main(int argc, char **argv) +int main(int argc, const char *argv[]) { - h52jpeg_opt_t options; + h52jpeg_opt_t opt; const char *image_type = NULL; - int opt; + int op; /* initialze options to 0 */ - memset(&options,0,sizeof(h52jpeg_opt_t)); + memset(&opt,0,sizeof(h52jpeg_opt_t)); /* parse command line options */ - while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) + while ((op = get_option(argc, argv, s_opts, l_opts)) != EOF) { - switch ((char)opt) + switch ((char)op) { case 'h': usage(progname); @@ -96,13 +102,29 @@ int main(int argc, char **argv) print_version(progname); exit(EXIT_SUCCESS); case 'v': - options.verbose = 1; + opt.verbose = 1; break; case 'i': - options.image_name = opt_arg; + opt.image_name = opt_arg; break; case 't': image_type = opt_arg; + + + if ( HDstrcmp( image_type, "gray" ) == 0 ) + { + opt.image_type = 0; + } + else if ( HDstrcmp( image_type, "true" ) == 0 ) + { + opt.image_type = 1; + } + else + { + printf("<%s> is an invalid image type\n", image_type); + exit(EXIT_FAILURE); + } + break; } /* switch */ @@ -113,8 +135,8 @@ int main(int argc, char **argv) /* check for file names to be processed */ if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) { - options.file_name = argv[ opt_ind ]; - options.template_name = argv[ opt_ind + 1 ]; + opt.file_name = argv[ opt_ind ]; + opt.template_name = argv[ opt_ind + 1 ]; } else @@ -123,7 +145,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - if ( h52jpeg(options) < 0 ) + if ( h52jpeg(opt) < 0 ) return 1; @@ -149,20 +171,20 @@ static void usage(const char *prog) printf(" OPTIONS\n"); printf(" -h, --help Print a usage message and exit\n"); printf(" -v, --verbose Verbose mode, print object information\n"); - printf(" -V, --version Print version number and exit\n"); + printf(" -V, --version Print HDF5 version number and exit\n"); printf(" -i, --image Image name (full path in HDF5 file)\n"); - printf(" -t T, --type=T Type of image (8bit or 24bit)\n"); + printf(" -t T, --type=T Type of image (graycolor or truecolor)\n"); printf("\n"); - printf(" T - is a string, either <8bit> or <24bit>\n"); + printf(" T - is a string, either or \n"); } /*------------------------------------------------------------------------- * Function: h52jpeg * - * Parameters: options at command line + * Parameters: OPT, options at command line * * Purpose: traverse the HDF5 file, save HDF5 images to jpeg files, translate * 2D datasets of classes H5T_INTEGER and H5T_FLOAT to image data and save them @@ -174,8 +196,114 @@ static void usage(const char *prog) */ static int h52jpeg(h52jpeg_opt_t opt) { - hid_t fid; - trav_table_t *travt = NULL; + hid_t fid; + trav_table_t *travt = NULL; + size_t i; + + + /* open the HDF5 file */ + if (( fid = h5tools_fopen(opt.file_name, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) + { + error_msg(progname, "cannot open file <%s>\n", opt.file_name ); + return -1; + } + + /*------------------------------------------------------------------------- + * image/dataset name was specified at command line + *------------------------------------------------------------------------- + */ + + if ( opt.image_name ) + { + + /* read HDF5 image/dataset, save jpeg image */ + do_image(fid, opt, opt.image_name); + + } + + /*------------------------------------------------------------------------- + * image name was not specified; traverse the file + *------------------------------------------------------------------------- + */ + + else + + { + + /* initialize traversal table */ + trav_table_init(&travt); + + /* get the list of objects in the file */ + if ( h5trav_gettable(fid, travt) < 0 ) + goto out; + + /* search for images/datasets in file */ + for ( i = 0; i < travt->nobjs; i++) + { + + switch ( travt->objs[i].type ) + { + default: + goto out; + + case H5TRAV_TYPE_GROUP: + case H5TRAV_TYPE_NAMED_DATATYPE: + case H5TRAV_TYPE_LINK: + case H5TRAV_TYPE_UDLINK: + + break; + + case H5TRAV_TYPE_DATASET: + + /* read HDF5 image/dataset, save jpeg image */ + do_image(fid, opt, travt->objs[i].name); + + break; /* H5TRAV_TYPE_DATASET */ + + } /* switch */ + + } /* i */ + + + /* free table */ + trav_table_free(travt); + + } /* image_name */ + + + /* close */ + if ( H5Fclose(fid) < 0 ) + return -1; + + return 0; + +out: + H5E_BEGIN_TRY + { + H5Fclose(fid); + + } H5E_END_TRY; + + + return -1; +} + + + +/*------------------------------------------------------------------------- + * Function: do_image + * + * Parameters: HDF5 file id, command line options, an image name + * + * Purpose: read HDF5 image/dataset, save jpeg image + * + * Return: int + * + *------------------------------------------------------------------------- + */ +static +int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name) +{ hsize_t width; hsize_t height; hsize_t planes; @@ -191,187 +319,323 @@ static int h52jpeg(h52jpeg_opt_t opt) hsize_t maxdim[H5S_MAX_RANK]; size_t size; hsize_t nelmts; - char* name; - size_t i; + const char* name; int j; int done; char jpeg_name[1024]; - /* open the HDF5 file */ - if (( fid = h5tools_fopen(opt.file_name, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) + name = image_name; + + /* build the jpeg file name */ + make_jpeg_name( opt.template_name, image_name, jpeg_name); + + done = 0; + + if ( opt.verbose) { - error_msg(progname, "cannot open file <%s>\n", opt.file_name ); - return -1; + printf("%s ...", name ); } - /* initialize traversal table */ - trav_table_init(&travt); + /*------------------------------------------------------------------------- + * HDF5 Image + *------------------------------------------------------------------------- + */ - /* get the list of objects in the file */ - if ( h5trav_gettable(fid, travt) < 0 ) - goto out; - - /* search for images/datasets in file */ - for ( i = 0; i < travt->nobjs; i++) + if ( H5IMis_image( fid, name ) ) { - switch ( travt->objs[i].type ) - { - default: + if ( H5IMget_image_info( fid, name, &width, &height, &planes, interlace, &npals ) < 0 ) goto out; + + if (NULL == (buf = HDmalloc( (size_t)width * (size_t)height * (size_t)planes ))) + goto out; + + if ( H5IMread_image( fid, name, buf ) < 0 ) + goto out; + + /* write the jpeg file */ + /* write the jpeg file */ + write_JPEG_file (jpeg_name, + buf, + (int) height, + (int) width, + (int) planes); + + + free( buf ); + buf = NULL; + + done = 1; + + + + } + + /*------------------------------------------------------------------------- + * regular dataset + *------------------------------------------------------------------------- + */ + + else + { + + if (( did = H5Dopen2( fid, name, H5P_DEFAULT )) < 0) + goto out; + if (( sid = H5Dget_space( did )) < 0 ) + goto out; + if (( rank = H5Sget_simple_extent_ndims(sid)) < 0 ) + goto out; + if (( tid = H5Dget_type( did )) < 0 ) + goto out; + if (( tclass = H5Tget_class(tid)) < 0) + goto out; + + if ( ( H5T_FLOAT == tclass || H5T_INTEGER == tclass) && + ( rank == 2 ) ) + { - case H5TRAV_TYPE_GROUP: - case H5TRAV_TYPE_NAMED_DATATYPE: - case H5TRAV_TYPE_LINK: - case H5TRAV_TYPE_UDLINK: - - break; + if ( H5Sget_simple_extent_dims( sid, dims, maxdim ) < 0 ) + goto out; - case H5TRAV_TYPE_DATASET: - - name = travt->objs[i].name; - strcpy( jpeg_name, opt.template_name ); - strcat( jpeg_name, name ); - - done = 0; - - if ( opt.verbose) - printf("%s ...", name ); + size = H5Tget_size( tid ); - /*------------------------------------------------------------------------- - * HDF5 Image - *------------------------------------------------------------------------- - */ - - if ( H5IMis_image( fid, name ) ) + nelmts = 1; + for ( j = 0; j < rank; j++) { - - if ( H5IMget_image_info( fid, name, &width, &height, &planes, interlace, &npals ) < 0 ) - goto out; - - if (NULL == (buf = HDmalloc( (size_t)width * (size_t)height * (size_t)planes ))) - goto out; - - if ( H5IMread_image( fid, name, buf ) < 0 ) - goto out; - - free( buf ); - buf = NULL; - - - + nelmts *= dims[j]; } + + if ( NULL == (buf = HDmalloc( (size_t)nelmts * size ))) + goto out; + if ( H5Dread(did,tid,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf) < 0 ) + goto out; - /*------------------------------------------------------------------------- - * regular dataset - *------------------------------------------------------------------------- - */ + height = dims[0]; + width = dims[1]; - else - { + if ( opt.image_type == 0 ) + planes = 1; + else if ( opt.image_type == 1 ) + planes = 3; - if (( did = H5Dopen2( fid, name, H5P_DEFAULT )) < 0) - goto out; - if (( sid = H5Dget_space( did )) < 0 ) - goto out; - if (( rank = H5Sget_simple_extent_ndims(sid)) < 0 ) - goto out; - if (( tid = H5Dget_type( did )) < 0 ) - goto out; - if (( tclass = H5Tget_class(tid)) < 0) - goto out; - - if ( ( H5T_FLOAT == tclass || H5T_INTEGER == tclass) && - ( rank == 2 ) ) - { - - if ( H5Sget_simple_extent_dims( sid, dims, maxdim ) < 0 ) - goto out; - - size = H5Tget_size( tid ); - - nelmts = 1; - for ( j = 0; j < rank; j++) - { - nelmts *= dims[j]; - } - - if ( NULL == (buf = HDmalloc( (size_t)nelmts * size ))) - goto out; - if ( H5Dread(did,tid,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf) < 0 ) - goto out; - - - free( buf ); - buf = NULL; - - } - - - - H5Sclose(sid); - H5Tclose(tid); - H5Dclose(did); - - - - - } /* else */ - - - if ( opt.verbose) - { - if ( done ) - { - printf("saved to %s\n", jpeg_name ); - } - else - { - printf("\n"); - } - - } + + free( buf ); + buf = NULL; - - break; /* H5TRAV_TYPE_DATASET */ - - - - } /* switch */ + } - } /* i */ - - - - /* free table */ - trav_table_free(travt); + H5Sclose(sid); + H5Tclose(tid); + H5Dclose(did); + + + + + } /* else */ - /* close */ - if ( H5Fclose(fid) < 0 ) - return -1; + if ( opt.verbose) + { + if ( done ) + { + printf("saved to %s\n", jpeg_name ); + } + else + { + printf("\n"); + } + + } return 0; out: H5E_BEGIN_TRY { - + H5Sclose(sid); H5Tclose(tid); H5Dclose(did); - H5Fclose(fid); } H5E_END_TRY; - + if ( buf != NULL ) free( buf ); return -1; + } +/*------------------------------------------------------------------------- + * Function: make_jpeg_name + * + * Parameters: template name (IN), image name (IN), jpeg name (IN/OUT) + * + * Purpose: build a name for the jpeg image file upon a template name + * and the HDF5 image name + * + * Return: void + * + *------------------------------------------------------------------------- + */ +static +void make_jpeg_name( const char* template_name, const char* image_name, char* jpeg_name) +{ + int j; + int len; + + HDstrcpy( jpeg_name, template_name ); + HDstrcat( jpeg_name, image_name ); + HDstrcat( jpeg_name, ".jpeg" ); + len = HDstrlen( jpeg_name); + + /* HDF5 path names might contain '/', replace with '_' */ + for (j = 0; j < len; j++) + { + if (jpeg_name[j] == '/') + { + jpeg_name[j] = '_'; + } + } + +} + +/* + * Sample routine for JPEG compression. + * + * IMAGE DATA FORMATS: + * + * The standard input image format is a rectangular array of pixels, with + * each pixel having the same number of "component" values (color channels). + * Each pixel row is an array of JSAMPLEs (which typically are unsigned chars). + * If you are working with color data, then the color values for each pixel + * must be adjacent in the row; for example, R,G,B,R,G,B,R,G,B,... for 24-bit + * RGB color. + * + * For this example, we'll assume that this data structure matches the way + * our application has stored the image in memory, so we can just pass a + * pointer to our image buffer. + */ + +static +void write_JPEG_file(char *filename, + JSAMPLE *image_buffer, /* Points to large array of R,G,B-order data */ + int image_height, /* Number of rows in image */ + int image_width, /* Number of columns in image */ + int planes) /* # of color components per pixel */ +{ + /* This struct contains the JPEG compression parameters and pointers to + * working space (which is allocated as needed by the JPEG library). + * It is possible to have several such structures, representing multiple + * compression/decompression processes, in existence at once. We refer + * to any one struct (and its associated working data) as a "JPEG object". + */ + struct jpeg_compress_struct cinfo; + /* This struct represents a JPEG error handler. It is declared separately + * because applications often want to supply a specialized error handler + * (see the second half of this file for an example). But here we just + * take the easy way out and use the standard error handler, which will + * print a message on stderr and call exit() if compression fails. + * Note that this struct must live as long as the main JPEG parameter + * struct, to avoid dangling-pointer problems. + */ + struct jpeg_error_mgr jerr; + /* More stuff */ + FILE * outfile; /* target file */ + JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ + int row_stride; /* physical row width in image buffer */ + + /* Step 1: allocate and initialize JPEG compression object */ + + /* We have to set up the error handler first, in case the initialization + * step fails. (Unlikely, but it could happen if you are out of memory.) + * This routine fills in the contents of struct jerr, and returns jerr's + * address which we place into the link field in cinfo. + */ + cinfo.err = jpeg_std_error(&jerr); + /* Now we can initialize the JPEG compression object. */ + jpeg_create_compress(&cinfo); + + /* Step 2: specify data destination (eg, a file) */ + /* Note: steps 2 and 3 can be done in either order. */ + + /* Here we use the library-supplied code to send compressed data to a + * stdio stream. You can also write your own code to do something else. + * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that + * requires it in order to write binary files. + */ + if ((outfile = fopen(filename, "wb")) == NULL) { + fprintf(stderr, "can't open %s\n", filename); + exit(1); + } + jpeg_stdio_dest(&cinfo, outfile); + + /* Step 3: set parameters for compression */ + + /* First we supply a description of the input image. + * Four fields of the cinfo struct must be filled in: + */ + cinfo.image_width = image_width; /* image width and height, in pixels */ + cinfo.image_height = image_height; + cinfo.input_components = planes; /* # of color components per pixel */ + + /* colorspace of input image */ + if (planes == 3) + cinfo.in_color_space = JCS_RGB; + else if (planes == 1) + cinfo.in_color_space = JCS_GRAYSCALE; + + /* Now use the library's routine to set default compression parameters. + * (You must set at least cinfo.in_color_space before calling this, + * since the defaults depend on the source color space.) + */ + jpeg_set_defaults(&cinfo); + /* Now you can set any non-default parameters you wish to. + * Here we just illustrate the use of quality (quantization table) scaling: + */ + jpeg_set_quality(&cinfo, 100, TRUE /* limit to baseline-JPEG values */); + + /* Step 4: Start compressor */ + + /* TRUE ensures that we will write a complete interchange-JPEG file. + * Pass TRUE unless you are very sure of what you're doing. + */ + jpeg_start_compress(&cinfo, TRUE); + + /* Step 5: while (scan lines remain to be written) */ + /* jpeg_write_scanlines(...); */ + + /* Here we use the library's state variable cinfo.next_scanline as the + * loop counter, so that we don't have to keep track ourselves. + * To keep things simple, we pass one scanline per call; you can pass + * more if you wish, though. + */ + row_stride = image_width * planes; /* JSAMPLEs per row in image_buffer */ + + while (cinfo.next_scanline < cinfo.image_height) { + /* jpeg_write_scanlines expects an array of pointers to scanlines. + * Here the array is only one element long, but you could pass + * more than one scanline at a time if that's more convenient. + */ + row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride]; + (void) jpeg_write_scanlines(&cinfo, row_pointer, 1); + } + + /* Step 6: Finish compression */ + + jpeg_finish_compress(&cinfo); + /* After finish_compress, we can close the output file. */ + fclose(outfile); + + /* Step 7: release JPEG compression object */ + + /* This is an important step since it will release a good deal of memory. */ + jpeg_destroy_compress(&cinfo); + + /* And we're done! */ +} diff --git a/tools/h52jpeg/h52jpeg.sh b/tools/h52jpeg/h52jpeg.sh new file mode 100644 index 0000000..b1e1109 --- /dev/null +++ b/tools/h52jpeg/h52jpeg.sh @@ -0,0 +1,87 @@ +#! /bin/sh +# +# Copyright by The HDF Group. +# Copyright by the Board of Trustees of the University of Illinois. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF5 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. +# +# Tests for the h52jpeg tool +# Pedro Vicente Nunes (THG), 6/16/2008 + +TOOL=h52jpeg # The tool name +TOOL_BIN=`pwd`/$TOOL # The path of the tool binary + +SRCFILE=h52jpegtst.h5 +INDIR=$srcdir/testfiles +TESTFILE="$INDIR/$SRCFILE" + +nerrors=0 + + +# Print a line-line message left justified in a field of 70 characters +# beginning with the word "Testing". +# +TESTING() { + SPACES=" " + echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012' +} + +# Just call the tool binary with the command line parameters +# and use the return value of main to print FAILED or PASSED +# +TOOLTEST() +{ + # Run test. + # Tflops interprets "$@" as "" when no parameter is given (e.g., the + # case of missing file name). Changed it to use $@ till Tflops fixes it. + + if [ "`uname -s`" = "TFLOPS O/S" ]; then + $RUNSERIAL $TOOL_BIN $@ + else + $RUNSERIAL $TOOL_BIN "$@" + fi + + RET=$? + if [ $RET != 0 ] ; then + echo "*FAILED*" + nerrors="`expr $nerrors + 1`" + else + echo " PASSED" + fi +} + + + +############################################################################## +# The tests +# To avoid the printing of the complete full path of the test file, that hides +# all the other parameters for long paths, the printing of the command line +# is done first in +# TESTING with the name only of the test file $TOOL, not its full path $TESTFILE +############################################################################## + + +# Test for traversing the file and export all images/datasets to jpeg +TESTING $TOOL $SRCFILE myjpeg1 +TOOLTEST $TESTFILE myjpeg1 + +# Test for reading an image path +TESTING $TOOL -i image8bit $SRCFILE myjpeg2 +TOOLTEST -i image8bit $TESTFILE myjpeg2 + + + +if test $nerrors -eq 0 ; then + echo "All $TOOL tests passed." +fi + +exit $nerrors + diff --git a/tools/h52jpeg/h52jpegtst.c b/tools/h52jpeg/h52jpegtst.c index f3e13de..3a4b277 100644 --- a/tools/h52jpeg/h52jpegtst.c +++ b/tools/h52jpeg/h52jpegtst.c @@ -1,23 +1,181 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - -int main( void ) -{ - - return 0; - -} - +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF5. The full HDF5 copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the files COPYING and Copyright.html. COPYING can be found at the root * + * of the source code distribution tree; Copyright.html can be found at the * + * root level of an installed copy of the electronic HDF5 document set and * + * is linked from the top-level documents page. It can also be found at * + * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +#include "hdf5.h" +#include "hdf5_hl.h" +#include +#include + +#define DATA_FILE1 "image8.txt" +#define DATA_FILE2 "image24pixel.txt" +#define IMAGE1_NAME "image8bit" +#define IMAGE2_NAME "image24bitpixel" +#define PAL_NAME "palette" +#define PAL_ENTRIES 256 + +static int read_data(const char* file_name, hsize_t *width, hsize_t *height ); +unsigned char *gbuf = 0; /* global buffer for image data */ + +int main( void ) +{ + hid_t fid; /* HDF5 file identifier */ + hsize_t width; /* width of image */ + hsize_t height; /* height of image */ + unsigned char pal[ PAL_ENTRIES * 3 ]; /* palette array */ + hsize_t pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */ + int i, n; + + /* create a new HDF5 file using default properties. */ + if (( fid = H5Fcreate( "h52jpegtst.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT )) < 0 ) + return 1; + + /* read first data file */ + if ( read_data( DATA_FILE1, &width, &height ) < 0 ) + goto out; + + /* make the image */ + if ( H5IMmake_image_8bit( fid, IMAGE1_NAME, width, height, gbuf ) < 0 ) + goto out; + + /*------------------------------------------------------------------------- + * define a palette, blue to red tones + *------------------------------------------------------------------------- + */ + for ( i=0, n=0; i + Type: 32-bit little-endian integer +/A/B2 Group + Location: 1:94176 + Links: 1 +/A/B2/simple2 Dataset {6/6} + Location: 1:94048 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/C Group + Location: 1:97384 + Links: 1 +/C/D Group + Location: 1:98088 + Links: 1 +/C/D/simple Dataset {6/6} + Location: 1:97256 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/E Group + Location: 1:112000 + Links: 1 +/E/F Group + Location: 1:112704 + Links: 1 +/E/F/grp_dsets Group + Location: 1:100200 + Links: 1 +/E/F/grp_dsets/chunk Dataset {6/6} + Location: 1:104384 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Type: 32-bit little-endian integer +/E/F/grp_dsets/compact Dataset {6/6} + Location: 1:104840 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/E/F/grp_dsets/compound Dataset {2/2} + Location: 1:104976 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/E/F/grp_dsets/compressed Dataset {6/6} + Location: 1:107288 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Filter-0: deflate-1 OPT {1} + Type: 32-bit little-endian integer +/E/F/grp_dsets/named_vl Dataset {2/2} + Location: 1:111600 + Links: 1 + Storage:
+ Type: shared-1:107456 variable length of + 32-bit little-endian integer +/E/F/grp_dsets/nested_vl Dataset {2/2} + Location: 1:111728 + Links: 1 + Storage:
+ Type: variable length of + variable length of + 32-bit little-endian integer +/E/F/grp_dsets/simple Dataset {6/6} + Location: 1:111872 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/E/F/grp_dsets/vl Type + Location: 1:107456 + Links: 2 + Type: shared-1:107456 variable length of + 32-bit little-endian integer +/G Group + Location: 1:127648 + Links: 1 +/G/H Group + Location: 1:128352 + Links: 1 +/G/H/grp_nested Group + Location: 1:114728 + Links: 1 +/G/H/grp_nested/grp_dsets Group + Location: 1:115520 + Links: 1 +/G/H/grp_nested/grp_dsets/chunk Dataset {6/6} + Location: 1:119704 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Type: 32-bit little-endian integer +/G/H/grp_nested/grp_dsets/compact Dataset {6/6} + Location: 1:120160 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/G/H/grp_nested/grp_dsets/compound Dataset {2/2} + Location: 1:120296 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/G/H/grp_nested/grp_dsets/compressed Dataset {6/6} + Location: 1:122608 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Filter-0: deflate-1 OPT {1} + Type: 32-bit little-endian integer +/G/H/grp_nested/grp_dsets/named_vl Dataset {2/2} + Location: 1:126920 + Links: 1 + Storage:
+ Type: shared-1:122776 variable length of + 32-bit little-endian integer +/G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2} + Location: 1:127048 + Links: 1 + Storage:
+ Type: variable length of + variable length of + 32-bit little-endian integer +/G/H/grp_nested/grp_dsets/simple Dataset {6/6} + Location: 1:127192 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/G/H/grp_nested/grp_dsets/vl Type + Location: 1:122776 + Links: 2 + Type: shared-1:122776 variable length of + 32-bit little-endian integer +/chunk Dataset {6/6} + Location: 1:6216 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Type: 32-bit little-endian integer +/compact Dataset {6/6} + Location: 1:6344 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/compound Dataset {2/2} + Location: 1:8528 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/compressed Dataset {6/6} + Location: 1:12888 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Filter-0: deflate-1 OPT {1} + Type: 32-bit little-endian integer +/grp_dsets Group + Location: 1:33760 + Links: 1 +/grp_dsets/chunk Dataset {6/6} + Location: 1:37944 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Type: 32-bit little-endian integer +/grp_dsets/compact Dataset {6/6} + Location: 1:38400 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_dsets/compound Dataset {2/2} + Location: 1:38536 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/grp_dsets/compressed Dataset {6/6} + Location: 1:40848 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Filter-0: deflate-1 OPT {1} + Type: 32-bit little-endian integer +/grp_dsets/named_vl Dataset {2/2} + Location: 1:45160 + Links: 1 + Storage:
+ Type: shared-1:41016 variable length of + 32-bit little-endian integer +/grp_dsets/nested_vl Dataset {2/2} + Location: 1:45288 + Links: 1 + Storage:
+ Type: variable length of + variable length of + 32-bit little-endian integer +/grp_dsets/simple Dataset {6/6} + Location: 1:45432 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_dsets/simple_group Dataset {6/6} + Location: 1:61544 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_dsets/vl Type + Location: 1:41016 + Links: 2 + Type: shared-1:41016 variable length of + 32-bit little-endian integer +/grp_empty Group + Location: 1:32968 + Links: 1 +/grp_nested Group + Location: 1:46224 + Links: 1 +/grp_nested/grp_dsets Group + Location: 1:47016 + Links: 1 +/grp_nested/grp_dsets/chunk Dataset {6/6} + Location: 1:51200 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Type: 32-bit little-endian integer +/grp_nested/grp_dsets/compact Dataset {6/6} + Location: 1:51656 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_nested/grp_dsets/compound Dataset {2/2} + Location: 1:51792 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/grp_nested/grp_dsets/compressed Dataset {6/6} + Location: 1:54104 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Filter-0: deflate-1 OPT {1} + Type: 32-bit little-endian integer +/grp_nested/grp_dsets/named_vl Dataset {2/2} + Location: 1:58416 + Links: 1 + Storage:
+ Type: shared-1:54272 variable length of + 32-bit little-endian integer +/grp_nested/grp_dsets/nested_vl Dataset {2/2} + Location: 1:58544 + Links: 1 + Storage:
+ Type: variable length of + variable length of + 32-bit little-endian integer +/grp_nested/grp_dsets/simple Dataset {6/6} + Location: 1:58688 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_nested/grp_dsets/vl Type + Location: 1:54272 + Links: 2 + Type: shared-1:54272 variable length of + 32-bit little-endian integer +/grp_rename Group + Location: 1:62752 + Links: 1 +/grp_rename/chunk Dataset {6/6} + Location: 1:66936 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Type: 32-bit little-endian integer +/grp_rename/compact Dataset {6/6} + Location: 1:67392 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_rename/compound Dataset {2/2} + Location: 1:67528 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/grp_rename/compressed Dataset {6/6} + Location: 1:69840 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Filter-0: deflate-1 OPT {1} + Type: 32-bit little-endian integer +/grp_rename/grp_dsets Group + Location: 1:75632 + Links: 1 +/grp_rename/grp_dsets/chunk Dataset {6/6} + Location: 1:79816 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Type: 32-bit little-endian integer +/grp_rename/grp_dsets/compact Dataset {6/6} + Location: 1:80272 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_rename/grp_dsets/compound Dataset {2/2} + Location: 1:80408 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/grp_rename/grp_dsets/compressed Dataset {6/6} + Location: 1:82720 + Links: 1 + Chunks: {2} 8 bytes + Storage:
+ Filter-0: deflate-1 OPT {1} + Type: 32-bit little-endian integer +/grp_rename/grp_dsets/named_vl Dataset {2/2} + Location: 1:87032 + Links: 1 + Storage:
+ Type: shared-1:82888 variable length of + 32-bit little-endian integer +/grp_rename/grp_dsets/nested_vl Dataset {2/2} + Location: 1:87160 + Links: 1 + Storage:
+ Type: variable length of + variable length of + 32-bit little-endian integer +/grp_rename/grp_dsets/simple Dataset {6/6} + Location: 1:87304 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_rename/grp_dsets/vl Type + Location: 1:82888 + Links: 2 + Type: shared-1:82888 variable length of + 32-bit little-endian integer +/grp_rename/named_vl Dataset {2/2} + Location: 1:74152 + Links: 1 + Storage:
+ Type: shared-1:70008 variable length of + 32-bit little-endian integer +/grp_rename/nested_vl Dataset {2/2} + Location: 1:74280 + Links: 1 + Storage:
+ Type: variable length of + variable length of + 32-bit little-endian integer +/grp_rename/simple Dataset {6/6} + Location: 1:74424 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/grp_rename/vl Type + Location: 1:70008 + Links: 2 + Type: shared-1:70008 variable length of + 32-bit little-endian integer +/named_vl Dataset {2/2} + Location: 1:13104 + Links: 1 + Storage:
+ Type: shared-1:13056 variable length of + 32-bit little-endian integer +/nested_vl Dataset {2/2} + Location: 1:27392 + Links: 1 + Storage:
+ Type: variable length of + variable length of + 32-bit little-endian integer +/rename Dataset {2/2} + Location: 1:31760 + Links: 1 + Storage:
+ Type: struct { + "str1" +0 20-byte null-terminated ASCII string + "str2" +20 20-byte null-terminated ASCII string + } 40 bytes +/simple Dataset {6/6} + Location: 1:800 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer +/simple_top Dataset {6/6} + Location: 1:29584 + Links: 1 + Storage:
+ Type: 32-bit little-endian integer diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index ad4efe3..0acc4df 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -31,7 +31,7 @@ nerrors=0 verbose=yes SRCFILE=h5copytst.h5 -INDIR=$srcdir/../testfiles +INDIR=$srcdir/testfiles OUTDIR=../testfiles CMP='cmp -s' DIFF='diff -c' diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt new file mode 100644 index 0000000..887ee9e --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_10.txt @@ -0,0 +1,55 @@ +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_100.txt b/tools/h5diff/testfiles/h5diff_100.txt new file mode 100644 index 0000000..32ff7ab --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_100.txt @@ -0,0 +1,1037 @@ + +file1 file2 +--------------------------------------- + x x / + x x /big + +group : and +0 differences found +dataset: and +size: [1073741824] [1073741824] +position big big difference +------------------------------------------------------------ +[ 268435456 ] 31 0 31 +[ 268435457 ] 31 0 31 +[ 268435458 ] 31 0 31 +[ 268435459 ] 31 0 31 +[ 268435460 ] 31 0 31 +[ 268435461 ] 31 0 31 +[ 268435462 ] 31 0 31 +[ 268435463 ] 31 0 31 +[ 268435464 ] 31 0 31 +[ 268435465 ] 31 0 31 +[ 268435466 ] 31 0 31 +[ 268435467 ] 31 0 31 +[ 268435468 ] 31 0 31 +[ 268435469 ] 31 0 31 +[ 268435470 ] 31 0 31 +[ 268435471 ] 31 0 31 +[ 268435472 ] 31 0 31 +[ 268435473 ] 31 0 31 +[ 268435474 ] 31 0 31 +[ 268435475 ] 31 0 31 +[ 268435476 ] 31 0 31 +[ 268435477 ] 31 0 31 +[ 268435478 ] 31 0 31 +[ 268435479 ] 31 0 31 +[ 268435480 ] 31 0 31 +[ 268435481 ] 31 0 31 +[ 268435482 ] 31 0 31 +[ 268435483 ] 31 0 31 +[ 268435484 ] 31 0 31 +[ 268435485 ] 31 0 31 +[ 268435486 ] 31 0 31 +[ 268435487 ] 31 0 31 +[ 268435488 ] 31 0 31 +[ 268435489 ] 31 0 31 +[ 268435490 ] 31 0 31 +[ 268435491 ] 31 0 31 +[ 268435492 ] 31 0 31 +[ 268435493 ] 31 0 31 +[ 268435494 ] 31 0 31 +[ 268435495 ] 31 0 31 +[ 268435496 ] 31 0 31 +[ 268435497 ] 31 0 31 +[ 268435498 ] 31 0 31 +[ 268435499 ] 31 0 31 +[ 268435500 ] 31 0 31 +[ 268435501 ] 31 0 31 +[ 268435502 ] 31 0 31 +[ 268435503 ] 31 0 31 +[ 268435504 ] 31 0 31 +[ 268435505 ] 31 0 31 +[ 268435506 ] 31 0 31 +[ 268435507 ] 31 0 31 +[ 268435508 ] 31 0 31 +[ 268435509 ] 31 0 31 +[ 268435510 ] 31 0 31 +[ 268435511 ] 31 0 31 +[ 268435512 ] 31 0 31 +[ 268435513 ] 31 0 31 +[ 268435514 ] 31 0 31 +[ 268435515 ] 31 0 31 +[ 268435516 ] 31 0 31 +[ 268435517 ] 31 0 31 +[ 268435518 ] 31 0 31 +[ 268435519 ] 31 0 31 +[ 268435520 ] 31 0 31 +[ 268435521 ] 31 0 31 +[ 268435522 ] 31 0 31 +[ 268435523 ] 31 0 31 +[ 268435524 ] 31 0 31 +[ 268435525 ] 31 0 31 +[ 268435526 ] 31 0 31 +[ 268435527 ] 31 0 31 +[ 268435528 ] 31 0 31 +[ 268435529 ] 31 0 31 +[ 268435530 ] 31 0 31 +[ 268435531 ] 31 0 31 +[ 268435532 ] 31 0 31 +[ 268435533 ] 31 0 31 +[ 268435534 ] 31 0 31 +[ 268435535 ] 31 0 31 +[ 268435536 ] 31 0 31 +[ 268435537 ] 31 0 31 +[ 268435538 ] 31 0 31 +[ 268435539 ] 31 0 31 +[ 268435540 ] 31 0 31 +[ 268435541 ] 31 0 31 +[ 268435542 ] 31 0 31 +[ 268435543 ] 31 0 31 +[ 268435544 ] 31 0 31 +[ 268435545 ] 31 0 31 +[ 268435546 ] 31 0 31 +[ 268435547 ] 31 0 31 +[ 268435548 ] 31 0 31 +[ 268435549 ] 31 0 31 +[ 268435550 ] 31 0 31 +[ 268435551 ] 31 0 31 +[ 268435552 ] 31 0 31 +[ 268435553 ] 31 0 31 +[ 268435554 ] 31 0 31 +[ 268435555 ] 31 0 31 +[ 268435556 ] 31 0 31 +[ 268435557 ] 31 0 31 +[ 268435558 ] 31 0 31 +[ 268435559 ] 31 0 31 +[ 268435560 ] 31 0 31 +[ 268435561 ] 31 0 31 +[ 268435562 ] 31 0 31 +[ 268435563 ] 31 0 31 +[ 268435564 ] 31 0 31 +[ 268435565 ] 31 0 31 +[ 268435566 ] 31 0 31 +[ 268435567 ] 31 0 31 +[ 268435568 ] 31 0 31 +[ 268435569 ] 31 0 31 +[ 268435570 ] 31 0 31 +[ 268435571 ] 31 0 31 +[ 268435572 ] 31 0 31 +[ 268435573 ] 31 0 31 +[ 268435574 ] 31 0 31 +[ 268435575 ] 31 0 31 +[ 268435576 ] 31 0 31 +[ 268435577 ] 31 0 31 +[ 268435578 ] 31 0 31 +[ 268435579 ] 31 0 31 +[ 268435580 ] 31 0 31 +[ 268435581 ] 31 0 31 +[ 268435582 ] 31 0 31 +[ 268435583 ] 31 0 31 +[ 268435584 ] 31 0 31 +[ 268435585 ] 31 0 31 +[ 268435586 ] 31 0 31 +[ 268435587 ] 31 0 31 +[ 268435588 ] 31 0 31 +[ 268435589 ] 31 0 31 +[ 268435590 ] 31 0 31 +[ 268435591 ] 31 0 31 +[ 268435592 ] 31 0 31 +[ 268435593 ] 31 0 31 +[ 268435594 ] 31 0 31 +[ 268435595 ] 31 0 31 +[ 268435596 ] 31 0 31 +[ 268435597 ] 31 0 31 +[ 268435598 ] 31 0 31 +[ 268435599 ] 31 0 31 +[ 268435600 ] 31 0 31 +[ 268435601 ] 31 0 31 +[ 268435602 ] 31 0 31 +[ 268435603 ] 31 0 31 +[ 268435604 ] 31 0 31 +[ 268435605 ] 31 0 31 +[ 268435606 ] 31 0 31 +[ 268435607 ] 31 0 31 +[ 268435608 ] 31 0 31 +[ 268435609 ] 31 0 31 +[ 268435610 ] 31 0 31 +[ 268435611 ] 31 0 31 +[ 268435612 ] 31 0 31 +[ 268435613 ] 31 0 31 +[ 268435614 ] 31 0 31 +[ 268435615 ] 31 0 31 +[ 268435616 ] 31 0 31 +[ 268435617 ] 31 0 31 +[ 268435618 ] 31 0 31 +[ 268435619 ] 31 0 31 +[ 268435620 ] 31 0 31 +[ 268435621 ] 31 0 31 +[ 268435622 ] 31 0 31 +[ 268435623 ] 31 0 31 +[ 268435624 ] 31 0 31 +[ 268435625 ] 31 0 31 +[ 268435626 ] 31 0 31 +[ 268435627 ] 31 0 31 +[ 268435628 ] 31 0 31 +[ 268435629 ] 31 0 31 +[ 268435630 ] 31 0 31 +[ 268435631 ] 31 0 31 +[ 268435632 ] 31 0 31 +[ 268435633 ] 31 0 31 +[ 268435634 ] 31 0 31 +[ 268435635 ] 31 0 31 +[ 268435636 ] 31 0 31 +[ 268435637 ] 31 0 31 +[ 268435638 ] 31 0 31 +[ 268435639 ] 31 0 31 +[ 268435640 ] 31 0 31 +[ 268435641 ] 31 0 31 +[ 268435642 ] 31 0 31 +[ 268435643 ] 31 0 31 +[ 268435644 ] 31 0 31 +[ 268435645 ] 31 0 31 +[ 268435646 ] 31 0 31 +[ 268435647 ] 31 0 31 +[ 268435648 ] 31 0 31 +[ 268435649 ] 31 0 31 +[ 268435650 ] 31 0 31 +[ 268435651 ] 31 0 31 +[ 268435652 ] 31 0 31 +[ 268435653 ] 31 0 31 +[ 268435654 ] 31 0 31 +[ 268435655 ] 31 0 31 +[ 268435656 ] 31 0 31 +[ 268435657 ] 31 0 31 +[ 268435658 ] 31 0 31 +[ 268435659 ] 31 0 31 +[ 268435660 ] 31 0 31 +[ 268435661 ] 31 0 31 +[ 268435662 ] 31 0 31 +[ 268435663 ] 31 0 31 +[ 268435664 ] 31 0 31 +[ 268435665 ] 31 0 31 +[ 268435666 ] 31 0 31 +[ 268435667 ] 31 0 31 +[ 268435668 ] 31 0 31 +[ 268435669 ] 31 0 31 +[ 268435670 ] 31 0 31 +[ 268435671 ] 31 0 31 +[ 268435672 ] 31 0 31 +[ 268435673 ] 31 0 31 +[ 268435674 ] 31 0 31 +[ 268435675 ] 31 0 31 +[ 268435676 ] 31 0 31 +[ 268435677 ] 31 0 31 +[ 268435678 ] 31 0 31 +[ 268435679 ] 31 0 31 +[ 268435680 ] 31 0 31 +[ 268435681 ] 31 0 31 +[ 268435682 ] 31 0 31 +[ 268435683 ] 31 0 31 +[ 268435684 ] 31 0 31 +[ 268435685 ] 31 0 31 +[ 268435686 ] 31 0 31 +[ 268435687 ] 31 0 31 +[ 268435688 ] 31 0 31 +[ 268435689 ] 31 0 31 +[ 268435690 ] 31 0 31 +[ 268435691 ] 31 0 31 +[ 268435692 ] 31 0 31 +[ 268435693 ] 31 0 31 +[ 268435694 ] 31 0 31 +[ 268435695 ] 31 0 31 +[ 268435696 ] 31 0 31 +[ 268435697 ] 31 0 31 +[ 268435698 ] 31 0 31 +[ 268435699 ] 31 0 31 +[ 268435700 ] 31 0 31 +[ 268435701 ] 31 0 31 +[ 268435702 ] 31 0 31 +[ 268435703 ] 31 0 31 +[ 268435704 ] 31 0 31 +[ 268435705 ] 31 0 31 +[ 268435706 ] 31 0 31 +[ 268435707 ] 31 0 31 +[ 268435708 ] 31 0 31 +[ 268435709 ] 31 0 31 +[ 268435710 ] 31 0 31 +[ 268435711 ] 31 0 31 +[ 268435712 ] 31 0 31 +[ 268435713 ] 31 0 31 +[ 268435714 ] 31 0 31 +[ 268435715 ] 31 0 31 +[ 268435716 ] 31 0 31 +[ 268435717 ] 31 0 31 +[ 268435718 ] 31 0 31 +[ 268435719 ] 31 0 31 +[ 268435720 ] 31 0 31 +[ 268435721 ] 31 0 31 +[ 268435722 ] 31 0 31 +[ 268435723 ] 31 0 31 +[ 268435724 ] 31 0 31 +[ 268435725 ] 31 0 31 +[ 268435726 ] 31 0 31 +[ 268435727 ] 31 0 31 +[ 268435728 ] 31 0 31 +[ 268435729 ] 31 0 31 +[ 268435730 ] 31 0 31 +[ 268435731 ] 31 0 31 +[ 268435732 ] 31 0 31 +[ 268435733 ] 31 0 31 +[ 268435734 ] 31 0 31 +[ 268435735 ] 31 0 31 +[ 268435736 ] 31 0 31 +[ 268435737 ] 31 0 31 +[ 268435738 ] 31 0 31 +[ 268435739 ] 31 0 31 +[ 268435740 ] 31 0 31 +[ 268435741 ] 31 0 31 +[ 268435742 ] 31 0 31 +[ 268435743 ] 31 0 31 +[ 268435744 ] 31 0 31 +[ 268435745 ] 31 0 31 +[ 268435746 ] 31 0 31 +[ 268435747 ] 31 0 31 +[ 268435748 ] 31 0 31 +[ 268435749 ] 31 0 31 +[ 268435750 ] 31 0 31 +[ 268435751 ] 31 0 31 +[ 268435752 ] 31 0 31 +[ 268435753 ] 31 0 31 +[ 268435754 ] 31 0 31 +[ 268435755 ] 31 0 31 +[ 268435756 ] 31 0 31 +[ 268435757 ] 31 0 31 +[ 268435758 ] 31 0 31 +[ 268435759 ] 31 0 31 +[ 268435760 ] 31 0 31 +[ 268435761 ] 31 0 31 +[ 268435762 ] 31 0 31 +[ 268435763 ] 31 0 31 +[ 268435764 ] 31 0 31 +[ 268435765 ] 31 0 31 +[ 268435766 ] 31 0 31 +[ 268435767 ] 31 0 31 +[ 268435768 ] 31 0 31 +[ 268435769 ] 31 0 31 +[ 268435770 ] 31 0 31 +[ 268435771 ] 31 0 31 +[ 268435772 ] 31 0 31 +[ 268435773 ] 31 0 31 +[ 268435774 ] 31 0 31 +[ 268435775 ] 31 0 31 +[ 268435776 ] 31 0 31 +[ 268435777 ] 31 0 31 +[ 268435778 ] 31 0 31 +[ 268435779 ] 31 0 31 +[ 268435780 ] 31 0 31 +[ 268435781 ] 31 0 31 +[ 268435782 ] 31 0 31 +[ 268435783 ] 31 0 31 +[ 268435784 ] 31 0 31 +[ 268435785 ] 31 0 31 +[ 268435786 ] 31 0 31 +[ 268435787 ] 31 0 31 +[ 268435788 ] 31 0 31 +[ 268435789 ] 31 0 31 +[ 268435790 ] 31 0 31 +[ 268435791 ] 31 0 31 +[ 268435792 ] 31 0 31 +[ 268435793 ] 31 0 31 +[ 268435794 ] 31 0 31 +[ 268435795 ] 31 0 31 +[ 268435796 ] 31 0 31 +[ 268435797 ] 31 0 31 +[ 268435798 ] 31 0 31 +[ 268435799 ] 31 0 31 +[ 268435800 ] 31 0 31 +[ 268435801 ] 31 0 31 +[ 268435802 ] 31 0 31 +[ 268435803 ] 31 0 31 +[ 268435804 ] 31 0 31 +[ 268435805 ] 31 0 31 +[ 268435806 ] 31 0 31 +[ 268435807 ] 31 0 31 +[ 268435808 ] 31 0 31 +[ 268435809 ] 31 0 31 +[ 268435810 ] 31 0 31 +[ 268435811 ] 31 0 31 +[ 268435812 ] 31 0 31 +[ 268435813 ] 31 0 31 +[ 268435814 ] 31 0 31 +[ 268435815 ] 31 0 31 +[ 268435816 ] 31 0 31 +[ 268435817 ] 31 0 31 +[ 268435818 ] 31 0 31 +[ 268435819 ] 31 0 31 +[ 268435820 ] 31 0 31 +[ 268435821 ] 31 0 31 +[ 268435822 ] 31 0 31 +[ 268435823 ] 31 0 31 +[ 268435824 ] 31 0 31 +[ 268435825 ] 31 0 31 +[ 268435826 ] 31 0 31 +[ 268435827 ] 31 0 31 +[ 268435828 ] 31 0 31 +[ 268435829 ] 31 0 31 +[ 268435830 ] 31 0 31 +[ 268435831 ] 31 0 31 +[ 268435832 ] 31 0 31 +[ 268435833 ] 31 0 31 +[ 268435834 ] 31 0 31 +[ 268435835 ] 31 0 31 +[ 268435836 ] 31 0 31 +[ 268435837 ] 31 0 31 +[ 268435838 ] 31 0 31 +[ 268435839 ] 31 0 31 +[ 268435840 ] 31 0 31 +[ 268435841 ] 31 0 31 +[ 268435842 ] 31 0 31 +[ 268435843 ] 31 0 31 +[ 268435844 ] 31 0 31 +[ 268435845 ] 31 0 31 +[ 268435846 ] 31 0 31 +[ 268435847 ] 31 0 31 +[ 268435848 ] 31 0 31 +[ 268435849 ] 31 0 31 +[ 268435850 ] 31 0 31 +[ 268435851 ] 31 0 31 +[ 268435852 ] 31 0 31 +[ 268435853 ] 31 0 31 +[ 268435854 ] 31 0 31 +[ 268435855 ] 31 0 31 +[ 268435856 ] 31 0 31 +[ 268435857 ] 31 0 31 +[ 268435858 ] 31 0 31 +[ 268435859 ] 31 0 31 +[ 268435860 ] 31 0 31 +[ 268435861 ] 31 0 31 +[ 268435862 ] 31 0 31 +[ 268435863 ] 31 0 31 +[ 268435864 ] 31 0 31 +[ 268435865 ] 31 0 31 +[ 268435866 ] 31 0 31 +[ 268435867 ] 31 0 31 +[ 268435868 ] 31 0 31 +[ 268435869 ] 31 0 31 +[ 268435870 ] 31 0 31 +[ 268435871 ] 31 0 31 +[ 268435872 ] 31 0 31 +[ 268435873 ] 31 0 31 +[ 268435874 ] 31 0 31 +[ 268435875 ] 31 0 31 +[ 268435876 ] 31 0 31 +[ 268435877 ] 31 0 31 +[ 268435878 ] 31 0 31 +[ 268435879 ] 31 0 31 +[ 268435880 ] 31 0 31 +[ 268435881 ] 31 0 31 +[ 268435882 ] 31 0 31 +[ 268435883 ] 31 0 31 +[ 268435884 ] 31 0 31 +[ 268435885 ] 31 0 31 +[ 268435886 ] 31 0 31 +[ 268435887 ] 31 0 31 +[ 268435888 ] 31 0 31 +[ 268435889 ] 31 0 31 +[ 268435890 ] 31 0 31 +[ 268435891 ] 31 0 31 +[ 268435892 ] 31 0 31 +[ 268435893 ] 31 0 31 +[ 268435894 ] 31 0 31 +[ 268435895 ] 31 0 31 +[ 268435896 ] 31 0 31 +[ 268435897 ] 31 0 31 +[ 268435898 ] 31 0 31 +[ 268435899 ] 31 0 31 +[ 268435900 ] 31 0 31 +[ 268435901 ] 31 0 31 +[ 268435902 ] 31 0 31 +[ 268435903 ] 31 0 31 +[ 268435904 ] 31 0 31 +[ 268435905 ] 31 0 31 +[ 268435906 ] 31 0 31 +[ 268435907 ] 31 0 31 +[ 268435908 ] 31 0 31 +[ 268435909 ] 31 0 31 +[ 268435910 ] 31 0 31 +[ 268435911 ] 31 0 31 +[ 268435912 ] 31 0 31 +[ 268435913 ] 31 0 31 +[ 268435914 ] 31 0 31 +[ 268435915 ] 31 0 31 +[ 268435916 ] 31 0 31 +[ 268435917 ] 31 0 31 +[ 268435918 ] 31 0 31 +[ 268435919 ] 31 0 31 +[ 268435920 ] 31 0 31 +[ 268435921 ] 31 0 31 +[ 268435922 ] 31 0 31 +[ 268435923 ] 31 0 31 +[ 268435924 ] 31 0 31 +[ 268435925 ] 31 0 31 +[ 268435926 ] 31 0 31 +[ 268435927 ] 31 0 31 +[ 268435928 ] 31 0 31 +[ 268435929 ] 31 0 31 +[ 268435930 ] 31 0 31 +[ 268435931 ] 31 0 31 +[ 268435932 ] 31 0 31 +[ 268435933 ] 31 0 31 +[ 268435934 ] 31 0 31 +[ 268435935 ] 31 0 31 +[ 268435936 ] 31 0 31 +[ 268435937 ] 31 0 31 +[ 268435938 ] 31 0 31 +[ 268435939 ] 31 0 31 +[ 268435940 ] 31 0 31 +[ 268435941 ] 31 0 31 +[ 268435942 ] 31 0 31 +[ 268435943 ] 31 0 31 +[ 268435944 ] 31 0 31 +[ 268435945 ] 31 0 31 +[ 268435946 ] 31 0 31 +[ 268435947 ] 31 0 31 +[ 268435948 ] 31 0 31 +[ 268435949 ] 31 0 31 +[ 268435950 ] 31 0 31 +[ 268435951 ] 31 0 31 +[ 268435952 ] 31 0 31 +[ 268435953 ] 31 0 31 +[ 268435954 ] 31 0 31 +[ 268435955 ] 31 0 31 +[ 268435956 ] 31 0 31 +[ 268435957 ] 31 0 31 +[ 268435958 ] 31 0 31 +[ 268435959 ] 31 0 31 +[ 268435960 ] 31 0 31 +[ 268435961 ] 31 0 31 +[ 268435962 ] 31 0 31 +[ 268435963 ] 31 0 31 +[ 268435964 ] 31 0 31 +[ 268435965 ] 31 0 31 +[ 268435966 ] 31 0 31 +[ 268435967 ] 31 0 31 +[ 268435968 ] 31 0 31 +[ 268435969 ] 31 0 31 +[ 268435970 ] 31 0 31 +[ 268435971 ] 31 0 31 +[ 268435972 ] 31 0 31 +[ 268435973 ] 31 0 31 +[ 268435974 ] 31 0 31 +[ 268435975 ] 31 0 31 +[ 268435976 ] 31 0 31 +[ 268435977 ] 31 0 31 +[ 268435978 ] 31 0 31 +[ 268435979 ] 31 0 31 +[ 268435980 ] 31 0 31 +[ 268435981 ] 31 0 31 +[ 268435982 ] 31 0 31 +[ 268435983 ] 31 0 31 +[ 268435984 ] 31 0 31 +[ 268435985 ] 31 0 31 +[ 268435986 ] 31 0 31 +[ 268435987 ] 31 0 31 +[ 268435988 ] 31 0 31 +[ 268435989 ] 31 0 31 +[ 268435990 ] 31 0 31 +[ 268435991 ] 31 0 31 +[ 268435992 ] 31 0 31 +[ 268435993 ] 31 0 31 +[ 268435994 ] 31 0 31 +[ 268435995 ] 31 0 31 +[ 268435996 ] 31 0 31 +[ 268435997 ] 31 0 31 +[ 268435998 ] 31 0 31 +[ 268435999 ] 31 0 31 +[ 268436000 ] 31 0 31 +[ 268436001 ] 31 0 31 +[ 268436002 ] 31 0 31 +[ 268436003 ] 31 0 31 +[ 268436004 ] 31 0 31 +[ 268436005 ] 31 0 31 +[ 268436006 ] 31 0 31 +[ 268436007 ] 31 0 31 +[ 268436008 ] 31 0 31 +[ 268436009 ] 31 0 31 +[ 268436010 ] 31 0 31 +[ 268436011 ] 31 0 31 +[ 268436012 ] 31 0 31 +[ 268436013 ] 31 0 31 +[ 268436014 ] 31 0 31 +[ 268436015 ] 31 0 31 +[ 268436016 ] 31 0 31 +[ 268436017 ] 31 0 31 +[ 268436018 ] 31 0 31 +[ 268436019 ] 31 0 31 +[ 268436020 ] 31 0 31 +[ 268436021 ] 31 0 31 +[ 268436022 ] 31 0 31 +[ 268436023 ] 31 0 31 +[ 268436024 ] 31 0 31 +[ 268436025 ] 31 0 31 +[ 268436026 ] 31 0 31 +[ 268436027 ] 31 0 31 +[ 268436028 ] 31 0 31 +[ 268436029 ] 31 0 31 +[ 268436030 ] 31 0 31 +[ 268436031 ] 31 0 31 +[ 268436032 ] 31 0 31 +[ 268436033 ] 31 0 31 +[ 268436034 ] 31 0 31 +[ 268436035 ] 31 0 31 +[ 268436036 ] 31 0 31 +[ 268436037 ] 31 0 31 +[ 268436038 ] 31 0 31 +[ 268436039 ] 31 0 31 +[ 268436040 ] 31 0 31 +[ 268436041 ] 31 0 31 +[ 268436042 ] 31 0 31 +[ 268436043 ] 31 0 31 +[ 268436044 ] 31 0 31 +[ 268436045 ] 31 0 31 +[ 268436046 ] 31 0 31 +[ 268436047 ] 31 0 31 +[ 268436048 ] 31 0 31 +[ 268436049 ] 31 0 31 +[ 268436050 ] 31 0 31 +[ 268436051 ] 31 0 31 +[ 268436052 ] 31 0 31 +[ 268436053 ] 31 0 31 +[ 268436054 ] 31 0 31 +[ 268436055 ] 31 0 31 +[ 268436056 ] 31 0 31 +[ 268436057 ] 31 0 31 +[ 268436058 ] 31 0 31 +[ 268436059 ] 31 0 31 +[ 268436060 ] 31 0 31 +[ 268436061 ] 31 0 31 +[ 268436062 ] 31 0 31 +[ 268436063 ] 31 0 31 +[ 268436064 ] 31 0 31 +[ 268436065 ] 31 0 31 +[ 268436066 ] 31 0 31 +[ 268436067 ] 31 0 31 +[ 268436068 ] 31 0 31 +[ 268436069 ] 31 0 31 +[ 268436070 ] 31 0 31 +[ 268436071 ] 31 0 31 +[ 268436072 ] 31 0 31 +[ 268436073 ] 31 0 31 +[ 268436074 ] 31 0 31 +[ 268436075 ] 31 0 31 +[ 268436076 ] 31 0 31 +[ 268436077 ] 31 0 31 +[ 268436078 ] 31 0 31 +[ 268436079 ] 31 0 31 +[ 268436080 ] 31 0 31 +[ 268436081 ] 31 0 31 +[ 268436082 ] 31 0 31 +[ 268436083 ] 31 0 31 +[ 268436084 ] 31 0 31 +[ 268436085 ] 31 0 31 +[ 268436086 ] 31 0 31 +[ 268436087 ] 31 0 31 +[ 268436088 ] 31 0 31 +[ 268436089 ] 31 0 31 +[ 268436090 ] 31 0 31 +[ 268436091 ] 31 0 31 +[ 268436092 ] 31 0 31 +[ 268436093 ] 31 0 31 +[ 268436094 ] 31 0 31 +[ 268436095 ] 31 0 31 +[ 268436096 ] 31 0 31 +[ 268436097 ] 31 0 31 +[ 268436098 ] 31 0 31 +[ 268436099 ] 31 0 31 +[ 268436100 ] 31 0 31 +[ 268436101 ] 31 0 31 +[ 268436102 ] 31 0 31 +[ 268436103 ] 31 0 31 +[ 268436104 ] 31 0 31 +[ 268436105 ] 31 0 31 +[ 268436106 ] 31 0 31 +[ 268436107 ] 31 0 31 +[ 268436108 ] 31 0 31 +[ 268436109 ] 31 0 31 +[ 268436110 ] 31 0 31 +[ 268436111 ] 31 0 31 +[ 268436112 ] 31 0 31 +[ 268436113 ] 31 0 31 +[ 268436114 ] 31 0 31 +[ 268436115 ] 31 0 31 +[ 268436116 ] 31 0 31 +[ 268436117 ] 31 0 31 +[ 268436118 ] 31 0 31 +[ 268436119 ] 31 0 31 +[ 268436120 ] 31 0 31 +[ 268436121 ] 31 0 31 +[ 268436122 ] 31 0 31 +[ 268436123 ] 31 0 31 +[ 268436124 ] 31 0 31 +[ 268436125 ] 31 0 31 +[ 268436126 ] 31 0 31 +[ 268436127 ] 31 0 31 +[ 268436128 ] 31 0 31 +[ 268436129 ] 31 0 31 +[ 268436130 ] 31 0 31 +[ 268436131 ] 31 0 31 +[ 268436132 ] 31 0 31 +[ 268436133 ] 31 0 31 +[ 268436134 ] 31 0 31 +[ 268436135 ] 31 0 31 +[ 268436136 ] 31 0 31 +[ 268436137 ] 31 0 31 +[ 268436138 ] 31 0 31 +[ 268436139 ] 31 0 31 +[ 268436140 ] 31 0 31 +[ 268436141 ] 31 0 31 +[ 268436142 ] 31 0 31 +[ 268436143 ] 31 0 31 +[ 268436144 ] 31 0 31 +[ 268436145 ] 31 0 31 +[ 268436146 ] 31 0 31 +[ 268436147 ] 31 0 31 +[ 268436148 ] 31 0 31 +[ 268436149 ] 31 0 31 +[ 268436150 ] 31 0 31 +[ 268436151 ] 31 0 31 +[ 268436152 ] 31 0 31 +[ 268436153 ] 31 0 31 +[ 268436154 ] 31 0 31 +[ 268436155 ] 31 0 31 +[ 268436156 ] 31 0 31 +[ 268436157 ] 31 0 31 +[ 268436158 ] 31 0 31 +[ 268436159 ] 31 0 31 +[ 268436160 ] 31 0 31 +[ 268436161 ] 31 0 31 +[ 268436162 ] 31 0 31 +[ 268436163 ] 31 0 31 +[ 268436164 ] 31 0 31 +[ 268436165 ] 31 0 31 +[ 268436166 ] 31 0 31 +[ 268436167 ] 31 0 31 +[ 268436168 ] 31 0 31 +[ 268436169 ] 31 0 31 +[ 268436170 ] 31 0 31 +[ 268436171 ] 31 0 31 +[ 268436172 ] 31 0 31 +[ 268436173 ] 31 0 31 +[ 268436174 ] 31 0 31 +[ 268436175 ] 31 0 31 +[ 268436176 ] 31 0 31 +[ 268436177 ] 31 0 31 +[ 268436178 ] 31 0 31 +[ 268436179 ] 31 0 31 +[ 268436180 ] 31 0 31 +[ 268436181 ] 31 0 31 +[ 268436182 ] 31 0 31 +[ 268436183 ] 31 0 31 +[ 268436184 ] 31 0 31 +[ 268436185 ] 31 0 31 +[ 268436186 ] 31 0 31 +[ 268436187 ] 31 0 31 +[ 268436188 ] 31 0 31 +[ 268436189 ] 31 0 31 +[ 268436190 ] 31 0 31 +[ 268436191 ] 31 0 31 +[ 268436192 ] 31 0 31 +[ 268436193 ] 31 0 31 +[ 268436194 ] 31 0 31 +[ 268436195 ] 31 0 31 +[ 268436196 ] 31 0 31 +[ 268436197 ] 31 0 31 +[ 268436198 ] 31 0 31 +[ 268436199 ] 31 0 31 +[ 268436200 ] 31 0 31 +[ 268436201 ] 31 0 31 +[ 268436202 ] 31 0 31 +[ 268436203 ] 31 0 31 +[ 268436204 ] 31 0 31 +[ 268436205 ] 31 0 31 +[ 268436206 ] 31 0 31 +[ 268436207 ] 31 0 31 +[ 268436208 ] 31 0 31 +[ 268436209 ] 31 0 31 +[ 268436210 ] 31 0 31 +[ 268436211 ] 31 0 31 +[ 268436212 ] 31 0 31 +[ 268436213 ] 31 0 31 +[ 268436214 ] 31 0 31 +[ 268436215 ] 31 0 31 +[ 268436216 ] 31 0 31 +[ 268436217 ] 31 0 31 +[ 268436218 ] 31 0 31 +[ 268436219 ] 31 0 31 +[ 268436220 ] 31 0 31 +[ 268436221 ] 31 0 31 +[ 268436222 ] 31 0 31 +[ 268436223 ] 31 0 31 +[ 268436224 ] 31 0 31 +[ 268436225 ] 31 0 31 +[ 268436226 ] 31 0 31 +[ 268436227 ] 31 0 31 +[ 268436228 ] 31 0 31 +[ 268436229 ] 31 0 31 +[ 268436230 ] 31 0 31 +[ 268436231 ] 31 0 31 +[ 268436232 ] 31 0 31 +[ 268436233 ] 31 0 31 +[ 268436234 ] 31 0 31 +[ 268436235 ] 31 0 31 +[ 268436236 ] 31 0 31 +[ 268436237 ] 31 0 31 +[ 268436238 ] 31 0 31 +[ 268436239 ] 31 0 31 +[ 268436240 ] 31 0 31 +[ 268436241 ] 31 0 31 +[ 268436242 ] 31 0 31 +[ 268436243 ] 31 0 31 +[ 268436244 ] 31 0 31 +[ 268436245 ] 31 0 31 +[ 268436246 ] 31 0 31 +[ 268436247 ] 31 0 31 +[ 268436248 ] 31 0 31 +[ 268436249 ] 31 0 31 +[ 268436250 ] 31 0 31 +[ 268436251 ] 31 0 31 +[ 268436252 ] 31 0 31 +[ 268436253 ] 31 0 31 +[ 268436254 ] 31 0 31 +[ 268436255 ] 31 0 31 +[ 268436256 ] 31 0 31 +[ 268436257 ] 31 0 31 +[ 268436258 ] 31 0 31 +[ 268436259 ] 31 0 31 +[ 268436260 ] 31 0 31 +[ 268436261 ] 31 0 31 +[ 268436262 ] 31 0 31 +[ 268436263 ] 31 0 31 +[ 268436264 ] 31 0 31 +[ 268436265 ] 31 0 31 +[ 268436266 ] 31 0 31 +[ 268436267 ] 31 0 31 +[ 268436268 ] 31 0 31 +[ 268436269 ] 31 0 31 +[ 268436270 ] 31 0 31 +[ 268436271 ] 31 0 31 +[ 268436272 ] 31 0 31 +[ 268436273 ] 31 0 31 +[ 268436274 ] 31 0 31 +[ 268436275 ] 31 0 31 +[ 268436276 ] 31 0 31 +[ 268436277 ] 31 0 31 +[ 268436278 ] 31 0 31 +[ 268436279 ] 31 0 31 +[ 268436280 ] 31 0 31 +[ 268436281 ] 31 0 31 +[ 268436282 ] 31 0 31 +[ 268436283 ] 31 0 31 +[ 268436284 ] 31 0 31 +[ 268436285 ] 31 0 31 +[ 268436286 ] 31 0 31 +[ 268436287 ] 31 0 31 +[ 268436288 ] 31 0 31 +[ 268436289 ] 31 0 31 +[ 268436290 ] 31 0 31 +[ 268436291 ] 31 0 31 +[ 268436292 ] 31 0 31 +[ 268436293 ] 31 0 31 +[ 268436294 ] 31 0 31 +[ 268436295 ] 31 0 31 +[ 268436296 ] 31 0 31 +[ 268436297 ] 31 0 31 +[ 268436298 ] 31 0 31 +[ 268436299 ] 31 0 31 +[ 268436300 ] 31 0 31 +[ 268436301 ] 31 0 31 +[ 268436302 ] 31 0 31 +[ 268436303 ] 31 0 31 +[ 268436304 ] 31 0 31 +[ 268436305 ] 31 0 31 +[ 268436306 ] 31 0 31 +[ 268436307 ] 31 0 31 +[ 268436308 ] 31 0 31 +[ 268436309 ] 31 0 31 +[ 268436310 ] 31 0 31 +[ 268436311 ] 31 0 31 +[ 268436312 ] 31 0 31 +[ 268436313 ] 31 0 31 +[ 268436314 ] 31 0 31 +[ 268436315 ] 31 0 31 +[ 268436316 ] 31 0 31 +[ 268436317 ] 31 0 31 +[ 268436318 ] 31 0 31 +[ 268436319 ] 31 0 31 +[ 268436320 ] 31 0 31 +[ 268436321 ] 31 0 31 +[ 268436322 ] 31 0 31 +[ 268436323 ] 31 0 31 +[ 268436324 ] 31 0 31 +[ 268436325 ] 31 0 31 +[ 268436326 ] 31 0 31 +[ 268436327 ] 31 0 31 +[ 268436328 ] 31 0 31 +[ 268436329 ] 31 0 31 +[ 268436330 ] 31 0 31 +[ 268436331 ] 31 0 31 +[ 268436332 ] 31 0 31 +[ 268436333 ] 31 0 31 +[ 268436334 ] 31 0 31 +[ 268436335 ] 31 0 31 +[ 268436336 ] 31 0 31 +[ 268436337 ] 31 0 31 +[ 268436338 ] 31 0 31 +[ 268436339 ] 31 0 31 +[ 268436340 ] 31 0 31 +[ 268436341 ] 31 0 31 +[ 268436342 ] 31 0 31 +[ 268436343 ] 31 0 31 +[ 268436344 ] 31 0 31 +[ 268436345 ] 31 0 31 +[ 268436346 ] 31 0 31 +[ 268436347 ] 31 0 31 +[ 268436348 ] 31 0 31 +[ 268436349 ] 31 0 31 +[ 268436350 ] 31 0 31 +[ 268436351 ] 31 0 31 +[ 268436352 ] 31 0 31 +[ 268436353 ] 31 0 31 +[ 268436354 ] 31 0 31 +[ 268436355 ] 31 0 31 +[ 268436356 ] 31 0 31 +[ 268436357 ] 31 0 31 +[ 268436358 ] 31 0 31 +[ 268436359 ] 31 0 31 +[ 268436360 ] 31 0 31 +[ 268436361 ] 31 0 31 +[ 268436362 ] 31 0 31 +[ 268436363 ] 31 0 31 +[ 268436364 ] 31 0 31 +[ 268436365 ] 31 0 31 +[ 268436366 ] 31 0 31 +[ 268436367 ] 31 0 31 +[ 268436368 ] 31 0 31 +[ 268436369 ] 31 0 31 +[ 268436370 ] 31 0 31 +[ 268436371 ] 31 0 31 +[ 268436372 ] 31 0 31 +[ 268436373 ] 31 0 31 +[ 268436374 ] 31 0 31 +[ 268436375 ] 31 0 31 +[ 268436376 ] 31 0 31 +[ 268436377 ] 31 0 31 +[ 268436378 ] 31 0 31 +[ 268436379 ] 31 0 31 +[ 268436380 ] 31 0 31 +[ 268436381 ] 31 0 31 +[ 268436382 ] 31 0 31 +[ 268436383 ] 31 0 31 +[ 268436384 ] 31 0 31 +[ 268436385 ] 31 0 31 +[ 268436386 ] 31 0 31 +[ 268436387 ] 31 0 31 +[ 268436388 ] 31 0 31 +[ 268436389 ] 31 0 31 +[ 268436390 ] 31 0 31 +[ 268436391 ] 31 0 31 +[ 268436392 ] 31 0 31 +[ 268436393 ] 31 0 31 +[ 268436394 ] 31 0 31 +[ 268436395 ] 31 0 31 +[ 268436396 ] 31 0 31 +[ 268436397 ] 31 0 31 +[ 268436398 ] 31 0 31 +[ 268436399 ] 31 0 31 +[ 268436400 ] 31 0 31 +[ 268436401 ] 31 0 31 +[ 268436402 ] 31 0 31 +[ 268436403 ] 31 0 31 +[ 268436404 ] 31 0 31 +[ 268436405 ] 31 0 31 +[ 268436406 ] 31 0 31 +[ 268436407 ] 31 0 31 +[ 268436408 ] 31 0 31 +[ 268436409 ] 31 0 31 +[ 268436410 ] 31 0 31 +[ 268436411 ] 31 0 31 +[ 268436412 ] 31 0 31 +[ 268436413 ] 31 0 31 +[ 268436414 ] 31 0 31 +[ 268436415 ] 31 0 31 +[ 268436416 ] 31 0 31 +[ 268436417 ] 31 0 31 +[ 268436418 ] 31 0 31 +[ 268436419 ] 31 0 31 +[ 268436420 ] 31 0 31 +[ 268436421 ] 31 0 31 +[ 268436422 ] 31 0 31 +[ 268436423 ] 31 0 31 +[ 268436424 ] 31 0 31 +[ 268436425 ] 31 0 31 +[ 268436426 ] 31 0 31 +[ 268436427 ] 31 0 31 +[ 268436428 ] 31 0 31 +[ 268436429 ] 31 0 31 +[ 268436430 ] 31 0 31 +[ 268436431 ] 31 0 31 +[ 268436432 ] 31 0 31 +[ 268436433 ] 31 0 31 +[ 268436434 ] 31 0 31 +[ 268436435 ] 31 0 31 +[ 268436436 ] 31 0 31 +[ 268436437 ] 31 0 31 +[ 268436438 ] 31 0 31 +[ 268436439 ] 31 0 31 +[ 268436440 ] 31 0 31 +[ 268436441 ] 31 0 31 +[ 268436442 ] 31 0 31 +[ 268436443 ] 31 0 31 +[ 268436444 ] 31 0 31 +[ 268436445 ] 31 0 31 +[ 268436446 ] 31 0 31 +[ 268436447 ] 31 0 31 +[ 268436448 ] 31 0 31 +[ 268436449 ] 31 0 31 +[ 268436450 ] 31 0 31 +[ 268436451 ] 31 0 31 +[ 268436452 ] 31 0 31 +[ 268436453 ] 31 0 31 +[ 268436454 ] 31 0 31 +[ 268436455 ] 31 0 31 +[ 268436456 ] 31 0 31 +[ 268436457 ] 31 0 31 +[ 268436458 ] 31 0 31 +[ 268436459 ] 31 0 31 +[ 268436460 ] 31 0 31 +[ 268436461 ] 31 0 31 +[ 268436462 ] 31 0 31 +[ 268436463 ] 31 0 31 +[ 268436464 ] 31 0 31 +[ 268436465 ] 31 0 31 +[ 268436466 ] 31 0 31 +[ 268436467 ] 31 0 31 +[ 268436468 ] 31 0 31 +[ 268436469 ] 31 0 31 +[ 268436470 ] 31 0 31 +[ 268436471 ] 31 0 31 +[ 268436472 ] 31 0 31 +[ 268436473 ] 31 0 31 +[ 268436474 ] 31 0 31 +[ 268436475 ] 31 0 31 +[ 268436476 ] 31 0 31 +[ 268436477 ] 31 0 31 +[ 268436478 ] 31 0 31 +[ 268436479 ] 31 0 31 +1024 differences found diff --git a/tools/h5diff/testfiles/h5diff_101.txt b/tools/h5diff/testfiles/h5diff_101.txt new file mode 100644 index 0000000..03875b7 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_101.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position d1 d2 difference +------------------------------------------------------------ +[ 0 1 ] 1e-09 2e-09 1e-09 +[ 1 0 ] 1e-09 9e-10 1e-10 +[ 1 1 ] 0 1e-09 1e-09 +[ 2 0 ] 1e-09 0 1e-09 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_102.txt b/tools/h5diff/testfiles/h5diff_102.txt new file mode 100644 index 0000000..3d91a36 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_102.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position fp1 fp2 difference +------------------------------------------------------------ +[ 0 1 ] 1e-05 2e-05 1e-05 +[ 1 0 ] 1e-05 9e-06 9.99999e-07 +[ 1 1 ] 0 1e-05 1e-05 +[ 2 0 ] 1e-05 0 1e-05 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_11.txt b/tools/h5diff/testfiles/h5diff_11.txt new file mode 100644 index 0000000..e2e33fb --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_11.txt @@ -0,0 +1,2 @@ +dataset: and +5 differences found diff --git a/tools/h5diff/testfiles/h5diff_12.txt b/tools/h5diff/testfiles/h5diff_12.txt new file mode 100644 index 0000000..6b4c747 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_12.txt @@ -0,0 +1,2 @@ +dataset: and +5 differences found diff --git a/tools/h5diff/testfiles/h5diff_13.txt b/tools/h5diff/testfiles/h5diff_13.txt new file mode 100644 index 0000000..36676e9 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_13.txt @@ -0,0 +1,10 @@ +dataset: and +size: [3x2] [3x2] +position dset1 dset1 difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 1 1.1 0.1 +[ 1 0 ] 1 1.01 0.01 +[ 1 1 ] 1 1.001 0.001 +[ 2 1 ] 0 1 1 +5 differences found diff --git a/tools/h5diff/testfiles/h5diff_14.txt b/tools/h5diff/testfiles/h5diff_14.txt new file mode 100644 index 0000000..3fac3af --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_14.txt @@ -0,0 +1,10 @@ +dataset: and +size: [3x2] [3x2] +position dset1 dset2 difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 1 1.1 0.1 +[ 1 0 ] 1 1.01 0.01 +[ 1 1 ] 1 1.001 0.001 +[ 2 1 ] 0 1 1 +5 differences found diff --git a/tools/h5diff/testfiles/h5diff_15.txt b/tools/h5diff/testfiles/h5diff_15.txt new file mode 100644 index 0000000..386c6e1 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_15.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position dset3 dset4 difference +------------------------------------------------------------ +[ 0 1 ] 100 120 20 +[ 1 0 ] 100 160 60 +[ 2 0 ] 100 80 20 +[ 2 1 ] 100 40 60 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_16_1.txt b/tools/h5diff/testfiles/h5diff_16_1.txt new file mode 100644 index 0000000..6155ebf --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_16_1.txt @@ -0,0 +1,13 @@ +dataset: and +size: [3x2] [3x2] +position dset5 dset6 difference relative +------------------------------------------------------------------------ +[ 0 0 ] 100 120 20 0.200000 +[ 0 1 ] 100 80 20 0.200000 +[ 1 0 ] 100 0 100 1.000000 +[ 1 1 ] 0 100 100 not comparable +[ 2 1 ] 100 50 50 0.500000 +5 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_16_2.txt b/tools/h5diff/testfiles/h5diff_16_2.txt new file mode 100644 index 0000000..43127bb --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_16_2.txt @@ -0,0 +1,13 @@ +dataset: and +size: [3x2] [3x2] +position dset7 dset8 difference relative +------------------------------------------------------------------------ +[ 0 0 ] 100 120 20 0.200000 +[ 0 1 ] 100 80 20 0.200000 +[ 1 0 ] 100 0 100 1.000000 +[ 1 1 ] 0 100 100 not comparable +[ 2 1 ] 100 50 50 0.500000 +5 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_16_3.txt b/tools/h5diff/testfiles/h5diff_16_3.txt new file mode 100644 index 0000000..6da24cf --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_16_3.txt @@ -0,0 +1,13 @@ +dataset: and +size: [3x2] [3x2] +position dset9 dset10 difference relative +------------------------------------------------------------------------ +[ 0 0 ] 100 120 20 0.2 +[ 0 1 ] 100 80 20 0.2 +[ 1 0 ] 100 0 100 1 +[ 1 1 ] 0 100 100 not comparable +[ 2 1 ] 100 50 50 0.5 +5 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_17.txt b/tools/h5diff/testfiles/h5diff_17.txt new file mode 100644 index 0000000..e92e0be --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_17.txt @@ -0,0 +1,39 @@ + +file1 file2 +--------------------------------------- + x x / + x x /g1 + x /g1/d1 + x /g1/d2 + x x /g1/dset1 + x /g1/dset10 + x /g1/dset2 + x /g1/dset3 + x /g1/dset4 + x /g1/dset5 + x /g1/dset6 + x /g1/dset7 + x /g1/dset8 + x /g1/dset9 + x /g1/fp1 + x /g1/fp15 + x /g1/fp16 + x /g1/fp17 + x /g1/fp18 + x /g1/fp2 + x /g2 + +group : and +0 differences found +group : and +0 differences found +dataset: and +size: [3x2] [3x2] +position dset1 dset1 difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 1 1.1 0.1 +[ 1 0 ] 1 1.01 0.01 +[ 1 1 ] 1 1.001 0.001 +[ 2 1 ] 0 1 1 +5 differences found diff --git a/tools/h5diff/testfiles/h5diff_18.txt b/tools/h5diff/testfiles/h5diff_18.txt new file mode 100644 index 0000000..e69de29 diff --git a/tools/h5diff/testfiles/h5diff_20.txt b/tools/h5diff/testfiles/h5diff_20.txt new file mode 100644 index 0000000..e383972 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_20.txt @@ -0,0 +1,4 @@ +Comparison not possible: is of type H5G_DATASET and is of type H5G_GROUP +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_21.txt b/tools/h5diff/testfiles/h5diff_21.txt new file mode 100644 index 0000000..d5b0443 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_21.txt @@ -0,0 +1,4 @@ +Comparison not possible: is of type H5G_DATASET and is of type H5G_LINK +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_22.txt b/tools/h5diff/testfiles/h5diff_22.txt new file mode 100644 index 0000000..d8714a0 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_22.txt @@ -0,0 +1,4 @@ +Comparison not possible: is of type H5G_DATASET and is of type H5G_TYPE +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_23.txt b/tools/h5diff/testfiles/h5diff_23.txt new file mode 100644 index 0000000..1342765 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_23.txt @@ -0,0 +1,2 @@ +group : and +0 differences found diff --git a/tools/h5diff/testfiles/h5diff_24.txt b/tools/h5diff/testfiles/h5diff_24.txt new file mode 100644 index 0000000..cc4f0d0 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_24.txt @@ -0,0 +1,2 @@ +datatype: and +0 differences found diff --git a/tools/h5diff/testfiles/h5diff_25.txt b/tools/h5diff/testfiles/h5diff_25.txt new file mode 100644 index 0000000..288c4da --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_25.txt @@ -0,0 +1,2 @@ +link : and +0 differences found diff --git a/tools/h5diff/testfiles/h5diff_26.txt b/tools/h5diff/testfiles/h5diff_26.txt new file mode 100644 index 0000000..916cf63 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_26.txt @@ -0,0 +1,2 @@ +group : and +1 differences found diff --git a/tools/h5diff/testfiles/h5diff_27.txt b/tools/h5diff/testfiles/h5diff_27.txt new file mode 100644 index 0000000..335119a --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_27.txt @@ -0,0 +1,2 @@ +datatype: and +1 differences found diff --git a/tools/h5diff/testfiles/h5diff_28.txt b/tools/h5diff/testfiles/h5diff_28.txt new file mode 100644 index 0000000..5845fa9 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_28.txt @@ -0,0 +1,2 @@ +link : and +1 differences found diff --git a/tools/h5diff/testfiles/h5diff_50.txt b/tools/h5diff/testfiles/h5diff_50.txt new file mode 100644 index 0000000..65b563c --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_50.txt @@ -0,0 +1,12 @@ +dataset: and +Warning: different storage datatype + has file datatype H5T_STD_I16LE + has file datatype H5T_STD_I32LE +size: [3x2] [3x2] +position dset0a dset0b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_51.txt b/tools/h5diff/testfiles/h5diff_51.txt new file mode 100644 index 0000000..e6402cc --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_51.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position dset1a dset1b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_52.txt b/tools/h5diff/testfiles/h5diff_52.txt new file mode 100644 index 0000000..88febb9 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_52.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position dset2a dset2b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_53.txt b/tools/h5diff/testfiles/h5diff_53.txt new file mode 100644 index 0000000..554d71a --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_53.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position dset3a dset4b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_54.txt b/tools/h5diff/testfiles/h5diff_54.txt new file mode 100644 index 0000000..1e8adfd --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_54.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position dset4a dset4b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_55.txt b/tools/h5diff/testfiles/h5diff_55.txt new file mode 100644 index 0000000..f895955 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_55.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position dset5a dset5b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_56.txt b/tools/h5diff/testfiles/h5diff_56.txt new file mode 100644 index 0000000..402db43 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_56.txt @@ -0,0 +1,9 @@ +dataset: and +size: [3x2] [3x2] +position dset6a dset6b difference +------------------------------------------------------------ +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_57.txt b/tools/h5diff/testfiles/h5diff_57.txt new file mode 100644 index 0000000..590d355 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_57.txt @@ -0,0 +1,9 @@ +dataset: and +Warning: different storage datatype + has file datatype H5T_STD_I8LE + has file datatype H5T_STD_U8LE +Comparison not supported: has sign H5T_SGN_2 and has sign H5T_SGN_NONE +0 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_58.txt b/tools/h5diff/testfiles/h5diff_58.txt new file mode 100644 index 0000000..1ea2493 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_58.txt @@ -0,0 +1,10 @@ +dataset: and +Referenced dataset 10272 10272 +------------------------------------------------------------ +Region blocks +block #0 (2,2)-(7,7) (0,0)-(2,2) +Region points +point #1 (2,2) (3,3) +point #3 (1,6) (2,5) +point #4 (2,8) (1,7) +4 differences found diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt new file mode 100644 index 0000000..82b69d9 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_600.txt @@ -0,0 +1,56 @@ +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value +h5diff error: missing file names diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt new file mode 100644 index 0000000..9ddf674 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_603.txt @@ -0,0 +1,56 @@ +<-d -4> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_604.txt b/tools/h5diff/testfiles/h5diff_604.txt new file mode 100644 index 0000000..763999d --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_604.txt @@ -0,0 +1,56 @@ +<-d 0> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt new file mode 100644 index 0000000..e00bf5b --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_605.txt @@ -0,0 +1,56 @@ +<-d u> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt new file mode 100644 index 0000000..3d77495 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_606.txt @@ -0,0 +1,56 @@ +<-d 0x1> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_607.txt b/tools/h5diff/testfiles/h5diff_607.txt new file mode 100644 index 0000000..554f2ed --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_607.txt @@ -0,0 +1,2 @@ +dataset: and +6 differences found diff --git a/tools/h5diff/testfiles/h5diff_608.txt b/tools/h5diff/testfiles/h5diff_608.txt new file mode 100644 index 0000000..554f2ed --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_608.txt @@ -0,0 +1,2 @@ +dataset: and +6 differences found diff --git a/tools/h5diff/testfiles/h5diff_609.txt b/tools/h5diff/testfiles/h5diff_609.txt new file mode 100644 index 0000000..e69de29 diff --git a/tools/h5diff/testfiles/h5diff_610.txt b/tools/h5diff/testfiles/h5diff_610.txt new file mode 100644 index 0000000..554f2ed --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_610.txt @@ -0,0 +1,2 @@ +dataset: and +6 differences found diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt new file mode 100644 index 0000000..8f665b8 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_612.txt @@ -0,0 +1,56 @@ +<-p -4> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_613.txt b/tools/h5diff/testfiles/h5diff_613.txt new file mode 100644 index 0000000..f3f16fd --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_613.txt @@ -0,0 +1,56 @@ +<-p 0> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_614.txt b/tools/h5diff/testfiles/h5diff_614.txt new file mode 100644 index 0000000..c78fc8c --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_614.txt @@ -0,0 +1,56 @@ +<-p u> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt new file mode 100644 index 0000000..d25b847 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_615.txt @@ -0,0 +1,56 @@ +<-p 0x1> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_616.txt b/tools/h5diff/testfiles/h5diff_616.txt new file mode 100644 index 0000000..47a1364 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_616.txt @@ -0,0 +1,2 @@ +dataset: and +2 differences found diff --git a/tools/h5diff/testfiles/h5diff_617.txt b/tools/h5diff/testfiles/h5diff_617.txt new file mode 100644 index 0000000..47a1364 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_617.txt @@ -0,0 +1,2 @@ +dataset: and +2 differences found diff --git a/tools/h5diff/testfiles/h5diff_618.txt b/tools/h5diff/testfiles/h5diff_618.txt new file mode 100644 index 0000000..e69de29 diff --git a/tools/h5diff/testfiles/h5diff_619.txt b/tools/h5diff/testfiles/h5diff_619.txt new file mode 100644 index 0000000..554f2ed --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_619.txt @@ -0,0 +1,2 @@ +dataset: and +6 differences found diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt new file mode 100644 index 0000000..21dac0b --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_621.txt @@ -0,0 +1,56 @@ +<-n -4> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt new file mode 100644 index 0000000..c46356a --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_622.txt @@ -0,0 +1,56 @@ +<-n 0> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt new file mode 100644 index 0000000..7ae15e8 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_623.txt @@ -0,0 +1,56 @@ +<-n u> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt new file mode 100644 index 0000000..caf4e62 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_624.txt @@ -0,0 +1,56 @@ +<-n 0x1> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] + file1 File name of the first HDF5 file + file2 File name of the second HDF5 file + [obj1] Name of an HDF5 object, in absolute path + [obj2] Name of an HDF5 object, in absolute path + OPTIONS + -h, --help Print a usage message and exit + -V, --version Print version number and exit + -r, --report Report mode. Print differences + -v, --verbose Verbose mode. Print differences, list of objects + -q, --quiet Quiet mode. Do not do output + -n C, --count=C Print differences up to C number + -d D, --delta=D Print difference when greater than limit D + -p R, --relative=R Print difference when greater than relative limit R + + C - is a positive integer + D - is a positive number. Compare criteria is |a - b| > D + R - is a positive number. Compare criteria is |(b-a)/a| > R + + Modes of output: + + Default mode: print the number of differences found and where they occured + -r Report mode: print the above plus the differences + -v Verbose mode: print the above plus a list of objects and warnings + -q Quiet mode: do not print output + + Return exit code: + + 1 if differences found, 0 if no differences, -1 if error + + Examples of use: + + 1) h5diff file1 file2 /g1/dset1 /g1/dset2 + + Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 + + 2) h5diff file1 file2 /g1/dset1 + + Compares object '/g1/dset1' in both files + + 3) h5diff file1 file2 + + Compares all objects in both files + + Note) file1 and file2 can be the same file. Use + + h5diff file1 file1 /g1/dset1 /g1/dset2 + + to compare '/g1/dset1' and '/g1/dset2' in the same file + + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files. The compare criteria is: + 1) datasets: numerical array differences 2) groups: name string difference + 3) datatypes: the return value of H5Tequal 2) links: name string difference + of the linked value diff --git a/tools/h5diff/testfiles/h5diff_625.txt b/tools/h5diff/testfiles/h5diff_625.txt new file mode 100644 index 0000000..47a1364 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_625.txt @@ -0,0 +1,2 @@ +dataset: and +2 differences found diff --git a/tools/h5diff/testfiles/h5diff_626.txt b/tools/h5diff/testfiles/h5diff_626.txt new file mode 100644 index 0000000..be392ae --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_626.txt @@ -0,0 +1,2 @@ +dataset: and +3 differences found diff --git a/tools/h5diff/testfiles/h5diff_627.txt b/tools/h5diff/testfiles/h5diff_627.txt new file mode 100644 index 0000000..554f2ed --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_627.txt @@ -0,0 +1,2 @@ +dataset: and +6 differences found diff --git a/tools/h5diff/testfiles/h5diff_628.txt b/tools/h5diff/testfiles/h5diff_628.txt new file mode 100644 index 0000000..74decda --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_628.txt @@ -0,0 +1,2 @@ +dataset: and +1 differences found diff --git a/tools/h5diff/testfiles/h5diff_629.txt b/tools/h5diff/testfiles/h5diff_629.txt new file mode 100644 index 0000000..4e67f57 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_629.txt @@ -0,0 +1 @@ +h5diff: : unable to open file diff --git a/tools/h5diff/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt new file mode 100644 index 0000000..7871f8c --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_70.txt @@ -0,0 +1,2030 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset + x x /g1 + +group : and +0 differences found +attribute: > and > +size: [2] [2] +position string of string of difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +attribute: > and > +size: [2] [2] +position VLstring of VLstring of difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +attribute: > and > +size: [2] [2] +position bitfield of bitfield of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position opaque of opaque of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position compound of compound of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 1 ] 3 0 3 +[ 1 ] 4 0 4 +4 differences found +attribute: > and > +size: [2] [2] +position enum of enum of difference +------------------------------------------------------------ +[ 0 ] RED GREEN +[ 1 ] RED GREEN +2 differences found +attribute: > and > +size: [2] [2] +position vlen of vlen of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +[ 1 ] 3 0 3 +3 differences found +attribute: > and > +size: [2] [2] +position array of array of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 0 ] 3 0 3 +[ 1 ] 4 0 4 +[ 1 ] 5 0 5 +[ 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [2] [2] +position integer of integer of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position float of float of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [3x2] [3x2] +position string2D of string2D of difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +attribute: > and > +size: [3x2] [3x2] +position VLstring2D of VLstring2D of difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +attribute: > and > +size: [3x2] [3x2] +position bitfield2D of bitfield2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position opaque2D of opaque2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position compound2D of compound2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 1 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 1 0 ] 5 0 5 +[ 1 0 ] 6 0 6 +[ 1 1 ] 7 0 7 +[ 1 1 ] 8 0 8 +[ 2 0 ] 9 0 9 +[ 2 0 ] 10 0 10 +[ 2 1 ] 11 0 11 +[ 2 1 ] 12 0 12 +12 differences found +attribute: > and > +size: [3x2] [3x2] +position enum2D of enum2D of difference +------------------------------------------------------------ +[ 0 0 ] RED GREEN +[ 0 1 ] RED GREEN +[ 1 0 ] RED GREEN +[ 1 1 ] RED GREEN +[ 2 0 ] RED GREEN +[ 2 1 ] RED GREEN +6 differences found +attribute: > and > +size: [3x2] [3x2] +position vlen2D of vlen2D of difference +------------------------------------------------------------ +[ 0 1 ] 1 0 1 +[ 1 0 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 1 1 ] 5 0 5 +[ 2 0 ] 6 0 6 +[ 2 0 ] 7 0 7 +[ 2 0 ] 8 0 8 +[ 2 1 ] 9 0 9 +[ 2 1 ] 10 0 10 +[ 2 1 ] 11 0 11 +11 differences found +attribute: > and > +size: [3x2] [3x2] +position array2D of array2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 0 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 0 1 ] 5 0 5 +[ 0 1 ] 6 0 6 +[ 1 0 ] 7 0 7 +[ 1 0 ] 8 0 8 +[ 1 0 ] 9 0 9 +[ 1 1 ] 10 0 10 +[ 1 1 ] 11 0 11 +[ 1 1 ] 12 0 12 +[ 2 0 ] 13 0 13 +[ 2 0 ] 14 0 14 +[ 2 0 ] 15 0 15 +[ 2 1 ] 16 0 16 +[ 2 1 ] 17 0 17 +[ 2 1 ] 18 0 18 +18 differences found +attribute: > and > +size: [3x2] [3x2] +position integer2D of integer2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position float2D of float2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position string3D of string3D of difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position VLstring3D of VLstring3D of difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position bitfield3D of bitfield3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position opaque3D of opaque3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position compound3D of compound3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 0 ] 2 0 2 +[ 0 0 1 ] 3 0 3 +[ 0 0 1 ] 4 0 4 +[ 0 1 0 ] 5 0 5 +[ 0 1 0 ] 6 0 6 +[ 0 1 1 ] 7 0 7 +[ 0 1 1 ] 8 0 8 +[ 0 2 0 ] 9 0 9 +[ 0 2 0 ] 10 0 10 +[ 0 2 1 ] 11 0 11 +[ 0 2 1 ] 12 0 12 +[ 1 0 0 ] 13 0 13 +[ 1 0 0 ] 14 0 14 +[ 1 0 1 ] 15 0 15 +[ 1 0 1 ] 16 0 16 +[ 1 1 0 ] 17 0 17 +[ 1 1 0 ] 18 0 18 +[ 1 1 1 ] 19 0 19 +[ 1 1 1 ] 20 0 20 +[ 1 2 0 ] 21 0 21 +[ 1 2 0 ] 22 0 22 +[ 1 2 1 ] 23 0 23 +[ 1 2 1 ] 24 0 24 +[ 2 0 0 ] 25 0 25 +[ 2 0 0 ] 26 0 26 +[ 2 0 1 ] 27 0 27 +[ 2 0 1 ] 28 0 28 +[ 2 1 0 ] 29 0 29 +[ 2 1 0 ] 30 0 30 +[ 2 1 1 ] 31 0 31 +[ 2 1 1 ] 32 0 32 +[ 2 2 0 ] 33 0 33 +[ 2 2 0 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 2 2 1 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 1 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 1 0 ] 41 0 41 +[ 3 1 0 ] 42 0 42 +[ 3 1 1 ] 43 0 43 +[ 3 1 1 ] 44 0 44 +[ 3 2 0 ] 45 0 45 +[ 3 2 0 ] 46 0 46 +[ 3 2 1 ] 47 0 47 +[ 3 2 1 ] 48 0 48 +48 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position enum3D of enum3D of difference +------------------------------------------------------------ +[ 0 0 0 ] GREEN RED +[ 0 0 1 ] GREEN RED +[ 0 1 0 ] GREEN RED +[ 0 1 1 ] GREEN RED +[ 0 2 0 ] GREEN RED +[ 0 2 1 ] GREEN RED +[ 1 0 0 ] GREEN RED +[ 1 0 1 ] GREEN RED +[ 1 1 0 ] GREEN RED +[ 1 1 1 ] GREEN RED +[ 1 2 0 ] GREEN RED +[ 1 2 1 ] GREEN RED +[ 2 0 0 ] GREEN RED +[ 2 0 1 ] GREEN RED +[ 2 1 0 ] GREEN RED +[ 2 1 1 ] GREEN RED +[ 2 2 0 ] GREEN RED +[ 2 2 1 ] GREEN RED +[ 3 0 0 ] GREEN RED +[ 3 0 1 ] GREEN RED +[ 3 1 0 ] GREEN RED +[ 3 1 1 ] GREEN RED +[ 3 2 0 ] GREEN RED +[ 3 2 1 ] GREEN RED +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position vlen3D of vlen3D of difference +------------------------------------------------------------ +[ 0 0 1 ] 1 0 1 +[ 0 1 0 ] 2 0 2 +[ 0 1 1 ] 3 0 3 +[ 0 2 0 ] 4 0 4 +[ 0 2 1 ] 5 0 5 +[ 1 0 0 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 0 1 ] 9 0 9 +[ 1 1 0 ] 10 0 10 +[ 1 1 0 ] 11 0 11 +[ 1 1 1 ] 12 0 12 +[ 1 1 1 ] 13 0 13 +[ 1 2 0 ] 14 0 14 +[ 1 2 0 ] 15 0 15 +[ 1 2 1 ] 16 0 16 +[ 1 2 1 ] 17 0 17 +[ 2 0 0 ] 18 0 18 +[ 2 0 0 ] 19 0 19 +[ 2 0 0 ] 20 0 20 +[ 2 0 1 ] 21 0 21 +[ 2 0 1 ] 22 0 22 +[ 2 0 1 ] 23 0 23 +[ 2 1 0 ] 24 0 24 +[ 2 1 0 ] 25 0 25 +[ 2 1 0 ] 26 0 26 +[ 2 1 1 ] 27 0 27 +[ 2 1 1 ] 28 0 28 +[ 2 1 1 ] 29 0 29 +[ 2 2 0 ] 30 0 30 +[ 2 2 0 ] 31 0 31 +[ 2 2 0 ] 32 0 32 +[ 2 2 1 ] 33 0 33 +[ 2 2 1 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 3 0 0 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 0 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 0 1 ] 41 0 41 +[ 3 0 1 ] 42 0 42 +[ 3 0 1 ] 43 0 43 +[ 3 1 0 ] 44 0 44 +[ 3 1 0 ] 45 0 45 +[ 3 1 0 ] 46 0 46 +[ 3 1 0 ] 47 0 47 +[ 3 1 1 ] 48 0 48 +[ 3 1 1 ] 49 0 49 +[ 3 1 1 ] 50 0 50 +[ 3 1 1 ] 51 0 51 +[ 3 2 0 ] 52 0 52 +[ 3 2 0 ] 53 0 53 +[ 3 2 0 ] 54 0 54 +[ 3 2 0 ] 55 0 55 +[ 3 2 1 ] 56 0 56 +[ 3 2 1 ] 57 0 57 +[ 3 2 1 ] 58 0 58 +[ 3 2 1 ] 59 0 59 +59 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position array3D of array3D of 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 1 0 ] 7 0 7 +[ 0 1 0 ] 8 0 8 +[ 0 1 0 ] 9 0 9 +[ 0 1 1 ] 10 0 10 +[ 0 1 1 ] 11 0 11 +[ 0 1 1 ] 12 0 12 +[ 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 +[ 1 0 0 ] 19 0 19 +[ 1 0 0 ] 20 0 20 +[ 1 0 0 ] 21 0 21 +[ 1 0 1 ] 22 0 22 +[ 1 0 1 ] 23 0 23 +[ 1 0 1 ] 24 0 24 +[ 1 1 0 ] 25 0 25 +[ 1 1 0 ] 26 0 26 +[ 1 1 0 ] 27 0 27 +[ 1 1 1 ] 28 0 28 +[ 1 1 1 ] 29 0 29 +[ 1 1 1 ] 30 0 30 +[ 1 2 0 ] 31 0 31 +[ 1 2 0 ] 32 0 32 +[ 1 2 0 ] 33 0 33 +[ 1 2 1 ] 34 0 34 +[ 1 2 1 ] 35 0 35 +[ 1 2 1 ] 36 0 36 +[ 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 1 0 ] 43 0 43 +[ 2 1 0 ] 44 0 44 +[ 2 1 0 ] 45 0 45 +[ 2 1 1 ] 46 0 46 +[ 2 1 1 ] 47 0 47 +[ 2 1 1 ] 48 0 48 +[ 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 +[ 3 0 0 ] 55 0 55 +[ 3 0 0 ] 56 0 56 +[ 3 0 0 ] 57 0 57 +[ 3 0 1 ] 58 0 58 +[ 3 0 1 ] 59 0 59 +[ 3 0 1 ] 60 0 60 +[ 3 1 0 ] 61 0 61 +[ 3 1 0 ] 62 0 62 +[ 3 1 0 ] 63 0 63 +[ 3 1 1 ] 64 0 64 +[ 3 1 1 ] 65 0 65 +[ 3 1 1 ] 66 0 66 +[ 3 2 0 ] 67 0 67 +[ 3 2 0 ] 68 0 68 +[ 3 2 0 ] 69 0 69 +[ 3 2 1 ] 70 0 70 +[ 3 2 1 ] 71 0 71 +[ 3 2 1 ] 72 0 72 +72 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position integer3D of integer3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position float3D of float3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +dataset: and + or are empty datasets +attribute: > and > +size: [2] [2] +position string of string of difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +attribute: > and > +size: [2] [2] +position VLstring of VLstring of difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +attribute: > and > +size: [2] [2] +position bitfield of bitfield of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position opaque of opaque of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position compound of compound of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 1 ] 3 0 3 +[ 1 ] 4 0 4 +4 differences found +attribute: > and > +0 differences found +attribute: > and > +size: [2] [2] +position enum of enum of difference +------------------------------------------------------------ +[ 0 ] RED GREEN +[ 1 ] RED GREEN +2 differences found +attribute: > and > +size: [2] [2] +position vlen of vlen of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +[ 1 ] 3 0 3 +3 differences found +attribute: > and > +size: [2] [2] +position array of array of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 0 ] 3 0 3 +[ 1 ] 4 0 4 +[ 1 ] 5 0 5 +[ 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [2] [2] +position integer of integer of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position float of float of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [3x2] [3x2] +position string2D of string2D of difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +attribute: > and > +size: [3x2] [3x2] +position VLstring2D of VLstring2D of difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +attribute: > and > +size: [3x2] [3x2] +position bitfield2D of bitfield2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position opaque2D of opaque2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position compound2D of compound2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 1 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 1 0 ] 5 0 5 +[ 1 0 ] 6 0 6 +[ 1 1 ] 7 0 7 +[ 1 1 ] 8 0 8 +[ 2 0 ] 9 0 9 +[ 2 0 ] 10 0 10 +[ 2 1 ] 11 0 11 +[ 2 1 ] 12 0 12 +12 differences found +attribute: > and > +0 differences found +attribute: > and > +size: [3x2] [3x2] +position enum2D of enum2D of difference +------------------------------------------------------------ +[ 0 0 ] RED GREEN +[ 0 1 ] RED GREEN +[ 1 0 ] RED GREEN +[ 1 1 ] RED GREEN +[ 2 0 ] RED GREEN +[ 2 1 ] RED GREEN +6 differences found +attribute: > and > +size: [3x2] [3x2] +position vlen2D of vlen2D of difference +------------------------------------------------------------ +[ 0 1 ] 1 0 1 +[ 1 0 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 1 1 ] 5 0 5 +[ 2 0 ] 6 0 6 +[ 2 0 ] 7 0 7 +[ 2 0 ] 8 0 8 +[ 2 1 ] 9 0 9 +[ 2 1 ] 10 0 10 +[ 2 1 ] 11 0 11 +11 differences found +attribute: > and > +size: [3x2] [3x2] +position array2D of array2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 0 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 0 1 ] 5 0 5 +[ 0 1 ] 6 0 6 +[ 1 0 ] 7 0 7 +[ 1 0 ] 8 0 8 +[ 1 0 ] 9 0 9 +[ 1 1 ] 10 0 10 +[ 1 1 ] 11 0 11 +[ 1 1 ] 12 0 12 +[ 2 0 ] 13 0 13 +[ 2 0 ] 14 0 14 +[ 2 0 ] 15 0 15 +[ 2 1 ] 16 0 16 +[ 2 1 ] 17 0 17 +[ 2 1 ] 18 0 18 +18 differences found +attribute: > and > +size: [3x2] [3x2] +position integer2D of integer2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position float2D of float2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position string3D of string3D of difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position VLstring3D of VLstring3D of difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position bitfield3D of bitfield3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position opaque3D of opaque3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position compound3D of compound3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 0 ] 2 0 2 +[ 0 0 1 ] 3 0 3 +[ 0 0 1 ] 4 0 4 +[ 0 1 0 ] 5 0 5 +[ 0 1 0 ] 6 0 6 +[ 0 1 1 ] 7 0 7 +[ 0 1 1 ] 8 0 8 +[ 0 2 0 ] 9 0 9 +[ 0 2 0 ] 10 0 10 +[ 0 2 1 ] 11 0 11 +[ 0 2 1 ] 12 0 12 +[ 1 0 0 ] 13 0 13 +[ 1 0 0 ] 14 0 14 +[ 1 0 1 ] 15 0 15 +[ 1 0 1 ] 16 0 16 +[ 1 1 0 ] 17 0 17 +[ 1 1 0 ] 18 0 18 +[ 1 1 1 ] 19 0 19 +[ 1 1 1 ] 20 0 20 +[ 1 2 0 ] 21 0 21 +[ 1 2 0 ] 22 0 22 +[ 1 2 1 ] 23 0 23 +[ 1 2 1 ] 24 0 24 +[ 2 0 0 ] 25 0 25 +[ 2 0 0 ] 26 0 26 +[ 2 0 1 ] 27 0 27 +[ 2 0 1 ] 28 0 28 +[ 2 1 0 ] 29 0 29 +[ 2 1 0 ] 30 0 30 +[ 2 1 1 ] 31 0 31 +[ 2 1 1 ] 32 0 32 +[ 2 2 0 ] 33 0 33 +[ 2 2 0 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 2 2 1 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 1 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 1 0 ] 41 0 41 +[ 3 1 0 ] 42 0 42 +[ 3 1 1 ] 43 0 43 +[ 3 1 1 ] 44 0 44 +[ 3 2 0 ] 45 0 45 +[ 3 2 0 ] 46 0 46 +[ 3 2 1 ] 47 0 47 +[ 3 2 1 ] 48 0 48 +48 differences found +attribute: > and > +0 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position enum3D of enum3D of difference +------------------------------------------------------------ +[ 0 0 0 ] GREEN RED +[ 0 0 1 ] GREEN RED +[ 0 1 0 ] GREEN RED +[ 0 1 1 ] GREEN RED +[ 0 2 0 ] GREEN RED +[ 0 2 1 ] GREEN RED +[ 1 0 0 ] GREEN RED +[ 1 0 1 ] GREEN RED +[ 1 1 0 ] GREEN RED +[ 1 1 1 ] GREEN RED +[ 1 2 0 ] GREEN RED +[ 1 2 1 ] GREEN RED +[ 2 0 0 ] GREEN RED +[ 2 0 1 ] GREEN RED +[ 2 1 0 ] GREEN RED +[ 2 1 1 ] GREEN RED +[ 2 2 0 ] GREEN RED +[ 2 2 1 ] GREEN RED +[ 3 0 0 ] GREEN RED +[ 3 0 1 ] GREEN RED +[ 3 1 0 ] GREEN RED +[ 3 1 1 ] GREEN RED +[ 3 2 0 ] GREEN RED +[ 3 2 1 ] GREEN RED +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position vlen3D of vlen3D of difference +------------------------------------------------------------ +[ 0 0 1 ] 1 0 1 +[ 0 1 0 ] 2 0 2 +[ 0 1 1 ] 3 0 3 +[ 0 2 0 ] 4 0 4 +[ 0 2 1 ] 5 0 5 +[ 1 0 0 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 0 1 ] 9 0 9 +[ 1 1 0 ] 10 0 10 +[ 1 1 0 ] 11 0 11 +[ 1 1 1 ] 12 0 12 +[ 1 1 1 ] 13 0 13 +[ 1 2 0 ] 14 0 14 +[ 1 2 0 ] 15 0 15 +[ 1 2 1 ] 16 0 16 +[ 1 2 1 ] 17 0 17 +[ 2 0 0 ] 18 0 18 +[ 2 0 0 ] 19 0 19 +[ 2 0 0 ] 20 0 20 +[ 2 0 1 ] 21 0 21 +[ 2 0 1 ] 22 0 22 +[ 2 0 1 ] 23 0 23 +[ 2 1 0 ] 24 0 24 +[ 2 1 0 ] 25 0 25 +[ 2 1 0 ] 26 0 26 +[ 2 1 1 ] 27 0 27 +[ 2 1 1 ] 28 0 28 +[ 2 1 1 ] 29 0 29 +[ 2 2 0 ] 30 0 30 +[ 2 2 0 ] 31 0 31 +[ 2 2 0 ] 32 0 32 +[ 2 2 1 ] 33 0 33 +[ 2 2 1 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 3 0 0 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 0 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 0 1 ] 41 0 41 +[ 3 0 1 ] 42 0 42 +[ 3 0 1 ] 43 0 43 +[ 3 1 0 ] 44 0 44 +[ 3 1 0 ] 45 0 45 +[ 3 1 0 ] 46 0 46 +[ 3 1 0 ] 47 0 47 +[ 3 1 1 ] 48 0 48 +[ 3 1 1 ] 49 0 49 +[ 3 1 1 ] 50 0 50 +[ 3 1 1 ] 51 0 51 +[ 3 2 0 ] 52 0 52 +[ 3 2 0 ] 53 0 53 +[ 3 2 0 ] 54 0 54 +[ 3 2 0 ] 55 0 55 +[ 3 2 1 ] 56 0 56 +[ 3 2 1 ] 57 0 57 +[ 3 2 1 ] 58 0 58 +[ 3 2 1 ] 59 0 59 +59 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position array3D of array3D of 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 1 0 ] 7 0 7 +[ 0 1 0 ] 8 0 8 +[ 0 1 0 ] 9 0 9 +[ 0 1 1 ] 10 0 10 +[ 0 1 1 ] 11 0 11 +[ 0 1 1 ] 12 0 12 +[ 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 +[ 1 0 0 ] 19 0 19 +[ 1 0 0 ] 20 0 20 +[ 1 0 0 ] 21 0 21 +[ 1 0 1 ] 22 0 22 +[ 1 0 1 ] 23 0 23 +[ 1 0 1 ] 24 0 24 +[ 1 1 0 ] 25 0 25 +[ 1 1 0 ] 26 0 26 +[ 1 1 0 ] 27 0 27 +[ 1 1 1 ] 28 0 28 +[ 1 1 1 ] 29 0 29 +[ 1 1 1 ] 30 0 30 +[ 1 2 0 ] 31 0 31 +[ 1 2 0 ] 32 0 32 +[ 1 2 0 ] 33 0 33 +[ 1 2 1 ] 34 0 34 +[ 1 2 1 ] 35 0 35 +[ 1 2 1 ] 36 0 36 +[ 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 1 0 ] 43 0 43 +[ 2 1 0 ] 44 0 44 +[ 2 1 0 ] 45 0 45 +[ 2 1 1 ] 46 0 46 +[ 2 1 1 ] 47 0 47 +[ 2 1 1 ] 48 0 48 +[ 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 +[ 3 0 0 ] 55 0 55 +[ 3 0 0 ] 56 0 56 +[ 3 0 0 ] 57 0 57 +[ 3 0 1 ] 58 0 58 +[ 3 0 1 ] 59 0 59 +[ 3 0 1 ] 60 0 60 +[ 3 1 0 ] 61 0 61 +[ 3 1 0 ] 62 0 62 +[ 3 1 0 ] 63 0 63 +[ 3 1 1 ] 64 0 64 +[ 3 1 1 ] 65 0 65 +[ 3 1 1 ] 66 0 66 +[ 3 2 0 ] 67 0 67 +[ 3 2 0 ] 68 0 68 +[ 3 2 0 ] 69 0 69 +[ 3 2 1 ] 70 0 70 +[ 3 2 1 ] 71 0 71 +[ 3 2 1 ] 72 0 72 +72 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position integer3D of integer3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position float3D of float3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +519 differences found +group : and +0 differences found +attribute: > and > +size: [2] [2] +position string of string of difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +attribute: > and > +size: [2] [2] +position VLstring of VLstring of difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +attribute: > and > +size: [2] [2] +position bitfield of bitfield of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position opaque of opaque of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position compound of compound of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 1 ] 3 0 3 +[ 1 ] 4 0 4 +4 differences found +attribute: > and > +size: [2] [2] +position enum of enum of difference +------------------------------------------------------------ +[ 0 ] RED GREEN +[ 1 ] RED GREEN +2 differences found +attribute: > and > +size: [2] [2] +position vlen of vlen of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +[ 1 ] 3 0 3 +3 differences found +attribute: > and > +size: [2] [2] +position array of array of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 0 ] 3 0 3 +[ 1 ] 4 0 4 +[ 1 ] 5 0 5 +[ 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [2] [2] +position integer of integer of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [2] [2] +position float of float of difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +attribute: > and > +size: [3x2] [3x2] +position string2D of string2D of difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +attribute: > and > +size: [3x2] [3x2] +position VLstring2D of VLstring2D of difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +attribute: > and > +size: [3x2] [3x2] +position bitfield2D of bitfield2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position opaque2D of opaque2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position compound2D of compound2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 1 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 1 0 ] 5 0 5 +[ 1 0 ] 6 0 6 +[ 1 1 ] 7 0 7 +[ 1 1 ] 8 0 8 +[ 2 0 ] 9 0 9 +[ 2 0 ] 10 0 10 +[ 2 1 ] 11 0 11 +[ 2 1 ] 12 0 12 +12 differences found +attribute: > and > +size: [3x2] [3x2] +position enum2D of enum2D of difference +------------------------------------------------------------ +[ 0 0 ] RED GREEN +[ 0 1 ] RED GREEN +[ 1 0 ] RED GREEN +[ 1 1 ] RED GREEN +[ 2 0 ] RED GREEN +[ 2 1 ] RED GREEN +6 differences found +attribute: > and > +size: [3x2] [3x2] +position vlen2D of vlen2D of difference +------------------------------------------------------------ +[ 0 1 ] 1 0 1 +[ 1 0 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 1 1 ] 5 0 5 +[ 2 0 ] 6 0 6 +[ 2 0 ] 7 0 7 +[ 2 0 ] 8 0 8 +[ 2 1 ] 9 0 9 +[ 2 1 ] 10 0 10 +[ 2 1 ] 11 0 11 +11 differences found +attribute: > and > +size: [3x2] [3x2] +position array2D of array2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 0 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 0 1 ] 5 0 5 +[ 0 1 ] 6 0 6 +[ 1 0 ] 7 0 7 +[ 1 0 ] 8 0 8 +[ 1 0 ] 9 0 9 +[ 1 1 ] 10 0 10 +[ 1 1 ] 11 0 11 +[ 1 1 ] 12 0 12 +[ 2 0 ] 13 0 13 +[ 2 0 ] 14 0 14 +[ 2 0 ] 15 0 15 +[ 2 1 ] 16 0 16 +[ 2 1 ] 17 0 17 +[ 2 1 ] 18 0 18 +18 differences found +attribute: > and > +size: [3x2] [3x2] +position integer2D of integer2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [3x2] [3x2] +position float2D of float2D of difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position string3D of string3D of difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position VLstring3D of VLstring3D of difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position bitfield3D of bitfield3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position opaque3D of opaque3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position compound3D of compound3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 0 ] 2 0 2 +[ 0 0 1 ] 3 0 3 +[ 0 0 1 ] 4 0 4 +[ 0 1 0 ] 5 0 5 +[ 0 1 0 ] 6 0 6 +[ 0 1 1 ] 7 0 7 +[ 0 1 1 ] 8 0 8 +[ 0 2 0 ] 9 0 9 +[ 0 2 0 ] 10 0 10 +[ 0 2 1 ] 11 0 11 +[ 0 2 1 ] 12 0 12 +[ 1 0 0 ] 13 0 13 +[ 1 0 0 ] 14 0 14 +[ 1 0 1 ] 15 0 15 +[ 1 0 1 ] 16 0 16 +[ 1 1 0 ] 17 0 17 +[ 1 1 0 ] 18 0 18 +[ 1 1 1 ] 19 0 19 +[ 1 1 1 ] 20 0 20 +[ 1 2 0 ] 21 0 21 +[ 1 2 0 ] 22 0 22 +[ 1 2 1 ] 23 0 23 +[ 1 2 1 ] 24 0 24 +[ 2 0 0 ] 25 0 25 +[ 2 0 0 ] 26 0 26 +[ 2 0 1 ] 27 0 27 +[ 2 0 1 ] 28 0 28 +[ 2 1 0 ] 29 0 29 +[ 2 1 0 ] 30 0 30 +[ 2 1 1 ] 31 0 31 +[ 2 1 1 ] 32 0 32 +[ 2 2 0 ] 33 0 33 +[ 2 2 0 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 2 2 1 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 1 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 1 0 ] 41 0 41 +[ 3 1 0 ] 42 0 42 +[ 3 1 1 ] 43 0 43 +[ 3 1 1 ] 44 0 44 +[ 3 2 0 ] 45 0 45 +[ 3 2 0 ] 46 0 46 +[ 3 2 1 ] 47 0 47 +[ 3 2 1 ] 48 0 48 +48 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position enum3D of enum3D of difference +------------------------------------------------------------ +[ 0 0 0 ] GREEN RED +[ 0 0 1 ] GREEN RED +[ 0 1 0 ] GREEN RED +[ 0 1 1 ] GREEN RED +[ 0 2 0 ] GREEN RED +[ 0 2 1 ] GREEN RED +[ 1 0 0 ] GREEN RED +[ 1 0 1 ] GREEN RED +[ 1 1 0 ] GREEN RED +[ 1 1 1 ] GREEN RED +[ 1 2 0 ] GREEN RED +[ 1 2 1 ] GREEN RED +[ 2 0 0 ] GREEN RED +[ 2 0 1 ] GREEN RED +[ 2 1 0 ] GREEN RED +[ 2 1 1 ] GREEN RED +[ 2 2 0 ] GREEN RED +[ 2 2 1 ] GREEN RED +[ 3 0 0 ] GREEN RED +[ 3 0 1 ] GREEN RED +[ 3 1 0 ] GREEN RED +[ 3 1 1 ] GREEN RED +[ 3 2 0 ] GREEN RED +[ 3 2 1 ] GREEN RED +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position vlen3D of vlen3D of difference +------------------------------------------------------------ +[ 0 0 1 ] 1 0 1 +[ 0 1 0 ] 2 0 2 +[ 0 1 1 ] 3 0 3 +[ 0 2 0 ] 4 0 4 +[ 0 2 1 ] 5 0 5 +[ 1 0 0 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 0 1 ] 9 0 9 +[ 1 1 0 ] 10 0 10 +[ 1 1 0 ] 11 0 11 +[ 1 1 1 ] 12 0 12 +[ 1 1 1 ] 13 0 13 +[ 1 2 0 ] 14 0 14 +[ 1 2 0 ] 15 0 15 +[ 1 2 1 ] 16 0 16 +[ 1 2 1 ] 17 0 17 +[ 2 0 0 ] 18 0 18 +[ 2 0 0 ] 19 0 19 +[ 2 0 0 ] 20 0 20 +[ 2 0 1 ] 21 0 21 +[ 2 0 1 ] 22 0 22 +[ 2 0 1 ] 23 0 23 +[ 2 1 0 ] 24 0 24 +[ 2 1 0 ] 25 0 25 +[ 2 1 0 ] 26 0 26 +[ 2 1 1 ] 27 0 27 +[ 2 1 1 ] 28 0 28 +[ 2 1 1 ] 29 0 29 +[ 2 2 0 ] 30 0 30 +[ 2 2 0 ] 31 0 31 +[ 2 2 0 ] 32 0 32 +[ 2 2 1 ] 33 0 33 +[ 2 2 1 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 3 0 0 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 0 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 0 1 ] 41 0 41 +[ 3 0 1 ] 42 0 42 +[ 3 0 1 ] 43 0 43 +[ 3 1 0 ] 44 0 44 +[ 3 1 0 ] 45 0 45 +[ 3 1 0 ] 46 0 46 +[ 3 1 0 ] 47 0 47 +[ 3 1 1 ] 48 0 48 +[ 3 1 1 ] 49 0 49 +[ 3 1 1 ] 50 0 50 +[ 3 1 1 ] 51 0 51 +[ 3 2 0 ] 52 0 52 +[ 3 2 0 ] 53 0 53 +[ 3 2 0 ] 54 0 54 +[ 3 2 0 ] 55 0 55 +[ 3 2 1 ] 56 0 56 +[ 3 2 1 ] 57 0 57 +[ 3 2 1 ] 58 0 58 +[ 3 2 1 ] 59 0 59 +59 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position array3D of array3D of 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 1 0 ] 7 0 7 +[ 0 1 0 ] 8 0 8 +[ 0 1 0 ] 9 0 9 +[ 0 1 1 ] 10 0 10 +[ 0 1 1 ] 11 0 11 +[ 0 1 1 ] 12 0 12 +[ 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 +[ 1 0 0 ] 19 0 19 +[ 1 0 0 ] 20 0 20 +[ 1 0 0 ] 21 0 21 +[ 1 0 1 ] 22 0 22 +[ 1 0 1 ] 23 0 23 +[ 1 0 1 ] 24 0 24 +[ 1 1 0 ] 25 0 25 +[ 1 1 0 ] 26 0 26 +[ 1 1 0 ] 27 0 27 +[ 1 1 1 ] 28 0 28 +[ 1 1 1 ] 29 0 29 +[ 1 1 1 ] 30 0 30 +[ 1 2 0 ] 31 0 31 +[ 1 2 0 ] 32 0 32 +[ 1 2 0 ] 33 0 33 +[ 1 2 1 ] 34 0 34 +[ 1 2 1 ] 35 0 35 +[ 1 2 1 ] 36 0 36 +[ 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 1 0 ] 43 0 43 +[ 2 1 0 ] 44 0 44 +[ 2 1 0 ] 45 0 45 +[ 2 1 1 ] 46 0 46 +[ 2 1 1 ] 47 0 47 +[ 2 1 1 ] 48 0 48 +[ 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 +[ 3 0 0 ] 55 0 55 +[ 3 0 0 ] 56 0 56 +[ 3 0 0 ] 57 0 57 +[ 3 0 1 ] 58 0 58 +[ 3 0 1 ] 59 0 59 +[ 3 0 1 ] 60 0 60 +[ 3 1 0 ] 61 0 61 +[ 3 1 0 ] 62 0 62 +[ 3 1 0 ] 63 0 63 +[ 3 1 1 ] 64 0 64 +[ 3 1 1 ] 65 0 65 +[ 3 1 1 ] 66 0 66 +[ 3 2 0 ] 67 0 67 +[ 3 2 0 ] 68 0 68 +[ 3 2 0 ] 69 0 69 +[ 3 2 1 ] 70 0 70 +[ 3 2 1 ] 71 0 71 +[ 3 2 1 ] 72 0 72 +72 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position integer3D of integer3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +attribute: > and > +size: [4x3x2] [4x3x2] +position float3D of float3D of difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt new file mode 100644 index 0000000..127ddb2 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_80.txt @@ -0,0 +1,868 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset + x x /dsetref + x x /g1 + x x /g1/VLstring + x x /g1/VLstring2D + x x /g1/VLstring3D + x x /g1/array + x x /g1/array2D + x x /g1/array3D + x x /g1/bitfield + x x /g1/bitfield2D + x x /g1/bitfield3D + x x /g1/compound + x x /g1/compound2D + x x /g1/compound3D + x x /g1/enum + x x /g1/enum2D + x x /g1/enum3D + x x /g1/float + x x /g1/float2D + x x /g1/float3D + x x /g1/integer + x x /g1/integer2D + x x /g1/integer3D + x x /g1/opaque + x x /g1/opaque2D + x x /g1/opaque3D + x x /g1/reference + x x /g1/reference2D + x x /g1/reference3D + x x /g1/string + x x /g1/string2D + x x /g1/string3D + x x /g1/vlen + x x /g1/vlen2D + x x /g1/vlen3D + x x /refreg + +group : and +0 differences found +dataset: and +size: [2] [2] +position dset dset difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +dataset: and +0 differences found +group : and +0 differences found +dataset: and +size: [2] [2] +position VLstring VLstring difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +dataset: and +size: [3x2] [3x2] +position VLstring2D VLstring2D difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +dataset: and +size: [4x3x2] [4x3x2] +position VLstring3D VLstring3D difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +dataset: and +size: [2] [2] +position array array difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 0 ] 3 0 3 +[ 1 ] 4 0 4 +[ 1 ] 5 0 5 +[ 1 ] 6 0 6 +6 differences found +dataset: and +size: [3x2] [3x2] +position array2D array2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 0 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 0 1 ] 5 0 5 +[ 0 1 ] 6 0 6 +[ 1 0 ] 7 0 7 +[ 1 0 ] 8 0 8 +[ 1 0 ] 9 0 9 +[ 1 1 ] 10 0 10 +[ 1 1 ] 11 0 11 +[ 1 1 ] 12 0 12 +[ 2 0 ] 13 0 13 +[ 2 0 ] 14 0 14 +[ 2 0 ] 15 0 15 +[ 2 1 ] 16 0 16 +[ 2 1 ] 17 0 17 +[ 2 1 ] 18 0 18 +18 differences found +dataset: and +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 1 0 ] 7 0 7 +[ 0 1 0 ] 8 0 8 +[ 0 1 0 ] 9 0 9 +[ 0 1 1 ] 10 0 10 +[ 0 1 1 ] 11 0 11 +[ 0 1 1 ] 12 0 12 +[ 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 +[ 1 0 0 ] 19 0 19 +[ 1 0 0 ] 20 0 20 +[ 1 0 0 ] 21 0 21 +[ 1 0 1 ] 22 0 22 +[ 1 0 1 ] 23 0 23 +[ 1 0 1 ] 24 0 24 +[ 1 1 0 ] 25 0 25 +[ 1 1 0 ] 26 0 26 +[ 1 1 0 ] 27 0 27 +[ 1 1 1 ] 28 0 28 +[ 1 1 1 ] 29 0 29 +[ 1 1 1 ] 30 0 30 +[ 1 2 0 ] 31 0 31 +[ 1 2 0 ] 32 0 32 +[ 1 2 0 ] 33 0 33 +[ 1 2 1 ] 34 0 34 +[ 1 2 1 ] 35 0 35 +[ 1 2 1 ] 36 0 36 +[ 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 1 0 ] 43 0 43 +[ 2 1 0 ] 44 0 44 +[ 2 1 0 ] 45 0 45 +[ 2 1 1 ] 46 0 46 +[ 2 1 1 ] 47 0 47 +[ 2 1 1 ] 48 0 48 +[ 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 +[ 3 0 0 ] 55 0 55 +[ 3 0 0 ] 56 0 56 +[ 3 0 0 ] 57 0 57 +[ 3 0 1 ] 58 0 58 +[ 3 0 1 ] 59 0 59 +[ 3 0 1 ] 60 0 60 +[ 3 1 0 ] 61 0 61 +[ 3 1 0 ] 62 0 62 +[ 3 1 0 ] 63 0 63 +[ 3 1 1 ] 64 0 64 +[ 3 1 1 ] 65 0 65 +[ 3 1 1 ] 66 0 66 +[ 3 2 0 ] 67 0 67 +[ 3 2 0 ] 68 0 68 +[ 3 2 0 ] 69 0 69 +[ 3 2 1 ] 70 0 70 +[ 3 2 1 ] 71 0 71 +[ 3 2 1 ] 72 0 72 +72 differences found +dataset: and +size: [2] [2] +position bitfield bitfield difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +dataset: and +size: [3x2] [3x2] +position bitfield2D bitfield2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +dataset: and +size: [4x3x2] [4x3x2] +position bitfield3D bitfield3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +dataset: and +size: [2] [2] +position compound compound difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 1 ] 3 0 3 +[ 1 ] 4 0 4 +4 differences found +dataset: and +size: [3x2] [3x2] +position compound2D compound2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 1 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 1 0 ] 5 0 5 +[ 1 0 ] 6 0 6 +[ 1 1 ] 7 0 7 +[ 1 1 ] 8 0 8 +[ 2 0 ] 9 0 9 +[ 2 0 ] 10 0 10 +[ 2 1 ] 11 0 11 +[ 2 1 ] 12 0 12 +12 differences found +dataset: and +size: [4x3x2] [4x3x2] +position compound3D compound3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 0 ] 2 0 2 +[ 0 0 1 ] 3 0 3 +[ 0 0 1 ] 4 0 4 +[ 0 1 0 ] 5 0 5 +[ 0 1 0 ] 6 0 6 +[ 0 1 1 ] 7 0 7 +[ 0 1 1 ] 8 0 8 +[ 0 2 0 ] 9 0 9 +[ 0 2 0 ] 10 0 10 +[ 0 2 1 ] 11 0 11 +[ 0 2 1 ] 12 0 12 +[ 1 0 0 ] 13 0 13 +[ 1 0 0 ] 14 0 14 +[ 1 0 1 ] 15 0 15 +[ 1 0 1 ] 16 0 16 +[ 1 1 0 ] 17 0 17 +[ 1 1 0 ] 18 0 18 +[ 1 1 1 ] 19 0 19 +[ 1 1 1 ] 20 0 20 +[ 1 2 0 ] 21 0 21 +[ 1 2 0 ] 22 0 22 +[ 1 2 1 ] 23 0 23 +[ 1 2 1 ] 24 0 24 +[ 2 0 0 ] 25 0 25 +[ 2 0 0 ] 26 0 26 +[ 2 0 1 ] 27 0 27 +[ 2 0 1 ] 28 0 28 +[ 2 1 0 ] 29 0 29 +[ 2 1 0 ] 30 0 30 +[ 2 1 1 ] 31 0 31 +[ 2 1 1 ] 32 0 32 +[ 2 2 0 ] 33 0 33 +[ 2 2 0 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 2 2 1 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 1 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 1 0 ] 41 0 41 +[ 3 1 0 ] 42 0 42 +[ 3 1 1 ] 43 0 43 +[ 3 1 1 ] 44 0 44 +[ 3 2 0 ] 45 0 45 +[ 3 2 0 ] 46 0 46 +[ 3 2 1 ] 47 0 47 +[ 3 2 1 ] 48 0 48 +48 differences found +dataset: and +size: [2] [2] +position enum enum difference +------------------------------------------------------------ +[ 0 ] RED GREEN +1 differences found +dataset: and + or are empty datasets +0 differences found +dataset: and + or are empty datasets +0 differences found +dataset: and +size: [2] [2] +position float float difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +dataset: and +size: [3x2] [3x2] +position float2D float2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +dataset: and +size: [4x3x2] [4x3x2] +position float3D float3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +dataset: and +size: [2] [2] +position integer integer difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +dataset: and +size: [3x2] [3x2] +position integer2D integer2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +dataset: and +size: [4x3x2] [4x3x2] +position integer3D integer3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +dataset: and +size: [2] [2] +position opaque opaque difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +dataset: and +size: [3x2] [3x2] +position opaque2D opaque2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +dataset: and +size: [4x3x2] [4x3x2] +position opaque3D opaque3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +dataset: and +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +4 differences found +dataset: and +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +12 differences found +dataset: and +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +size: [2] [2] +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +48 differences found +dataset: and +size: [2] [2] +position string string difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +dataset: and +size: [3x2] [3x2] +position string2D string2D difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +dataset: and +size: [4x3x2] [4x3x2] +position string3D string3D difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +dataset: and +size: [2] [2] +position vlen vlen difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +[ 1 ] 3 0 3 +3 differences found +dataset: and +size: [3x2] [3x2] +position vlen2D vlen2D difference +------------------------------------------------------------ +[ 0 1 ] 1 0 1 +[ 1 0 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 1 1 ] 5 0 5 +[ 2 0 ] 6 0 6 +[ 2 0 ] 7 0 7 +[ 2 0 ] 8 0 8 +[ 2 1 ] 9 0 9 +[ 2 1 ] 10 0 10 +[ 2 1 ] 11 0 11 +11 differences found +dataset: and +size: [4x3x2] [4x3x2] +position vlen3D vlen3D difference +------------------------------------------------------------ +[ 0 0 1 ] 1 0 1 +[ 0 1 0 ] 2 0 2 +[ 0 1 1 ] 3 0 3 +[ 0 2 0 ] 4 0 4 +[ 0 2 1 ] 5 0 5 +[ 1 0 0 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 0 1 ] 9 0 9 +[ 1 1 0 ] 10 0 10 +[ 1 1 0 ] 11 0 11 +[ 1 1 1 ] 12 0 12 +[ 1 1 1 ] 13 0 13 +[ 1 2 0 ] 14 0 14 +[ 1 2 0 ] 15 0 15 +[ 1 2 1 ] 16 0 16 +[ 1 2 1 ] 17 0 17 +[ 2 0 0 ] 18 0 18 +[ 2 0 0 ] 19 0 19 +[ 2 0 0 ] 20 0 20 +[ 2 0 1 ] 21 0 21 +[ 2 0 1 ] 22 0 22 +[ 2 0 1 ] 23 0 23 +[ 2 1 0 ] 24 0 24 +[ 2 1 0 ] 25 0 25 +[ 2 1 0 ] 26 0 26 +[ 2 1 1 ] 27 0 27 +[ 2 1 1 ] 28 0 28 +[ 2 1 1 ] 29 0 29 +[ 2 2 0 ] 30 0 30 +[ 2 2 0 ] 31 0 31 +[ 2 2 0 ] 32 0 32 +[ 2 2 1 ] 33 0 33 +[ 2 2 1 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 3 0 0 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 0 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 0 1 ] 41 0 41 +[ 3 0 1 ] 42 0 42 +[ 3 0 1 ] 43 0 43 +[ 3 1 0 ] 44 0 44 +[ 3 1 0 ] 45 0 45 +[ 3 1 0 ] 46 0 46 +[ 3 1 0 ] 47 0 47 +[ 3 1 1 ] 48 0 48 +[ 3 1 1 ] 49 0 49 +[ 3 1 1 ] 50 0 50 +[ 3 1 1 ] 51 0 51 +[ 3 2 0 ] 52 0 52 +[ 3 2 0 ] 53 0 53 +[ 3 2 0 ] 54 0 54 +[ 3 2 0 ] 55 0 55 +[ 3 2 1 ] 56 0 56 +[ 3 2 1 ] 57 0 57 +[ 3 2 1 ] 58 0 58 +[ 3 2 1 ] 59 0 59 +59 differences found +dataset: and +Referenced dataset 10272 10272 +------------------------------------------------------------ +Region blocks +block #0 (2,2)-(7,7) (0,0)-(2,2) +Region points +point #1 (2,2) (3,3) +point #3 (1,6) (2,5) +point #4 (2,8) (1,7) +4 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt new file mode 100644 index 0000000..7007d88 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_90.txt @@ -0,0 +1,22 @@ + +file1 file2 +--------------------------------------- + x x / + x x /g1 + x x /g1/dset1 + x x /g1/dset2 + x x /g1/dset4 + x x /g2 + +group : and +0 differences found +group : and +0 differences found +dataset: and +0 differences found +dataset: and +0 differences found +dataset: and +0 differences found +group : and +0 differences found diff --git a/tools/h5diff/testfiles/h5diff_attr1.h5 b/tools/h5diff/testfiles/h5diff_attr1.h5 new file mode 100644 index 0000000..c44066b Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_attr1.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_attr2.h5 b/tools/h5diff/testfiles/h5diff_attr2.h5 new file mode 100644 index 0000000..5de3303 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_attr2.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_basic1.h5 b/tools/h5diff/testfiles/h5diff_basic1.h5 new file mode 100644 index 0000000..389e2b3 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_basic1.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_basic2.h5 b/tools/h5diff/testfiles/h5diff_basic2.h5 new file mode 100644 index 0000000..ad45cc0 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_basic2.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_dset1.h5 b/tools/h5diff/testfiles/h5diff_dset1.h5 new file mode 100644 index 0000000..ab6b96f Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_dset1.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_dset2.h5 b/tools/h5diff/testfiles/h5diff_dset2.h5 new file mode 100644 index 0000000..3db0c8e Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_dset2.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_dtypes.h5 b/tools/h5diff/testfiles/h5diff_dtypes.h5 new file mode 100644 index 0000000..7c3cd9d Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_dtypes.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_empty.h5 b/tools/h5diff/testfiles/h5diff_empty.h5 new file mode 100644 index 0000000..3f0d1df Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_empty.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_hyper1.h5 b/tools/h5diff/testfiles/h5diff_hyper1.h5 new file mode 100644 index 0000000..ceeff80 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_hyper1.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_hyper2.h5 b/tools/h5diff/testfiles/h5diff_hyper2.h5 new file mode 100644 index 0000000..05a2eb1 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_hyper2.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_types.h5 b/tools/h5diff/testfiles/h5diff_types.h5 new file mode 100644 index 0000000..c835069 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_types.h5 differ diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index 6685a66..a2a9ecc 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -29,16 +29,29 @@ ## test file names ############################################################################### -FILE1=h5diff_basic1.h5 -FILE2=h5diff_basic2.h5 -FILE3=h5diff_types.h5 -FILE4=h5diff_dtypes.h5 -FILE5=h5diff_attr1.h5 -FILE6=h5diff_attr2.h5 -FILE7=h5diff_dset1.h5 -FILE8=h5diff_dset2.h5 -FILE9=h5diff_hyper1.h5 -FILE10=h5diff_hyper2.h5 +INDIR=$srcdir/testfiles + +SRCFILE1=h5diff_basic1.h5 +SRCFILE2=h5diff_basic2.h5 +SRCFILE3=h5diff_types.h5 +SRCFILE4=h5diff_dtypes.h5 +SRCFILE5=h5diff_attr1.h5 +SRCFILE6=h5diff_attr2.h5 +SRCFILE7=h5diff_dset1.h5 +SRCFILE8=h5diff_dset2.h5 +SRCFILE9=h5diff_hyper1.h5 +SRCFILE10=h5diff_hyper2.h5 + +FILE1="$INDIR/$SRCFILE1" +FILE2="$INDIR/$SRCFILE2" +FILE3="$INDIR/$SRCFILE3" +FILE4="$INDIR/$SRCFILE4" +FILE5="$INDIR/$SRCFILE5" +FILE6="$INDIR/$SRCFILE6" +FILE7="$INDIR/$SRCFILE7" +FILE8="$INDIR/$SRCFILE8" +FILE9="$INDIR/$SRCFILE9" +FILE10="$INDIR/$SRCFILE10" H5DIFF=h5diff # The tool name @@ -56,7 +69,7 @@ if test -z "$srcdir"; then srcdir=. fi -test -d ../testfiles || mkdir ../testfiles +test -d ./testfiles || mkdir ./testfiles # Parse option # -p run ph5diff tests @@ -171,9 +184,9 @@ STDERR_FILTER() { # that throws the shell script off. # TOOLTEST() { - expect="$srcdir/../testfiles/$1" - actual="../testfiles/`basename $1 .txt`.out" - actual_err="../testfiles/`basename $1 .txt`.err" + expect="$srcdir/testfiles/$1" + actual="./testfiles/`basename $1 .txt`.out" + actual_err="./testfiles/`basename $1 .txt`.err" actual_sav=${actual}-sav actual_err_sav=${actual_err}-sav shift @@ -186,12 +199,12 @@ TOOLTEST() { # Run test. # Tflops interprets "$@" as "" when no parameter is given (e.g., the # case of missing file name). Changed it to use $@ till Tflops fixes it. - TESTING $H5DIFF $@ + #TESTING $H5DIFF $@ ( - echo "#############################" - echo "Expected output for '$H5DIFF $@'" - echo "#############################" - cd $srcdir/../testfiles + #echo "#############################" + #echo "Expected output for '$H5DIFF $@'" + #echo "#############################" + #cd $srcdir/testfiles if [ "`uname -s`" = "TFLOPS O/S" ]; then eval $RUNCMD $H5DIFF_BIN $@ else @@ -258,9 +271,11 @@ SKIP() { ############################################################################## -############################################################################## -### T H E T E S T S ### -############################################################################## +# The tests +# To avoid the printing of the complete full path of the test file, that hides +# all the other parameters for long paths, the printing of the command line +# is done first in +# TESTING with the name only of the test file $TOOL, not its full path $TESTFILE ############################################################################## # ############################################################################ @@ -269,36 +284,47 @@ SKIP() { # 1.0 +TESTING $H5DIFF -h TOOLTEST h5diff_10.txt -h # 1.1 normal mode +TESTING $H5DIFF $SRCFILE1 $SRCFILE2 TOOLTEST h5diff_11.txt $FILE1 $FILE2 # 1.2 normal mode with objects +TESTING $H5DIFF $SRCFILE1 $SRCFILE2 g1/dset1 g1/dset2 TOOLTEST h5diff_12.txt $FILE1 $FILE2 g1/dset1 g1/dset2 # 1.3 report mode +TESTING $H5DIFF -r $SRCFILE1 $SRCFILE2 TOOLTEST h5diff_13.txt -r $FILE1 $FILE2 # 1.4 report mode with objects +TESTING $H5DIFF -r $SRCFILE1 $SRCFILE2 g1/dset1 g1/dset2 TOOLTEST h5diff_14.txt -r $FILE1 $FILE2 g1/dset1 g1/dset2 # 1.5 with -d +TESTING $H5DIFF --report --delta=5 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_15.txt --report --delta=5 $FILE1 $FILE2 g1/dset3 g1/dset4 # 1.6.1 with -p (int) +TESTING $H5DIFF -v -p 0.02 $SRCFILE1 $SRCFILE1 g1/dset5 g1/dset6 TOOLTEST h5diff_16_1.txt -v -p 0.02 $FILE1 $FILE1 g1/dset5 g1/dset6 # 1.6.2 with -p (unsigned long_long) +TESTING $H5DIFF --verbose --relative=0.02 $SRCFILE1 $SRCFILE1 g1/dset7 g1/dset8 TOOLTEST h5diff_16_2.txt --verbose --relative=0.02 $FILE1 $FILE1 g1/dset7 g1/dset8 # 1.6.3 with -p (double) +TESTING $H5DIFF -v -p 0.02 $SRCFILE1 $SRCFILE1 g1/dset9 g1/dset10 TOOLTEST h5diff_16_3.txt -v -p 0.02 $FILE1 $FILE1 g1/dset9 g1/dset10 # 1.7 verbose mode +TESTING $H5DIFF -v $SRCFILE1 $SRCFILE2 TOOLTEST h5diff_17.txt -v $FILE1 $FILE2 # 1.8 quiet mode +TESTING $H5DIFF -q $SRCFILE1 $SRCFILE2 TOOLTEST h5diff_18.txt -q $FILE1 $FILE2 # ############################################################################## @@ -306,12 +332,15 @@ TOOLTEST h5diff_18.txt -q $FILE1 $FILE2 # ############################################################################## # 2.0 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 dset g1 TOOLTEST h5diff_20.txt -v $FILE3 $FILE3 dset g1 # 2.1 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 dset l1 TOOLTEST h5diff_21.txt -v $FILE3 $FILE3 dset l1 # 2.2 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 dset t1 TOOLTEST h5diff_22.txt -v $FILE3 $FILE3 dset t1 # ############################################################################## @@ -319,21 +348,27 @@ TOOLTEST h5diff_22.txt -v $FILE3 $FILE3 dset t1 # ############################################################################## # 2.3 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 g1 g1 TOOLTEST h5diff_23.txt -v $FILE3 $FILE3 g1 g1 # 2.4 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 t1 t1 TOOLTEST h5diff_24.txt -v $FILE3 $FILE3 t1 t1 # 2.5 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 l1 l1 TOOLTEST h5diff_25.txt -v $FILE3 $FILE3 l1 l1 # 2.6 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 g1 g2 TOOLTEST h5diff_26.txt -v $FILE3 $FILE3 g1 g2 # 2.7 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 t1 t2 TOOLTEST h5diff_27.txt -v $FILE3 $FILE3 t1 t2 # 2.8 +TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 l1 l2 TOOLTEST h5diff_28.txt -v $FILE3 $FILE3 l1 l2 @@ -343,30 +378,39 @@ TOOLTEST h5diff_28.txt -v $FILE3 $FILE3 l1 l2 # ############################################################################## # 5.0 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset0a dset0b TOOLTEST h5diff_50.txt -v $FILE4 $FILE4 dset0a dset0b # 5.1 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset1a dset1b TOOLTEST h5diff_51.txt -v $FILE4 $FILE4 dset1a dset1b # 5.2 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset2a dset2b TOOLTEST h5diff_52.txt -v $FILE4 $FILE4 dset2a dset2b # 5.3 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset3a dset4b TOOLTEST h5diff_53.txt -v $FILE4 $FILE4 dset3a dset4b # 5.4 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset4a dset4b TOOLTEST h5diff_54.txt -v $FILE4 $FILE4 dset4a dset4b # 5.5 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset5a dset5b TOOLTEST h5diff_55.txt -v $FILE4 $FILE4 dset5a dset5b # 5.6 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset6a dset6b TOOLTEST h5diff_56.txt -v $FILE4 $FILE4 dset6a dset6b # 5.7 +TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset7a dset7b TOOLTEST h5diff_57.txt -v $FILE4 $FILE4 dset7a dset7b # 5.8 (region reference) +TESTING $H5DIFF -v $SRCFILE7 $SRCFILE8 refreg TOOLTEST h5diff_58.txt -v $FILE7 $FILE8 refreg # ############################################################################## @@ -375,40 +419,45 @@ TOOLTEST h5diff_58.txt -v $FILE7 $FILE8 refreg # 6.0: Check if the command line number of arguments is less than 3 +TESTING $H5DIFF $SRCFILE1 TOOLTEST h5diff_600.txt $FILE1 -# 6.1: Check for invalid options -#TOOLTEST h5diff_601.txt -x $FILE1 $FILE2 # ############################################################################## # # -d # ############################################################################## -# 6.2: no value -TOOLTEST h5diff_602.txt -d $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.3: negative value +TESTING $H5DIFF -d -4 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_603.txt -d -4 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.4: zero +TESTING $H5DIFF -d 0 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_604.txt -d 0 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.5: non number +TESTING $H5DIFF -d u $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_605.txt -d u $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.6: hexadecimal +TESTING $H5DIFF -d 0x1 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_606.txt -d 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.7: string +TESTING $H5DIFF -d "1" $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_607.txt -d "1" $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.8: repeated option +TESTING $H5DIFF -d 1 -d 2 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_608.txt -d 1 -d 2 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.9: number larger than biggest difference +TESTING $H5DIFF -d 200 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_609.txt -d 200 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.10: number smaller than smallest difference +TESTING $H5DIFF -d 1 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_610.txt -d 1 $FILE1 $FILE2 g1/dset3 g1/dset4 @@ -417,31 +466,36 @@ TOOLTEST h5diff_610.txt -d 1 $FILE1 $FILE2 g1/dset3 g1/dset4 # ############################################################################## -# 6.11: no value -TOOLTEST h5diff_611.txt -r -p $FILE1 $FILE2 g1/dset3 g1/dset4 - # 6.12: negative value +TESTING $H5DIFF -p -4 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_612.txt -p -4 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.13: zero +TESTING $H5DIFF -p 0 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_613.txt -p 0 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.14: non number +TESTING $H5DIFF -p u $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_614.txt -p u $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.15: hexadecimal +TESTING $H5DIFF -p 0x1 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_615.txt -p 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.16: string +TESTING $H5DIFF -p "0.21" $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_616.txt -p "0.21" $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.17: repeated option +TESTING $H5DIFF -p 0.21 -p 0.22 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_617.txt -p 0.21 -p 0.22 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.18: number larger than biggest difference +TESTING $H5DIFF -p 2 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_618.txt -p 2 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.19: number smaller than smallest difference +TESTING $H5DIFF -p 0.005 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_619.txt -p 0.005 $FILE1 $FILE2 g1/dset3 g1/dset4 @@ -450,55 +504,67 @@ TOOLTEST h5diff_619.txt -p 0.005 $FILE1 $FILE2 g1/dset3 g1/dset4 # # -n # ############################################################################## - -# 6.20: no value -TOOLTEST h5diff_620.txt -n $FILE1 $FILE2 g1/dset3 g1/dset4 - # 6.21: negative value +TESTING $H5DIFF -n -4 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_621.txt -n -4 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.22: zero +TESTING $H5DIFF -n 0 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_622.txt -n 0 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.23: non number +TESTING $H5DIFF -n u $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_623.txt -n u $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.24: hexadecimal +TESTING $H5DIFF -n 0x1 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_624.txt -n 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.25: string +TESTING $H5DIFF -n "2" $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_625.txt -n "2" $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.26: repeated option +TESTING $H5DIFF -n 2 -n 3 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_626.txt -n 2 -n 3 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.27: number larger than biggest difference +TESTING $H5DIFF --count=200 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_627.txt --count=200 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.28: number smaller than smallest difference +TESTING $H5DIFF -n 1 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4 TOOLTEST h5diff_628.txt -n 1 $FILE1 $FILE2 g1/dset3 g1/dset4 # 6.29 non valid files +TESTING $H5DIFF file1.h6 file2.h6 TOOLTEST h5diff_629.txt file1.h6 file2.h6 # ############################################################################## # 7. attributes # ############################################################################## +TESTING $H5DIFF -v $SRCFILE5 $SRCFILE6 TOOLTEST h5diff_70.txt -v $FILE5 $FILE6 # ############################################################################## # 8. all dataset datatypes # ############################################################################## +TESTING $H5DIFF -v $SRCFILE7 $SRCFILE8 TOOLTEST h5diff_80.txt -v $FILE7 $FILE8 # 9. compare a file with itself +TESTING $H5DIFF -v $SRCFILE2 $SRCFILE2 TOOLTEST h5diff_90.txt -v $FILE2 $FILE2 # 10. read by hyperslab, print indexes +TESTING $H5DIFF -v $SRCFILE9 $SRCFILE10 TOOLTEST h5diff_100.txt -v $FILE9 $FILE10 # 11. floating point comparison -TOOLTEST h5diff_101.txt -v $FILE1 $FILE1 g1/d1 g1/d2 +TESTING $H5DIFF -v $SRCFILE1 $SRCFILE1 g1/d1 g1/d2 +TOOLTEST h5diff_101.txt -v $FILE1 $FILE1 g1/d1 g1/d2 + +TESTING $H5DIFF -v $SRCFILE1 $SRCFILE1 g1/fp1 g1/fp2 TOOLTEST h5diff_102.txt -v $FILE1 $FILE1 g1/fp1 g1/fp2 # ############################################################################## diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in index 77be575..334b384 100755 --- a/tools/h5repack/h5repack.sh.in +++ b/tools/h5repack/h5repack.sh.in @@ -33,10 +33,10 @@ H5REPACK_BIN=`pwd`/$H5REPACK # The path of the tool binary H5DIFF=../h5diff/h5diff # The h5diff tool name H5DIFF_BIN=`pwd`/$H5DIFF # The path of the h5diff tool binary -H5DETECTSZIP=testh5repack_detect_szip # The tool name -H5DETECTSZIP_BIN=`pwd`/$H5DETECTSZIP # The path of the tool binary +H5DETECTSZIP=testh5repack_detect_szip +H5DETECTSZIP_BIN=`pwd`/$H5DETECTSZIP -INFO_FILE=../testfiles/info.h5repack +INFO_FILE=testfiles/h5repack.info FILE0=h5repack_fill.h5 FILE1=h5repack_objs.h5 @@ -62,7 +62,7 @@ if test -z "$srcdir"; then srcdir=. fi -test -d ../testfiles || mkdir ../testfiles + # Print a line-line message left justified in a field of 70 characters # beginning with the word "Testing". @@ -116,7 +116,7 @@ TOOLTEST() # case of missing file name). Changed it to use $@ till Tflops fixes it. TESTING $H5REPACK $@ - infile=$srcdir/../testfiles/$1 + infile=$srcdir/testfiles/$1 path=`pwd` outfile=$path/out.$1 shift @@ -144,7 +144,7 @@ TOOLTEST0() # case of missing file name). Changed it to use $@ till Tflops fixes it. TESTING $H5REPACK $@ - infile=$srcdir/../testfiles/$1 + infile=$srcdir/testfiles/$1 path=`pwd` outfile=$path/out.$1 shift diff --git a/tools/h5repack/testfiles/h5repack.info b/tools/h5repack/testfiles/h5repack.info new file mode 100644 index 0000000..216948d --- /dev/null +++ b/tools/h5repack/testfiles/h5repack.info @@ -0,0 +1 @@ +-l dset1:CHUNK=20x20 -f dset1,dset2:GZIP=1 diff --git a/tools/h5repack/testfiles/h5repack_attr.h5 b/tools/h5repack/testfiles/h5repack_attr.h5 new file mode 100644 index 0000000..70ad02d Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_attr.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_deflate.h5 b/tools/h5repack/testfiles/h5repack_deflate.h5 new file mode 100644 index 0000000..3a4b86d Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_deflate.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_early.h5 b/tools/h5repack/testfiles/h5repack_early.h5 new file mode 100644 index 0000000..9b92890 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_early.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_ext.bin b/tools/h5repack/testfiles/h5repack_ext.bin new file mode 100644 index 0000000..f858094 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_ext.bin differ diff --git a/tools/h5repack/testfiles/h5repack_ext.h5 b/tools/h5repack/testfiles/h5repack_ext.h5 new file mode 100644 index 0000000..1fe88c9 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_ext.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_fill.h5 b/tools/h5repack/testfiles/h5repack_fill.h5 new file mode 100644 index 0000000..21516cb Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_fill.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_filters.h5 b/tools/h5repack/testfiles/h5repack_filters.h5 new file mode 100644 index 0000000..042b8db Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_filters.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_fletcher.h5 b/tools/h5repack/testfiles/h5repack_fletcher.h5 new file mode 100644 index 0000000..2f137b0 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_fletcher.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_hlink.h5 b/tools/h5repack/testfiles/h5repack_hlink.h5 new file mode 100644 index 0000000..3d22728 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_hlink.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_layout.h5 b/tools/h5repack/testfiles/h5repack_layout.h5 new file mode 100644 index 0000000..5772a31 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_layout.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_nbit.h5 b/tools/h5repack/testfiles/h5repack_nbit.h5 new file mode 100644 index 0000000..3ada112 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_nbit.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_objs.h5 b/tools/h5repack/testfiles/h5repack_objs.h5 new file mode 100644 index 0000000..199adc5 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_objs.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_shuffle.h5 b/tools/h5repack/testfiles/h5repack_shuffle.h5 new file mode 100644 index 0000000..d13cca7 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_shuffle.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_soffset.h5 b/tools/h5repack/testfiles/h5repack_soffset.h5 new file mode 100644 index 0000000..89ee99a Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_soffset.h5 differ diff --git a/tools/h5repack/testfiles/h5repack_szip.h5 b/tools/h5repack/testfiles/h5repack_szip.h5 new file mode 100644 index 0000000..b16d169 Binary files /dev/null and b/tools/h5repack/testfiles/h5repack_szip.h5 differ diff --git a/tools/testfiles/h5copytst.h5 b/tools/testfiles/h5copytst.h5 deleted file mode 100644 index f407f82..0000000 Binary files a/tools/testfiles/h5copytst.h5 and /dev/null differ diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls deleted file mode 100644 index 9cad76f..0000000 --- a/tools/testfiles/h5copytst.out.ls +++ /dev/null @@ -1,432 +0,0 @@ -############################# -Expected output for 'h5ls ../testfiles/h5copytst.out.h5' -############################# -Opened "../testfiles/h5copytst.out.h5" with sec2 driver. -/ Group - Location: 1:96 - Links: 1 -/A Group - Location: 1:89936 - Links: 1 -/A/B1 Group - Location: 1:90640 - Links: 1 -/A/B1/simple Dataset {6/6} - Location: 1:89808 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/A/B2 Group - Location: 1:94176 - Links: 1 -/A/B2/simple2 Dataset {6/6} - Location: 1:94048 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/C Group - Location: 1:97384 - Links: 1 -/C/D Group - Location: 1:98088 - Links: 1 -/C/D/simple Dataset {6/6} - Location: 1:97256 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/E Group - Location: 1:112000 - Links: 1 -/E/F Group - Location: 1:112704 - Links: 1 -/E/F/grp_dsets Group - Location: 1:100200 - Links: 1 -/E/F/grp_dsets/chunk Dataset {6/6} - Location: 1:104384 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Type: 32-bit little-endian integer -/E/F/grp_dsets/compact Dataset {6/6} - Location: 1:104840 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/E/F/grp_dsets/compound Dataset {2/2} - Location: 1:104976 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/E/F/grp_dsets/compressed Dataset {6/6} - Location: 1:107288 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Filter-0: deflate-1 OPT {1} - Type: 32-bit little-endian integer -/E/F/grp_dsets/named_vl Dataset {2/2} - Location: 1:111600 - Links: 1 - Storage:
- Type: shared-1:107456 variable length of - 32-bit little-endian integer -/E/F/grp_dsets/nested_vl Dataset {2/2} - Location: 1:111728 - Links: 1 - Storage:
- Type: variable length of - variable length of - 32-bit little-endian integer -/E/F/grp_dsets/simple Dataset {6/6} - Location: 1:111872 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/E/F/grp_dsets/vl Type - Location: 1:107456 - Links: 2 - Type: shared-1:107456 variable length of - 32-bit little-endian integer -/G Group - Location: 1:127648 - Links: 1 -/G/H Group - Location: 1:128352 - Links: 1 -/G/H/grp_nested Group - Location: 1:114728 - Links: 1 -/G/H/grp_nested/grp_dsets Group - Location: 1:115520 - Links: 1 -/G/H/grp_nested/grp_dsets/chunk Dataset {6/6} - Location: 1:119704 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Type: 32-bit little-endian integer -/G/H/grp_nested/grp_dsets/compact Dataset {6/6} - Location: 1:120160 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/G/H/grp_nested/grp_dsets/compound Dataset {2/2} - Location: 1:120296 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/G/H/grp_nested/grp_dsets/compressed Dataset {6/6} - Location: 1:122608 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Filter-0: deflate-1 OPT {1} - Type: 32-bit little-endian integer -/G/H/grp_nested/grp_dsets/named_vl Dataset {2/2} - Location: 1:126920 - Links: 1 - Storage:
- Type: shared-1:122776 variable length of - 32-bit little-endian integer -/G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2} - Location: 1:127048 - Links: 1 - Storage:
- Type: variable length of - variable length of - 32-bit little-endian integer -/G/H/grp_nested/grp_dsets/simple Dataset {6/6} - Location: 1:127192 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/G/H/grp_nested/grp_dsets/vl Type - Location: 1:122776 - Links: 2 - Type: shared-1:122776 variable length of - 32-bit little-endian integer -/chunk Dataset {6/6} - Location: 1:6216 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Type: 32-bit little-endian integer -/compact Dataset {6/6} - Location: 1:6344 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/compound Dataset {2/2} - Location: 1:8528 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/compressed Dataset {6/6} - Location: 1:12888 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Filter-0: deflate-1 OPT {1} - Type: 32-bit little-endian integer -/grp_dsets Group - Location: 1:33760 - Links: 1 -/grp_dsets/chunk Dataset {6/6} - Location: 1:37944 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Type: 32-bit little-endian integer -/grp_dsets/compact Dataset {6/6} - Location: 1:38400 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_dsets/compound Dataset {2/2} - Location: 1:38536 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/grp_dsets/compressed Dataset {6/6} - Location: 1:40848 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Filter-0: deflate-1 OPT {1} - Type: 32-bit little-endian integer -/grp_dsets/named_vl Dataset {2/2} - Location: 1:45160 - Links: 1 - Storage:
- Type: shared-1:41016 variable length of - 32-bit little-endian integer -/grp_dsets/nested_vl Dataset {2/2} - Location: 1:45288 - Links: 1 - Storage:
- Type: variable length of - variable length of - 32-bit little-endian integer -/grp_dsets/simple Dataset {6/6} - Location: 1:45432 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_dsets/simple_group Dataset {6/6} - Location: 1:61544 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_dsets/vl Type - Location: 1:41016 - Links: 2 - Type: shared-1:41016 variable length of - 32-bit little-endian integer -/grp_empty Group - Location: 1:32968 - Links: 1 -/grp_nested Group - Location: 1:46224 - Links: 1 -/grp_nested/grp_dsets Group - Location: 1:47016 - Links: 1 -/grp_nested/grp_dsets/chunk Dataset {6/6} - Location: 1:51200 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Type: 32-bit little-endian integer -/grp_nested/grp_dsets/compact Dataset {6/6} - Location: 1:51656 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_nested/grp_dsets/compound Dataset {2/2} - Location: 1:51792 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/grp_nested/grp_dsets/compressed Dataset {6/6} - Location: 1:54104 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Filter-0: deflate-1 OPT {1} - Type: 32-bit little-endian integer -/grp_nested/grp_dsets/named_vl Dataset {2/2} - Location: 1:58416 - Links: 1 - Storage:
- Type: shared-1:54272 variable length of - 32-bit little-endian integer -/grp_nested/grp_dsets/nested_vl Dataset {2/2} - Location: 1:58544 - Links: 1 - Storage:
- Type: variable length of - variable length of - 32-bit little-endian integer -/grp_nested/grp_dsets/simple Dataset {6/6} - Location: 1:58688 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_nested/grp_dsets/vl Type - Location: 1:54272 - Links: 2 - Type: shared-1:54272 variable length of - 32-bit little-endian integer -/grp_rename Group - Location: 1:62752 - Links: 1 -/grp_rename/chunk Dataset {6/6} - Location: 1:66936 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Type: 32-bit little-endian integer -/grp_rename/compact Dataset {6/6} - Location: 1:67392 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_rename/compound Dataset {2/2} - Location: 1:67528 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/grp_rename/compressed Dataset {6/6} - Location: 1:69840 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Filter-0: deflate-1 OPT {1} - Type: 32-bit little-endian integer -/grp_rename/grp_dsets Group - Location: 1:75632 - Links: 1 -/grp_rename/grp_dsets/chunk Dataset {6/6} - Location: 1:79816 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Type: 32-bit little-endian integer -/grp_rename/grp_dsets/compact Dataset {6/6} - Location: 1:80272 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_rename/grp_dsets/compound Dataset {2/2} - Location: 1:80408 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/grp_rename/grp_dsets/compressed Dataset {6/6} - Location: 1:82720 - Links: 1 - Chunks: {2} 8 bytes - Storage:
- Filter-0: deflate-1 OPT {1} - Type: 32-bit little-endian integer -/grp_rename/grp_dsets/named_vl Dataset {2/2} - Location: 1:87032 - Links: 1 - Storage:
- Type: shared-1:82888 variable length of - 32-bit little-endian integer -/grp_rename/grp_dsets/nested_vl Dataset {2/2} - Location: 1:87160 - Links: 1 - Storage:
- Type: variable length of - variable length of - 32-bit little-endian integer -/grp_rename/grp_dsets/simple Dataset {6/6} - Location: 1:87304 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_rename/grp_dsets/vl Type - Location: 1:82888 - Links: 2 - Type: shared-1:82888 variable length of - 32-bit little-endian integer -/grp_rename/named_vl Dataset {2/2} - Location: 1:74152 - Links: 1 - Storage:
- Type: shared-1:70008 variable length of - 32-bit little-endian integer -/grp_rename/nested_vl Dataset {2/2} - Location: 1:74280 - Links: 1 - Storage:
- Type: variable length of - variable length of - 32-bit little-endian integer -/grp_rename/simple Dataset {6/6} - Location: 1:74424 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/grp_rename/vl Type - Location: 1:70008 - Links: 2 - Type: shared-1:70008 variable length of - 32-bit little-endian integer -/named_vl Dataset {2/2} - Location: 1:13104 - Links: 1 - Storage:
- Type: shared-1:13056 variable length of - 32-bit little-endian integer -/nested_vl Dataset {2/2} - Location: 1:27392 - Links: 1 - Storage:
- Type: variable length of - variable length of - 32-bit little-endian integer -/rename Dataset {2/2} - Location: 1:31760 - Links: 1 - Storage:
- Type: struct { - "str1" +0 20-byte null-terminated ASCII string - "str2" +20 20-byte null-terminated ASCII string - } 40 bytes -/simple Dataset {6/6} - Location: 1:800 - Links: 1 - Storage:
- Type: 32-bit little-endian integer -/simple_top Dataset {6/6} - Location: 1:29584 - Links: 1 - Storage:
- Type: 32-bit little-endian integer diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt deleted file mode 100644 index 6a6dbae..0000000 --- a/tools/testfiles/h5diff_10.txt +++ /dev/null @@ -1,58 +0,0 @@ -############################# -Expected output for 'h5diff -h' -############################# -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_100.txt b/tools/testfiles/h5diff_100.txt deleted file mode 100644 index 82b42ce..0000000 --- a/tools/testfiles/h5diff_100.txt +++ /dev/null @@ -1,1040 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_hyper1.h5 h5diff_hyper2.h5' -############################# - -file1 file2 ---------------------------------------- - x x / - x x /big - -group : and -0 differences found -dataset: and -size: [1073741824] [1073741824] -position big big difference ------------------------------------------------------------- -[ 268435456 ] 31 0 31 -[ 268435457 ] 31 0 31 -[ 268435458 ] 31 0 31 -[ 268435459 ] 31 0 31 -[ 268435460 ] 31 0 31 -[ 268435461 ] 31 0 31 -[ 268435462 ] 31 0 31 -[ 268435463 ] 31 0 31 -[ 268435464 ] 31 0 31 -[ 268435465 ] 31 0 31 -[ 268435466 ] 31 0 31 -[ 268435467 ] 31 0 31 -[ 268435468 ] 31 0 31 -[ 268435469 ] 31 0 31 -[ 268435470 ] 31 0 31 -[ 268435471 ] 31 0 31 -[ 268435472 ] 31 0 31 -[ 268435473 ] 31 0 31 -[ 268435474 ] 31 0 31 -[ 268435475 ] 31 0 31 -[ 268435476 ] 31 0 31 -[ 268435477 ] 31 0 31 -[ 268435478 ] 31 0 31 -[ 268435479 ] 31 0 31 -[ 268435480 ] 31 0 31 -[ 268435481 ] 31 0 31 -[ 268435482 ] 31 0 31 -[ 268435483 ] 31 0 31 -[ 268435484 ] 31 0 31 -[ 268435485 ] 31 0 31 -[ 268435486 ] 31 0 31 -[ 268435487 ] 31 0 31 -[ 268435488 ] 31 0 31 -[ 268435489 ] 31 0 31 -[ 268435490 ] 31 0 31 -[ 268435491 ] 31 0 31 -[ 268435492 ] 31 0 31 -[ 268435493 ] 31 0 31 -[ 268435494 ] 31 0 31 -[ 268435495 ] 31 0 31 -[ 268435496 ] 31 0 31 -[ 268435497 ] 31 0 31 -[ 268435498 ] 31 0 31 -[ 268435499 ] 31 0 31 -[ 268435500 ] 31 0 31 -[ 268435501 ] 31 0 31 -[ 268435502 ] 31 0 31 -[ 268435503 ] 31 0 31 -[ 268435504 ] 31 0 31 -[ 268435505 ] 31 0 31 -[ 268435506 ] 31 0 31 -[ 268435507 ] 31 0 31 -[ 268435508 ] 31 0 31 -[ 268435509 ] 31 0 31 -[ 268435510 ] 31 0 31 -[ 268435511 ] 31 0 31 -[ 268435512 ] 31 0 31 -[ 268435513 ] 31 0 31 -[ 268435514 ] 31 0 31 -[ 268435515 ] 31 0 31 -[ 268435516 ] 31 0 31 -[ 268435517 ] 31 0 31 -[ 268435518 ] 31 0 31 -[ 268435519 ] 31 0 31 -[ 268435520 ] 31 0 31 -[ 268435521 ] 31 0 31 -[ 268435522 ] 31 0 31 -[ 268435523 ] 31 0 31 -[ 268435524 ] 31 0 31 -[ 268435525 ] 31 0 31 -[ 268435526 ] 31 0 31 -[ 268435527 ] 31 0 31 -[ 268435528 ] 31 0 31 -[ 268435529 ] 31 0 31 -[ 268435530 ] 31 0 31 -[ 268435531 ] 31 0 31 -[ 268435532 ] 31 0 31 -[ 268435533 ] 31 0 31 -[ 268435534 ] 31 0 31 -[ 268435535 ] 31 0 31 -[ 268435536 ] 31 0 31 -[ 268435537 ] 31 0 31 -[ 268435538 ] 31 0 31 -[ 268435539 ] 31 0 31 -[ 268435540 ] 31 0 31 -[ 268435541 ] 31 0 31 -[ 268435542 ] 31 0 31 -[ 268435543 ] 31 0 31 -[ 268435544 ] 31 0 31 -[ 268435545 ] 31 0 31 -[ 268435546 ] 31 0 31 -[ 268435547 ] 31 0 31 -[ 268435548 ] 31 0 31 -[ 268435549 ] 31 0 31 -[ 268435550 ] 31 0 31 -[ 268435551 ] 31 0 31 -[ 268435552 ] 31 0 31 -[ 268435553 ] 31 0 31 -[ 268435554 ] 31 0 31 -[ 268435555 ] 31 0 31 -[ 268435556 ] 31 0 31 -[ 268435557 ] 31 0 31 -[ 268435558 ] 31 0 31 -[ 268435559 ] 31 0 31 -[ 268435560 ] 31 0 31 -[ 268435561 ] 31 0 31 -[ 268435562 ] 31 0 31 -[ 268435563 ] 31 0 31 -[ 268435564 ] 31 0 31 -[ 268435565 ] 31 0 31 -[ 268435566 ] 31 0 31 -[ 268435567 ] 31 0 31 -[ 268435568 ] 31 0 31 -[ 268435569 ] 31 0 31 -[ 268435570 ] 31 0 31 -[ 268435571 ] 31 0 31 -[ 268435572 ] 31 0 31 -[ 268435573 ] 31 0 31 -[ 268435574 ] 31 0 31 -[ 268435575 ] 31 0 31 -[ 268435576 ] 31 0 31 -[ 268435577 ] 31 0 31 -[ 268435578 ] 31 0 31 -[ 268435579 ] 31 0 31 -[ 268435580 ] 31 0 31 -[ 268435581 ] 31 0 31 -[ 268435582 ] 31 0 31 -[ 268435583 ] 31 0 31 -[ 268435584 ] 31 0 31 -[ 268435585 ] 31 0 31 -[ 268435586 ] 31 0 31 -[ 268435587 ] 31 0 31 -[ 268435588 ] 31 0 31 -[ 268435589 ] 31 0 31 -[ 268435590 ] 31 0 31 -[ 268435591 ] 31 0 31 -[ 268435592 ] 31 0 31 -[ 268435593 ] 31 0 31 -[ 268435594 ] 31 0 31 -[ 268435595 ] 31 0 31 -[ 268435596 ] 31 0 31 -[ 268435597 ] 31 0 31 -[ 268435598 ] 31 0 31 -[ 268435599 ] 31 0 31 -[ 268435600 ] 31 0 31 -[ 268435601 ] 31 0 31 -[ 268435602 ] 31 0 31 -[ 268435603 ] 31 0 31 -[ 268435604 ] 31 0 31 -[ 268435605 ] 31 0 31 -[ 268435606 ] 31 0 31 -[ 268435607 ] 31 0 31 -[ 268435608 ] 31 0 31 -[ 268435609 ] 31 0 31 -[ 268435610 ] 31 0 31 -[ 268435611 ] 31 0 31 -[ 268435612 ] 31 0 31 -[ 268435613 ] 31 0 31 -[ 268435614 ] 31 0 31 -[ 268435615 ] 31 0 31 -[ 268435616 ] 31 0 31 -[ 268435617 ] 31 0 31 -[ 268435618 ] 31 0 31 -[ 268435619 ] 31 0 31 -[ 268435620 ] 31 0 31 -[ 268435621 ] 31 0 31 -[ 268435622 ] 31 0 31 -[ 268435623 ] 31 0 31 -[ 268435624 ] 31 0 31 -[ 268435625 ] 31 0 31 -[ 268435626 ] 31 0 31 -[ 268435627 ] 31 0 31 -[ 268435628 ] 31 0 31 -[ 268435629 ] 31 0 31 -[ 268435630 ] 31 0 31 -[ 268435631 ] 31 0 31 -[ 268435632 ] 31 0 31 -[ 268435633 ] 31 0 31 -[ 268435634 ] 31 0 31 -[ 268435635 ] 31 0 31 -[ 268435636 ] 31 0 31 -[ 268435637 ] 31 0 31 -[ 268435638 ] 31 0 31 -[ 268435639 ] 31 0 31 -[ 268435640 ] 31 0 31 -[ 268435641 ] 31 0 31 -[ 268435642 ] 31 0 31 -[ 268435643 ] 31 0 31 -[ 268435644 ] 31 0 31 -[ 268435645 ] 31 0 31 -[ 268435646 ] 31 0 31 -[ 268435647 ] 31 0 31 -[ 268435648 ] 31 0 31 -[ 268435649 ] 31 0 31 -[ 268435650 ] 31 0 31 -[ 268435651 ] 31 0 31 -[ 268435652 ] 31 0 31 -[ 268435653 ] 31 0 31 -[ 268435654 ] 31 0 31 -[ 268435655 ] 31 0 31 -[ 268435656 ] 31 0 31 -[ 268435657 ] 31 0 31 -[ 268435658 ] 31 0 31 -[ 268435659 ] 31 0 31 -[ 268435660 ] 31 0 31 -[ 268435661 ] 31 0 31 -[ 268435662 ] 31 0 31 -[ 268435663 ] 31 0 31 -[ 268435664 ] 31 0 31 -[ 268435665 ] 31 0 31 -[ 268435666 ] 31 0 31 -[ 268435667 ] 31 0 31 -[ 268435668 ] 31 0 31 -[ 268435669 ] 31 0 31 -[ 268435670 ] 31 0 31 -[ 268435671 ] 31 0 31 -[ 268435672 ] 31 0 31 -[ 268435673 ] 31 0 31 -[ 268435674 ] 31 0 31 -[ 268435675 ] 31 0 31 -[ 268435676 ] 31 0 31 -[ 268435677 ] 31 0 31 -[ 268435678 ] 31 0 31 -[ 268435679 ] 31 0 31 -[ 268435680 ] 31 0 31 -[ 268435681 ] 31 0 31 -[ 268435682 ] 31 0 31 -[ 268435683 ] 31 0 31 -[ 268435684 ] 31 0 31 -[ 268435685 ] 31 0 31 -[ 268435686 ] 31 0 31 -[ 268435687 ] 31 0 31 -[ 268435688 ] 31 0 31 -[ 268435689 ] 31 0 31 -[ 268435690 ] 31 0 31 -[ 268435691 ] 31 0 31 -[ 268435692 ] 31 0 31 -[ 268435693 ] 31 0 31 -[ 268435694 ] 31 0 31 -[ 268435695 ] 31 0 31 -[ 268435696 ] 31 0 31 -[ 268435697 ] 31 0 31 -[ 268435698 ] 31 0 31 -[ 268435699 ] 31 0 31 -[ 268435700 ] 31 0 31 -[ 268435701 ] 31 0 31 -[ 268435702 ] 31 0 31 -[ 268435703 ] 31 0 31 -[ 268435704 ] 31 0 31 -[ 268435705 ] 31 0 31 -[ 268435706 ] 31 0 31 -[ 268435707 ] 31 0 31 -[ 268435708 ] 31 0 31 -[ 268435709 ] 31 0 31 -[ 268435710 ] 31 0 31 -[ 268435711 ] 31 0 31 -[ 268435712 ] 31 0 31 -[ 268435713 ] 31 0 31 -[ 268435714 ] 31 0 31 -[ 268435715 ] 31 0 31 -[ 268435716 ] 31 0 31 -[ 268435717 ] 31 0 31 -[ 268435718 ] 31 0 31 -[ 268435719 ] 31 0 31 -[ 268435720 ] 31 0 31 -[ 268435721 ] 31 0 31 -[ 268435722 ] 31 0 31 -[ 268435723 ] 31 0 31 -[ 268435724 ] 31 0 31 -[ 268435725 ] 31 0 31 -[ 268435726 ] 31 0 31 -[ 268435727 ] 31 0 31 -[ 268435728 ] 31 0 31 -[ 268435729 ] 31 0 31 -[ 268435730 ] 31 0 31 -[ 268435731 ] 31 0 31 -[ 268435732 ] 31 0 31 -[ 268435733 ] 31 0 31 -[ 268435734 ] 31 0 31 -[ 268435735 ] 31 0 31 -[ 268435736 ] 31 0 31 -[ 268435737 ] 31 0 31 -[ 268435738 ] 31 0 31 -[ 268435739 ] 31 0 31 -[ 268435740 ] 31 0 31 -[ 268435741 ] 31 0 31 -[ 268435742 ] 31 0 31 -[ 268435743 ] 31 0 31 -[ 268435744 ] 31 0 31 -[ 268435745 ] 31 0 31 -[ 268435746 ] 31 0 31 -[ 268435747 ] 31 0 31 -[ 268435748 ] 31 0 31 -[ 268435749 ] 31 0 31 -[ 268435750 ] 31 0 31 -[ 268435751 ] 31 0 31 -[ 268435752 ] 31 0 31 -[ 268435753 ] 31 0 31 -[ 268435754 ] 31 0 31 -[ 268435755 ] 31 0 31 -[ 268435756 ] 31 0 31 -[ 268435757 ] 31 0 31 -[ 268435758 ] 31 0 31 -[ 268435759 ] 31 0 31 -[ 268435760 ] 31 0 31 -[ 268435761 ] 31 0 31 -[ 268435762 ] 31 0 31 -[ 268435763 ] 31 0 31 -[ 268435764 ] 31 0 31 -[ 268435765 ] 31 0 31 -[ 268435766 ] 31 0 31 -[ 268435767 ] 31 0 31 -[ 268435768 ] 31 0 31 -[ 268435769 ] 31 0 31 -[ 268435770 ] 31 0 31 -[ 268435771 ] 31 0 31 -[ 268435772 ] 31 0 31 -[ 268435773 ] 31 0 31 -[ 268435774 ] 31 0 31 -[ 268435775 ] 31 0 31 -[ 268435776 ] 31 0 31 -[ 268435777 ] 31 0 31 -[ 268435778 ] 31 0 31 -[ 268435779 ] 31 0 31 -[ 268435780 ] 31 0 31 -[ 268435781 ] 31 0 31 -[ 268435782 ] 31 0 31 -[ 268435783 ] 31 0 31 -[ 268435784 ] 31 0 31 -[ 268435785 ] 31 0 31 -[ 268435786 ] 31 0 31 -[ 268435787 ] 31 0 31 -[ 268435788 ] 31 0 31 -[ 268435789 ] 31 0 31 -[ 268435790 ] 31 0 31 -[ 268435791 ] 31 0 31 -[ 268435792 ] 31 0 31 -[ 268435793 ] 31 0 31 -[ 268435794 ] 31 0 31 -[ 268435795 ] 31 0 31 -[ 268435796 ] 31 0 31 -[ 268435797 ] 31 0 31 -[ 268435798 ] 31 0 31 -[ 268435799 ] 31 0 31 -[ 268435800 ] 31 0 31 -[ 268435801 ] 31 0 31 -[ 268435802 ] 31 0 31 -[ 268435803 ] 31 0 31 -[ 268435804 ] 31 0 31 -[ 268435805 ] 31 0 31 -[ 268435806 ] 31 0 31 -[ 268435807 ] 31 0 31 -[ 268435808 ] 31 0 31 -[ 268435809 ] 31 0 31 -[ 268435810 ] 31 0 31 -[ 268435811 ] 31 0 31 -[ 268435812 ] 31 0 31 -[ 268435813 ] 31 0 31 -[ 268435814 ] 31 0 31 -[ 268435815 ] 31 0 31 -[ 268435816 ] 31 0 31 -[ 268435817 ] 31 0 31 -[ 268435818 ] 31 0 31 -[ 268435819 ] 31 0 31 -[ 268435820 ] 31 0 31 -[ 268435821 ] 31 0 31 -[ 268435822 ] 31 0 31 -[ 268435823 ] 31 0 31 -[ 268435824 ] 31 0 31 -[ 268435825 ] 31 0 31 -[ 268435826 ] 31 0 31 -[ 268435827 ] 31 0 31 -[ 268435828 ] 31 0 31 -[ 268435829 ] 31 0 31 -[ 268435830 ] 31 0 31 -[ 268435831 ] 31 0 31 -[ 268435832 ] 31 0 31 -[ 268435833 ] 31 0 31 -[ 268435834 ] 31 0 31 -[ 268435835 ] 31 0 31 -[ 268435836 ] 31 0 31 -[ 268435837 ] 31 0 31 -[ 268435838 ] 31 0 31 -[ 268435839 ] 31 0 31 -[ 268435840 ] 31 0 31 -[ 268435841 ] 31 0 31 -[ 268435842 ] 31 0 31 -[ 268435843 ] 31 0 31 -[ 268435844 ] 31 0 31 -[ 268435845 ] 31 0 31 -[ 268435846 ] 31 0 31 -[ 268435847 ] 31 0 31 -[ 268435848 ] 31 0 31 -[ 268435849 ] 31 0 31 -[ 268435850 ] 31 0 31 -[ 268435851 ] 31 0 31 -[ 268435852 ] 31 0 31 -[ 268435853 ] 31 0 31 -[ 268435854 ] 31 0 31 -[ 268435855 ] 31 0 31 -[ 268435856 ] 31 0 31 -[ 268435857 ] 31 0 31 -[ 268435858 ] 31 0 31 -[ 268435859 ] 31 0 31 -[ 268435860 ] 31 0 31 -[ 268435861 ] 31 0 31 -[ 268435862 ] 31 0 31 -[ 268435863 ] 31 0 31 -[ 268435864 ] 31 0 31 -[ 268435865 ] 31 0 31 -[ 268435866 ] 31 0 31 -[ 268435867 ] 31 0 31 -[ 268435868 ] 31 0 31 -[ 268435869 ] 31 0 31 -[ 268435870 ] 31 0 31 -[ 268435871 ] 31 0 31 -[ 268435872 ] 31 0 31 -[ 268435873 ] 31 0 31 -[ 268435874 ] 31 0 31 -[ 268435875 ] 31 0 31 -[ 268435876 ] 31 0 31 -[ 268435877 ] 31 0 31 -[ 268435878 ] 31 0 31 -[ 268435879 ] 31 0 31 -[ 268435880 ] 31 0 31 -[ 268435881 ] 31 0 31 -[ 268435882 ] 31 0 31 -[ 268435883 ] 31 0 31 -[ 268435884 ] 31 0 31 -[ 268435885 ] 31 0 31 -[ 268435886 ] 31 0 31 -[ 268435887 ] 31 0 31 -[ 268435888 ] 31 0 31 -[ 268435889 ] 31 0 31 -[ 268435890 ] 31 0 31 -[ 268435891 ] 31 0 31 -[ 268435892 ] 31 0 31 -[ 268435893 ] 31 0 31 -[ 268435894 ] 31 0 31 -[ 268435895 ] 31 0 31 -[ 268435896 ] 31 0 31 -[ 268435897 ] 31 0 31 -[ 268435898 ] 31 0 31 -[ 268435899 ] 31 0 31 -[ 268435900 ] 31 0 31 -[ 268435901 ] 31 0 31 -[ 268435902 ] 31 0 31 -[ 268435903 ] 31 0 31 -[ 268435904 ] 31 0 31 -[ 268435905 ] 31 0 31 -[ 268435906 ] 31 0 31 -[ 268435907 ] 31 0 31 -[ 268435908 ] 31 0 31 -[ 268435909 ] 31 0 31 -[ 268435910 ] 31 0 31 -[ 268435911 ] 31 0 31 -[ 268435912 ] 31 0 31 -[ 268435913 ] 31 0 31 -[ 268435914 ] 31 0 31 -[ 268435915 ] 31 0 31 -[ 268435916 ] 31 0 31 -[ 268435917 ] 31 0 31 -[ 268435918 ] 31 0 31 -[ 268435919 ] 31 0 31 -[ 268435920 ] 31 0 31 -[ 268435921 ] 31 0 31 -[ 268435922 ] 31 0 31 -[ 268435923 ] 31 0 31 -[ 268435924 ] 31 0 31 -[ 268435925 ] 31 0 31 -[ 268435926 ] 31 0 31 -[ 268435927 ] 31 0 31 -[ 268435928 ] 31 0 31 -[ 268435929 ] 31 0 31 -[ 268435930 ] 31 0 31 -[ 268435931 ] 31 0 31 -[ 268435932 ] 31 0 31 -[ 268435933 ] 31 0 31 -[ 268435934 ] 31 0 31 -[ 268435935 ] 31 0 31 -[ 268435936 ] 31 0 31 -[ 268435937 ] 31 0 31 -[ 268435938 ] 31 0 31 -[ 268435939 ] 31 0 31 -[ 268435940 ] 31 0 31 -[ 268435941 ] 31 0 31 -[ 268435942 ] 31 0 31 -[ 268435943 ] 31 0 31 -[ 268435944 ] 31 0 31 -[ 268435945 ] 31 0 31 -[ 268435946 ] 31 0 31 -[ 268435947 ] 31 0 31 -[ 268435948 ] 31 0 31 -[ 268435949 ] 31 0 31 -[ 268435950 ] 31 0 31 -[ 268435951 ] 31 0 31 -[ 268435952 ] 31 0 31 -[ 268435953 ] 31 0 31 -[ 268435954 ] 31 0 31 -[ 268435955 ] 31 0 31 -[ 268435956 ] 31 0 31 -[ 268435957 ] 31 0 31 -[ 268435958 ] 31 0 31 -[ 268435959 ] 31 0 31 -[ 268435960 ] 31 0 31 -[ 268435961 ] 31 0 31 -[ 268435962 ] 31 0 31 -[ 268435963 ] 31 0 31 -[ 268435964 ] 31 0 31 -[ 268435965 ] 31 0 31 -[ 268435966 ] 31 0 31 -[ 268435967 ] 31 0 31 -[ 268435968 ] 31 0 31 -[ 268435969 ] 31 0 31 -[ 268435970 ] 31 0 31 -[ 268435971 ] 31 0 31 -[ 268435972 ] 31 0 31 -[ 268435973 ] 31 0 31 -[ 268435974 ] 31 0 31 -[ 268435975 ] 31 0 31 -[ 268435976 ] 31 0 31 -[ 268435977 ] 31 0 31 -[ 268435978 ] 31 0 31 -[ 268435979 ] 31 0 31 -[ 268435980 ] 31 0 31 -[ 268435981 ] 31 0 31 -[ 268435982 ] 31 0 31 -[ 268435983 ] 31 0 31 -[ 268435984 ] 31 0 31 -[ 268435985 ] 31 0 31 -[ 268435986 ] 31 0 31 -[ 268435987 ] 31 0 31 -[ 268435988 ] 31 0 31 -[ 268435989 ] 31 0 31 -[ 268435990 ] 31 0 31 -[ 268435991 ] 31 0 31 -[ 268435992 ] 31 0 31 -[ 268435993 ] 31 0 31 -[ 268435994 ] 31 0 31 -[ 268435995 ] 31 0 31 -[ 268435996 ] 31 0 31 -[ 268435997 ] 31 0 31 -[ 268435998 ] 31 0 31 -[ 268435999 ] 31 0 31 -[ 268436000 ] 31 0 31 -[ 268436001 ] 31 0 31 -[ 268436002 ] 31 0 31 -[ 268436003 ] 31 0 31 -[ 268436004 ] 31 0 31 -[ 268436005 ] 31 0 31 -[ 268436006 ] 31 0 31 -[ 268436007 ] 31 0 31 -[ 268436008 ] 31 0 31 -[ 268436009 ] 31 0 31 -[ 268436010 ] 31 0 31 -[ 268436011 ] 31 0 31 -[ 268436012 ] 31 0 31 -[ 268436013 ] 31 0 31 -[ 268436014 ] 31 0 31 -[ 268436015 ] 31 0 31 -[ 268436016 ] 31 0 31 -[ 268436017 ] 31 0 31 -[ 268436018 ] 31 0 31 -[ 268436019 ] 31 0 31 -[ 268436020 ] 31 0 31 -[ 268436021 ] 31 0 31 -[ 268436022 ] 31 0 31 -[ 268436023 ] 31 0 31 -[ 268436024 ] 31 0 31 -[ 268436025 ] 31 0 31 -[ 268436026 ] 31 0 31 -[ 268436027 ] 31 0 31 -[ 268436028 ] 31 0 31 -[ 268436029 ] 31 0 31 -[ 268436030 ] 31 0 31 -[ 268436031 ] 31 0 31 -[ 268436032 ] 31 0 31 -[ 268436033 ] 31 0 31 -[ 268436034 ] 31 0 31 -[ 268436035 ] 31 0 31 -[ 268436036 ] 31 0 31 -[ 268436037 ] 31 0 31 -[ 268436038 ] 31 0 31 -[ 268436039 ] 31 0 31 -[ 268436040 ] 31 0 31 -[ 268436041 ] 31 0 31 -[ 268436042 ] 31 0 31 -[ 268436043 ] 31 0 31 -[ 268436044 ] 31 0 31 -[ 268436045 ] 31 0 31 -[ 268436046 ] 31 0 31 -[ 268436047 ] 31 0 31 -[ 268436048 ] 31 0 31 -[ 268436049 ] 31 0 31 -[ 268436050 ] 31 0 31 -[ 268436051 ] 31 0 31 -[ 268436052 ] 31 0 31 -[ 268436053 ] 31 0 31 -[ 268436054 ] 31 0 31 -[ 268436055 ] 31 0 31 -[ 268436056 ] 31 0 31 -[ 268436057 ] 31 0 31 -[ 268436058 ] 31 0 31 -[ 268436059 ] 31 0 31 -[ 268436060 ] 31 0 31 -[ 268436061 ] 31 0 31 -[ 268436062 ] 31 0 31 -[ 268436063 ] 31 0 31 -[ 268436064 ] 31 0 31 -[ 268436065 ] 31 0 31 -[ 268436066 ] 31 0 31 -[ 268436067 ] 31 0 31 -[ 268436068 ] 31 0 31 -[ 268436069 ] 31 0 31 -[ 268436070 ] 31 0 31 -[ 268436071 ] 31 0 31 -[ 268436072 ] 31 0 31 -[ 268436073 ] 31 0 31 -[ 268436074 ] 31 0 31 -[ 268436075 ] 31 0 31 -[ 268436076 ] 31 0 31 -[ 268436077 ] 31 0 31 -[ 268436078 ] 31 0 31 -[ 268436079 ] 31 0 31 -[ 268436080 ] 31 0 31 -[ 268436081 ] 31 0 31 -[ 268436082 ] 31 0 31 -[ 268436083 ] 31 0 31 -[ 268436084 ] 31 0 31 -[ 268436085 ] 31 0 31 -[ 268436086 ] 31 0 31 -[ 268436087 ] 31 0 31 -[ 268436088 ] 31 0 31 -[ 268436089 ] 31 0 31 -[ 268436090 ] 31 0 31 -[ 268436091 ] 31 0 31 -[ 268436092 ] 31 0 31 -[ 268436093 ] 31 0 31 -[ 268436094 ] 31 0 31 -[ 268436095 ] 31 0 31 -[ 268436096 ] 31 0 31 -[ 268436097 ] 31 0 31 -[ 268436098 ] 31 0 31 -[ 268436099 ] 31 0 31 -[ 268436100 ] 31 0 31 -[ 268436101 ] 31 0 31 -[ 268436102 ] 31 0 31 -[ 268436103 ] 31 0 31 -[ 268436104 ] 31 0 31 -[ 268436105 ] 31 0 31 -[ 268436106 ] 31 0 31 -[ 268436107 ] 31 0 31 -[ 268436108 ] 31 0 31 -[ 268436109 ] 31 0 31 -[ 268436110 ] 31 0 31 -[ 268436111 ] 31 0 31 -[ 268436112 ] 31 0 31 -[ 268436113 ] 31 0 31 -[ 268436114 ] 31 0 31 -[ 268436115 ] 31 0 31 -[ 268436116 ] 31 0 31 -[ 268436117 ] 31 0 31 -[ 268436118 ] 31 0 31 -[ 268436119 ] 31 0 31 -[ 268436120 ] 31 0 31 -[ 268436121 ] 31 0 31 -[ 268436122 ] 31 0 31 -[ 268436123 ] 31 0 31 -[ 268436124 ] 31 0 31 -[ 268436125 ] 31 0 31 -[ 268436126 ] 31 0 31 -[ 268436127 ] 31 0 31 -[ 268436128 ] 31 0 31 -[ 268436129 ] 31 0 31 -[ 268436130 ] 31 0 31 -[ 268436131 ] 31 0 31 -[ 268436132 ] 31 0 31 -[ 268436133 ] 31 0 31 -[ 268436134 ] 31 0 31 -[ 268436135 ] 31 0 31 -[ 268436136 ] 31 0 31 -[ 268436137 ] 31 0 31 -[ 268436138 ] 31 0 31 -[ 268436139 ] 31 0 31 -[ 268436140 ] 31 0 31 -[ 268436141 ] 31 0 31 -[ 268436142 ] 31 0 31 -[ 268436143 ] 31 0 31 -[ 268436144 ] 31 0 31 -[ 268436145 ] 31 0 31 -[ 268436146 ] 31 0 31 -[ 268436147 ] 31 0 31 -[ 268436148 ] 31 0 31 -[ 268436149 ] 31 0 31 -[ 268436150 ] 31 0 31 -[ 268436151 ] 31 0 31 -[ 268436152 ] 31 0 31 -[ 268436153 ] 31 0 31 -[ 268436154 ] 31 0 31 -[ 268436155 ] 31 0 31 -[ 268436156 ] 31 0 31 -[ 268436157 ] 31 0 31 -[ 268436158 ] 31 0 31 -[ 268436159 ] 31 0 31 -[ 268436160 ] 31 0 31 -[ 268436161 ] 31 0 31 -[ 268436162 ] 31 0 31 -[ 268436163 ] 31 0 31 -[ 268436164 ] 31 0 31 -[ 268436165 ] 31 0 31 -[ 268436166 ] 31 0 31 -[ 268436167 ] 31 0 31 -[ 268436168 ] 31 0 31 -[ 268436169 ] 31 0 31 -[ 268436170 ] 31 0 31 -[ 268436171 ] 31 0 31 -[ 268436172 ] 31 0 31 -[ 268436173 ] 31 0 31 -[ 268436174 ] 31 0 31 -[ 268436175 ] 31 0 31 -[ 268436176 ] 31 0 31 -[ 268436177 ] 31 0 31 -[ 268436178 ] 31 0 31 -[ 268436179 ] 31 0 31 -[ 268436180 ] 31 0 31 -[ 268436181 ] 31 0 31 -[ 268436182 ] 31 0 31 -[ 268436183 ] 31 0 31 -[ 268436184 ] 31 0 31 -[ 268436185 ] 31 0 31 -[ 268436186 ] 31 0 31 -[ 268436187 ] 31 0 31 -[ 268436188 ] 31 0 31 -[ 268436189 ] 31 0 31 -[ 268436190 ] 31 0 31 -[ 268436191 ] 31 0 31 -[ 268436192 ] 31 0 31 -[ 268436193 ] 31 0 31 -[ 268436194 ] 31 0 31 -[ 268436195 ] 31 0 31 -[ 268436196 ] 31 0 31 -[ 268436197 ] 31 0 31 -[ 268436198 ] 31 0 31 -[ 268436199 ] 31 0 31 -[ 268436200 ] 31 0 31 -[ 268436201 ] 31 0 31 -[ 268436202 ] 31 0 31 -[ 268436203 ] 31 0 31 -[ 268436204 ] 31 0 31 -[ 268436205 ] 31 0 31 -[ 268436206 ] 31 0 31 -[ 268436207 ] 31 0 31 -[ 268436208 ] 31 0 31 -[ 268436209 ] 31 0 31 -[ 268436210 ] 31 0 31 -[ 268436211 ] 31 0 31 -[ 268436212 ] 31 0 31 -[ 268436213 ] 31 0 31 -[ 268436214 ] 31 0 31 -[ 268436215 ] 31 0 31 -[ 268436216 ] 31 0 31 -[ 268436217 ] 31 0 31 -[ 268436218 ] 31 0 31 -[ 268436219 ] 31 0 31 -[ 268436220 ] 31 0 31 -[ 268436221 ] 31 0 31 -[ 268436222 ] 31 0 31 -[ 268436223 ] 31 0 31 -[ 268436224 ] 31 0 31 -[ 268436225 ] 31 0 31 -[ 268436226 ] 31 0 31 -[ 268436227 ] 31 0 31 -[ 268436228 ] 31 0 31 -[ 268436229 ] 31 0 31 -[ 268436230 ] 31 0 31 -[ 268436231 ] 31 0 31 -[ 268436232 ] 31 0 31 -[ 268436233 ] 31 0 31 -[ 268436234 ] 31 0 31 -[ 268436235 ] 31 0 31 -[ 268436236 ] 31 0 31 -[ 268436237 ] 31 0 31 -[ 268436238 ] 31 0 31 -[ 268436239 ] 31 0 31 -[ 268436240 ] 31 0 31 -[ 268436241 ] 31 0 31 -[ 268436242 ] 31 0 31 -[ 268436243 ] 31 0 31 -[ 268436244 ] 31 0 31 -[ 268436245 ] 31 0 31 -[ 268436246 ] 31 0 31 -[ 268436247 ] 31 0 31 -[ 268436248 ] 31 0 31 -[ 268436249 ] 31 0 31 -[ 268436250 ] 31 0 31 -[ 268436251 ] 31 0 31 -[ 268436252 ] 31 0 31 -[ 268436253 ] 31 0 31 -[ 268436254 ] 31 0 31 -[ 268436255 ] 31 0 31 -[ 268436256 ] 31 0 31 -[ 268436257 ] 31 0 31 -[ 268436258 ] 31 0 31 -[ 268436259 ] 31 0 31 -[ 268436260 ] 31 0 31 -[ 268436261 ] 31 0 31 -[ 268436262 ] 31 0 31 -[ 268436263 ] 31 0 31 -[ 268436264 ] 31 0 31 -[ 268436265 ] 31 0 31 -[ 268436266 ] 31 0 31 -[ 268436267 ] 31 0 31 -[ 268436268 ] 31 0 31 -[ 268436269 ] 31 0 31 -[ 268436270 ] 31 0 31 -[ 268436271 ] 31 0 31 -[ 268436272 ] 31 0 31 -[ 268436273 ] 31 0 31 -[ 268436274 ] 31 0 31 -[ 268436275 ] 31 0 31 -[ 268436276 ] 31 0 31 -[ 268436277 ] 31 0 31 -[ 268436278 ] 31 0 31 -[ 268436279 ] 31 0 31 -[ 268436280 ] 31 0 31 -[ 268436281 ] 31 0 31 -[ 268436282 ] 31 0 31 -[ 268436283 ] 31 0 31 -[ 268436284 ] 31 0 31 -[ 268436285 ] 31 0 31 -[ 268436286 ] 31 0 31 -[ 268436287 ] 31 0 31 -[ 268436288 ] 31 0 31 -[ 268436289 ] 31 0 31 -[ 268436290 ] 31 0 31 -[ 268436291 ] 31 0 31 -[ 268436292 ] 31 0 31 -[ 268436293 ] 31 0 31 -[ 268436294 ] 31 0 31 -[ 268436295 ] 31 0 31 -[ 268436296 ] 31 0 31 -[ 268436297 ] 31 0 31 -[ 268436298 ] 31 0 31 -[ 268436299 ] 31 0 31 -[ 268436300 ] 31 0 31 -[ 268436301 ] 31 0 31 -[ 268436302 ] 31 0 31 -[ 268436303 ] 31 0 31 -[ 268436304 ] 31 0 31 -[ 268436305 ] 31 0 31 -[ 268436306 ] 31 0 31 -[ 268436307 ] 31 0 31 -[ 268436308 ] 31 0 31 -[ 268436309 ] 31 0 31 -[ 268436310 ] 31 0 31 -[ 268436311 ] 31 0 31 -[ 268436312 ] 31 0 31 -[ 268436313 ] 31 0 31 -[ 268436314 ] 31 0 31 -[ 268436315 ] 31 0 31 -[ 268436316 ] 31 0 31 -[ 268436317 ] 31 0 31 -[ 268436318 ] 31 0 31 -[ 268436319 ] 31 0 31 -[ 268436320 ] 31 0 31 -[ 268436321 ] 31 0 31 -[ 268436322 ] 31 0 31 -[ 268436323 ] 31 0 31 -[ 268436324 ] 31 0 31 -[ 268436325 ] 31 0 31 -[ 268436326 ] 31 0 31 -[ 268436327 ] 31 0 31 -[ 268436328 ] 31 0 31 -[ 268436329 ] 31 0 31 -[ 268436330 ] 31 0 31 -[ 268436331 ] 31 0 31 -[ 268436332 ] 31 0 31 -[ 268436333 ] 31 0 31 -[ 268436334 ] 31 0 31 -[ 268436335 ] 31 0 31 -[ 268436336 ] 31 0 31 -[ 268436337 ] 31 0 31 -[ 268436338 ] 31 0 31 -[ 268436339 ] 31 0 31 -[ 268436340 ] 31 0 31 -[ 268436341 ] 31 0 31 -[ 268436342 ] 31 0 31 -[ 268436343 ] 31 0 31 -[ 268436344 ] 31 0 31 -[ 268436345 ] 31 0 31 -[ 268436346 ] 31 0 31 -[ 268436347 ] 31 0 31 -[ 268436348 ] 31 0 31 -[ 268436349 ] 31 0 31 -[ 268436350 ] 31 0 31 -[ 268436351 ] 31 0 31 -[ 268436352 ] 31 0 31 -[ 268436353 ] 31 0 31 -[ 268436354 ] 31 0 31 -[ 268436355 ] 31 0 31 -[ 268436356 ] 31 0 31 -[ 268436357 ] 31 0 31 -[ 268436358 ] 31 0 31 -[ 268436359 ] 31 0 31 -[ 268436360 ] 31 0 31 -[ 268436361 ] 31 0 31 -[ 268436362 ] 31 0 31 -[ 268436363 ] 31 0 31 -[ 268436364 ] 31 0 31 -[ 268436365 ] 31 0 31 -[ 268436366 ] 31 0 31 -[ 268436367 ] 31 0 31 -[ 268436368 ] 31 0 31 -[ 268436369 ] 31 0 31 -[ 268436370 ] 31 0 31 -[ 268436371 ] 31 0 31 -[ 268436372 ] 31 0 31 -[ 268436373 ] 31 0 31 -[ 268436374 ] 31 0 31 -[ 268436375 ] 31 0 31 -[ 268436376 ] 31 0 31 -[ 268436377 ] 31 0 31 -[ 268436378 ] 31 0 31 -[ 268436379 ] 31 0 31 -[ 268436380 ] 31 0 31 -[ 268436381 ] 31 0 31 -[ 268436382 ] 31 0 31 -[ 268436383 ] 31 0 31 -[ 268436384 ] 31 0 31 -[ 268436385 ] 31 0 31 -[ 268436386 ] 31 0 31 -[ 268436387 ] 31 0 31 -[ 268436388 ] 31 0 31 -[ 268436389 ] 31 0 31 -[ 268436390 ] 31 0 31 -[ 268436391 ] 31 0 31 -[ 268436392 ] 31 0 31 -[ 268436393 ] 31 0 31 -[ 268436394 ] 31 0 31 -[ 268436395 ] 31 0 31 -[ 268436396 ] 31 0 31 -[ 268436397 ] 31 0 31 -[ 268436398 ] 31 0 31 -[ 268436399 ] 31 0 31 -[ 268436400 ] 31 0 31 -[ 268436401 ] 31 0 31 -[ 268436402 ] 31 0 31 -[ 268436403 ] 31 0 31 -[ 268436404 ] 31 0 31 -[ 268436405 ] 31 0 31 -[ 268436406 ] 31 0 31 -[ 268436407 ] 31 0 31 -[ 268436408 ] 31 0 31 -[ 268436409 ] 31 0 31 -[ 268436410 ] 31 0 31 -[ 268436411 ] 31 0 31 -[ 268436412 ] 31 0 31 -[ 268436413 ] 31 0 31 -[ 268436414 ] 31 0 31 -[ 268436415 ] 31 0 31 -[ 268436416 ] 31 0 31 -[ 268436417 ] 31 0 31 -[ 268436418 ] 31 0 31 -[ 268436419 ] 31 0 31 -[ 268436420 ] 31 0 31 -[ 268436421 ] 31 0 31 -[ 268436422 ] 31 0 31 -[ 268436423 ] 31 0 31 -[ 268436424 ] 31 0 31 -[ 268436425 ] 31 0 31 -[ 268436426 ] 31 0 31 -[ 268436427 ] 31 0 31 -[ 268436428 ] 31 0 31 -[ 268436429 ] 31 0 31 -[ 268436430 ] 31 0 31 -[ 268436431 ] 31 0 31 -[ 268436432 ] 31 0 31 -[ 268436433 ] 31 0 31 -[ 268436434 ] 31 0 31 -[ 268436435 ] 31 0 31 -[ 268436436 ] 31 0 31 -[ 268436437 ] 31 0 31 -[ 268436438 ] 31 0 31 -[ 268436439 ] 31 0 31 -[ 268436440 ] 31 0 31 -[ 268436441 ] 31 0 31 -[ 268436442 ] 31 0 31 -[ 268436443 ] 31 0 31 -[ 268436444 ] 31 0 31 -[ 268436445 ] 31 0 31 -[ 268436446 ] 31 0 31 -[ 268436447 ] 31 0 31 -[ 268436448 ] 31 0 31 -[ 268436449 ] 31 0 31 -[ 268436450 ] 31 0 31 -[ 268436451 ] 31 0 31 -[ 268436452 ] 31 0 31 -[ 268436453 ] 31 0 31 -[ 268436454 ] 31 0 31 -[ 268436455 ] 31 0 31 -[ 268436456 ] 31 0 31 -[ 268436457 ] 31 0 31 -[ 268436458 ] 31 0 31 -[ 268436459 ] 31 0 31 -[ 268436460 ] 31 0 31 -[ 268436461 ] 31 0 31 -[ 268436462 ] 31 0 31 -[ 268436463 ] 31 0 31 -[ 268436464 ] 31 0 31 -[ 268436465 ] 31 0 31 -[ 268436466 ] 31 0 31 -[ 268436467 ] 31 0 31 -[ 268436468 ] 31 0 31 -[ 268436469 ] 31 0 31 -[ 268436470 ] 31 0 31 -[ 268436471 ] 31 0 31 -[ 268436472 ] 31 0 31 -[ 268436473 ] 31 0 31 -[ 268436474 ] 31 0 31 -[ 268436475 ] 31 0 31 -[ 268436476 ] 31 0 31 -[ 268436477 ] 31 0 31 -[ 268436478 ] 31 0 31 -[ 268436479 ] 31 0 31 -1024 differences found diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt deleted file mode 100644 index 7affe59..0000000 --- a/tools/testfiles/h5diff_101.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic1.h5 g1/d1 g1/d2' -############################# -dataset: and -size: [3x2] [3x2] -position d1 d2 difference ------------------------------------------------------------- -[ 0 1 ] 1e-09 2e-09 1e-09 -[ 1 0 ] 1e-09 9e-10 1e-10 -[ 1 1 ] 0 1e-09 1e-09 -[ 2 0 ] 1e-09 0 1e-09 -4 differences found diff --git a/tools/testfiles/h5diff_102.txt b/tools/testfiles/h5diff_102.txt deleted file mode 100644 index dba340b..0000000 --- a/tools/testfiles/h5diff_102.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic1.h5 g1/fp1 g1/fp2' -############################# -dataset: and -size: [3x2] [3x2] -position fp1 fp2 difference ------------------------------------------------------------- -[ 0 1 ] 1e-05 2e-05 1e-05 -[ 1 0 ] 1e-05 9e-06 9.99999e-07 -[ 1 1 ] 0 1e-05 1e-05 -[ 2 0 ] 1e-05 0 1e-05 -4 differences found diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt deleted file mode 100644 index 988afe8..0000000 --- a/tools/testfiles/h5diff_11.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5' -############################# -dataset: and -5 differences found diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt deleted file mode 100644 index 666a91b..0000000 --- a/tools/testfiles/h5diff_12.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2' -############################# -dataset: and -5 differences found diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt deleted file mode 100644 index 834f809..0000000 --- a/tools/testfiles/h5diff_13.txt +++ /dev/null @@ -1,13 +0,0 @@ -############################# -Expected output for 'h5diff -r h5diff_basic1.h5 h5diff_basic2.h5' -############################# -dataset: and -size: [3x2] [3x2] -position dset1 dset1 difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 1 1.1 0.1 -[ 1 0 ] 1 1.01 0.01 -[ 1 1 ] 1 1.001 0.001 -[ 2 1 ] 0 1 1 -5 differences found diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt deleted file mode 100644 index d0f75b5..0000000 --- a/tools/testfiles/h5diff_14.txt +++ /dev/null @@ -1,13 +0,0 @@ -############################# -Expected output for 'h5diff -r h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2' -############################# -dataset: and -size: [3x2] [3x2] -position dset1 dset2 difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 1 1.1 0.1 -[ 1 0 ] 1 1.01 0.01 -[ 1 1 ] 1 1.001 0.001 -[ 2 1 ] 0 1 1 -5 differences found diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt deleted file mode 100644 index 529ffc5..0000000 --- a/tools/testfiles/h5diff_15.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff --report --delta=5 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -size: [3x2] [3x2] -position dset3 dset4 difference ------------------------------------------------------------- -[ 0 1 ] 100 120 20 -[ 1 0 ] 100 160 60 -[ 2 0 ] 100 80 20 -[ 2 1 ] 100 40 60 -4 differences found diff --git a/tools/testfiles/h5diff_16_1.txt b/tools/testfiles/h5diff_16_1.txt deleted file mode 100644 index 738a0f7..0000000 --- a/tools/testfiles/h5diff_16_1.txt +++ /dev/null @@ -1,16 +0,0 @@ -############################# -Expected output for 'h5diff -v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset5 g1/dset6' -############################# -dataset: and -size: [3x2] [3x2] -position dset5 dset6 difference relative ------------------------------------------------------------------------- -[ 0 0 ] 100 120 20 0.200000 -[ 0 1 ] 100 80 20 0.200000 -[ 1 0 ] 100 0 100 1.000000 -[ 1 1 ] 0 100 100 not comparable -[ 2 1 ] 100 50 50 0.500000 -5 differences found --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_16_2.txt b/tools/testfiles/h5diff_16_2.txt deleted file mode 100644 index 421bf70..0000000 --- a/tools/testfiles/h5diff_16_2.txt +++ /dev/null @@ -1,16 +0,0 @@ -############################# -Expected output for 'h5diff --verbose --relative=0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset7 g1/dset8' -############################# -dataset: and -size: [3x2] [3x2] -position dset7 dset8 difference relative ------------------------------------------------------------------------- -[ 0 0 ] 100 120 20 0.200000 -[ 0 1 ] 100 80 20 0.200000 -[ 1 0 ] 100 0 100 1.000000 -[ 1 1 ] 0 100 100 not comparable -[ 2 1 ] 100 50 50 0.500000 -5 differences found --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_16_3.txt b/tools/testfiles/h5diff_16_3.txt deleted file mode 100644 index 0721799..0000000 --- a/tools/testfiles/h5diff_16_3.txt +++ /dev/null @@ -1,16 +0,0 @@ -############################# -Expected output for 'h5diff -v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10' -############################# -dataset: and -size: [3x2] [3x2] -position dset9 dset10 difference relative ------------------------------------------------------------------------- -[ 0 0 ] 100 120 20 0.2 -[ 0 1 ] 100 80 20 0.2 -[ 1 0 ] 100 0 100 1 -[ 1 1 ] 0 100 100 not comparable -[ 2 1 ] 100 50 50 0.5 -5 differences found --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt deleted file mode 100644 index 1d93779..0000000 --- a/tools/testfiles/h5diff_17.txt +++ /dev/null @@ -1,42 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic2.h5' -############################# - -file1 file2 ---------------------------------------- - x x / - x x /g1 - x /g1/d1 - x /g1/d2 - x x /g1/dset1 - x /g1/dset10 - x /g1/dset2 - x /g1/dset3 - x /g1/dset4 - x /g1/dset5 - x /g1/dset6 - x /g1/dset7 - x /g1/dset8 - x /g1/dset9 - x /g1/fp1 - x /g1/fp15 - x /g1/fp16 - x /g1/fp17 - x /g1/fp18 - x /g1/fp2 - x /g2 - -group : and -0 differences found -group : and -0 differences found -dataset: and -size: [3x2] [3x2] -position dset1 dset1 difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 1 1.1 0.1 -[ 1 0 ] 1 1.01 0.01 -[ 1 1 ] 1 1.001 0.001 -[ 2 1 ] 0 1 1 -5 differences found diff --git a/tools/testfiles/h5diff_18.txt b/tools/testfiles/h5diff_18.txt deleted file mode 100644 index 24c2e32..0000000 --- a/tools/testfiles/h5diff_18.txt +++ /dev/null @@ -1,3 +0,0 @@ -############################# -Expected output for 'h5diff -q h5diff_basic1.h5 h5diff_basic2.h5' -############################# diff --git a/tools/testfiles/h5diff_20.txt b/tools/testfiles/h5diff_20.txt deleted file mode 100644 index ebdcd9a..0000000 --- a/tools/testfiles/h5diff_20.txt +++ /dev/null @@ -1,7 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset g1' -############################# -Comparison not possible: is of type H5G_DATASET and is of type H5G_GROUP --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_21.txt b/tools/testfiles/h5diff_21.txt deleted file mode 100644 index 647b58d..0000000 --- a/tools/testfiles/h5diff_21.txt +++ /dev/null @@ -1,7 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset l1' -############################# -Comparison not possible: is of type H5G_DATASET and is of type H5G_LINK --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_22.txt b/tools/testfiles/h5diff_22.txt deleted file mode 100644 index b664837..0000000 --- a/tools/testfiles/h5diff_22.txt +++ /dev/null @@ -1,7 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset t1' -############################# -Comparison not possible: is of type H5G_DATASET and is of type H5G_TYPE --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt deleted file mode 100644 index 74c858a..0000000 --- a/tools/testfiles/h5diff_23.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g1' -############################# -group : and -0 differences found diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt deleted file mode 100644 index 75f2e6f..0000000 --- a/tools/testfiles/h5diff_24.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t1' -############################# -datatype: and -0 differences found diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt deleted file mode 100644 index 8801c31..0000000 --- a/tools/testfiles/h5diff_25.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l1' -############################# -link : and -0 differences found diff --git a/tools/testfiles/h5diff_26.txt b/tools/testfiles/h5diff_26.txt deleted file mode 100644 index 24e1190..0000000 --- a/tools/testfiles/h5diff_26.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g2' -############################# -group : and -1 differences found diff --git a/tools/testfiles/h5diff_27.txt b/tools/testfiles/h5diff_27.txt deleted file mode 100644 index f62e0e3..0000000 --- a/tools/testfiles/h5diff_27.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t2' -############################# -datatype: and -1 differences found diff --git a/tools/testfiles/h5diff_28.txt b/tools/testfiles/h5diff_28.txt deleted file mode 100644 index 4222159..0000000 --- a/tools/testfiles/h5diff_28.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l2' -############################# -link : and -1 differences found diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt deleted file mode 100644 index d25dc1d..0000000 --- a/tools/testfiles/h5diff_50.txt +++ /dev/null @@ -1,15 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset0a dset0b' -############################# -dataset: and -Warning: different storage datatype - has file datatype H5T_STD_I16LE - has file datatype H5T_STD_I32LE -size: [3x2] [3x2] -position dset0a dset0b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt deleted file mode 100644 index cf20b90..0000000 --- a/tools/testfiles/h5diff_51.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset1a dset1b' -############################# -dataset: and -size: [3x2] [3x2] -position dset1a dset1b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt deleted file mode 100644 index 86e9463..0000000 --- a/tools/testfiles/h5diff_52.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset2a dset2b' -############################# -dataset: and -size: [3x2] [3x2] -position dset2a dset2b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt deleted file mode 100644 index 2763fb3..0000000 --- a/tools/testfiles/h5diff_53.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset3a dset4b' -############################# -dataset: and -size: [3x2] [3x2] -position dset3a dset4b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt deleted file mode 100644 index 4c139de..0000000 --- a/tools/testfiles/h5diff_54.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset4a dset4b' -############################# -dataset: and -size: [3x2] [3x2] -position dset4a dset4b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt deleted file mode 100644 index 2a1d496..0000000 --- a/tools/testfiles/h5diff_55.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset5a dset5b' -############################# -dataset: and -size: [3x2] [3x2] -position dset5a dset5b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt deleted file mode 100644 index 245d1a0..0000000 --- a/tools/testfiles/h5diff_56.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset6a dset6b' -############################# -dataset: and -size: [3x2] [3x2] -position dset6a dset6b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt deleted file mode 100644 index 2b22995..0000000 --- a/tools/testfiles/h5diff_57.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset7a dset7b' -############################# -dataset: and -Warning: different storage datatype - has file datatype H5T_STD_I8LE - has file datatype H5T_STD_U8LE -Comparison not supported: has sign H5T_SGN_2 and has sign H5T_SGN_NONE -0 differences found --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_58.txt b/tools/testfiles/h5diff_58.txt deleted file mode 100644 index b582c88..0000000 --- a/tools/testfiles/h5diff_58.txt +++ /dev/null @@ -1,13 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5 refreg' -############################# -dataset: and -Referenced dataset 10272 10272 ------------------------------------------------------------- -Region blocks -block #0 (2,2)-(7,7) (0,0)-(2,2) -Region points -point #1 (2,2) (3,3) -point #3 (1,6) (2,5) -point #4 (2,8) (1,7) -4 differences found diff --git a/tools/testfiles/h5diff_600.txt b/tools/testfiles/h5diff_600.txt deleted file mode 100644 index 56cc052..0000000 --- a/tools/testfiles/h5diff_600.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff h5diff_basic1.h5' -############################# -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value -h5diff error: missing file names diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt deleted file mode 100644 index cc522bd..0000000 --- a/tools/testfiles/h5diff_602.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -d h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-d h5diff_basic1.h5> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt deleted file mode 100644 index 352e75e..0000000 --- a/tools/testfiles/h5diff_603.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-d -4> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt deleted file mode 100644 index dde3f37..0000000 --- a/tools/testfiles/h5diff_604.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -d 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-d 0> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt deleted file mode 100644 index 8047b46..0000000 --- a/tools/testfiles/h5diff_605.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -d u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-d u> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt deleted file mode 100644 index d1d83a1..0000000 --- a/tools/testfiles/h5diff_606.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -d 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-d 0x1> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt deleted file mode 100644 index 1a7c257..0000000 --- a/tools/testfiles/h5diff_607.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -6 differences found diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt deleted file mode 100644 index 49b490e..0000000 --- a/tools/testfiles/h5diff_608.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -d 1 -d 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -6 differences found diff --git a/tools/testfiles/h5diff_609.txt b/tools/testfiles/h5diff_609.txt deleted file mode 100644 index 9a317f0..0000000 --- a/tools/testfiles/h5diff_609.txt +++ /dev/null @@ -1,3 +0,0 @@ -############################# -Expected output for 'h5diff -d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt deleted file mode 100644 index 1a7c257..0000000 --- a/tools/testfiles/h5diff_610.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -6 differences found diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt deleted file mode 100644 index 0b148a0..0000000 --- a/tools/testfiles/h5diff_611.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -r -p h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-p h5diff_basic1.h5> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt deleted file mode 100644 index 2aa4804..0000000 --- a/tools/testfiles/h5diff_612.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-p -4> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt deleted file mode 100644 index dff7f7c..0000000 --- a/tools/testfiles/h5diff_613.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -p 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-p 0> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt deleted file mode 100644 index 6090f4a..0000000 --- a/tools/testfiles/h5diff_614.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -p u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-p u> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt deleted file mode 100644 index fe7f9a4..0000000 --- a/tools/testfiles/h5diff_615.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -p 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-p 0x1> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt deleted file mode 100644 index 164aa15..0000000 --- a/tools/testfiles/h5diff_616.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -p 0.21 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -2 differences found diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt deleted file mode 100644 index 3f0f078..0000000 --- a/tools/testfiles/h5diff_617.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -p 0.21 -p 0.22 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -2 differences found diff --git a/tools/testfiles/h5diff_618.txt b/tools/testfiles/h5diff_618.txt deleted file mode 100644 index a1bb5a6..0000000 --- a/tools/testfiles/h5diff_618.txt +++ /dev/null @@ -1,3 +0,0 @@ -############################# -Expected output for 'h5diff -p 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt deleted file mode 100644 index f676315..0000000 --- a/tools/testfiles/h5diff_619.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -p 0.005 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -6 differences found diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt deleted file mode 100644 index 9221c76..0000000 --- a/tools/testfiles/h5diff_620.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -n h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-n h5diff_basic1.h5> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt deleted file mode 100644 index e27b486..0000000 --- a/tools/testfiles/h5diff_621.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-n -4> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt deleted file mode 100644 index 4b6c1a1..0000000 --- a/tools/testfiles/h5diff_622.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -n 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-n 0> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt deleted file mode 100644 index f4edf37..0000000 --- a/tools/testfiles/h5diff_623.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -n u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-n u> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt deleted file mode 100644 index babc43f..0000000 --- a/tools/testfiles/h5diff_624.txt +++ /dev/null @@ -1,59 +0,0 @@ -############################# -Expected output for 'h5diff -n 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -<-n 0x1> is not a valid option -usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - file1 File name of the first HDF5 file - file2 File name of the second HDF5 file - [obj1] Name of an HDF5 object, in absolute path - [obj2] Name of an HDF5 object, in absolute path - OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -n C, --count=C Print differences up to C number - -d D, --delta=D Print difference when greater than limit D - -p R, --relative=R Print difference when greater than relative limit R - - C - is a positive integer - D - is a positive number. Compare criteria is |a - b| > D - R - is a positive number. Compare criteria is |(b-a)/a| > R - - Modes of output: - - Default mode: print the number of differences found and where they occured - -r Report mode: print the above plus the differences - -v Verbose mode: print the above plus a list of objects and warnings - -q Quiet mode: do not print output - - Return exit code: - - 1 if differences found, 0 if no differences, -1 if error - - Examples of use: - - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 - - 2) h5diff file1 file2 /g1/dset1 - - Compares object '/g1/dset1' in both files - - 3) h5diff file1 file2 - - Compares all objects in both files - - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files. The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 2) links: name string difference - of the linked value diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt deleted file mode 100644 index 2da804c..0000000 --- a/tools/testfiles/h5diff_625.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -n 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -2 differences found diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt deleted file mode 100644 index 2a5fd2f..0000000 --- a/tools/testfiles/h5diff_626.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -n 2 -n 3 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -3 differences found diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt deleted file mode 100644 index 95ad39a..0000000 --- a/tools/testfiles/h5diff_627.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff --count=200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -6 differences found diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt deleted file mode 100644 index d6fa229..0000000 --- a/tools/testfiles/h5diff_628.txt +++ /dev/null @@ -1,5 +0,0 @@ -############################# -Expected output for 'h5diff -n 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' -############################# -dataset: and -1 differences found diff --git a/tools/testfiles/h5diff_629.txt b/tools/testfiles/h5diff_629.txt deleted file mode 100644 index 9f7632f..0000000 --- a/tools/testfiles/h5diff_629.txt +++ /dev/null @@ -1,4 +0,0 @@ -############################# -Expected output for 'h5diff file1.h6 file2.h6' -############################# -h5diff: : unable to open file diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt deleted file mode 100644 index bc9efbe..0000000 --- a/tools/testfiles/h5diff_70.txt +++ /dev/null @@ -1,2033 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_attr1.h5 h5diff_attr2.h5' -############################# - -file1 file2 ---------------------------------------- - x x / - x x /dset - x x /g1 - -group : and -0 differences found -attribute: > and > -size: [2] [2] -position string of string of difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -attribute: > and > -size: [2] [2] -position VLstring of VLstring of difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -attribute: > and > -size: [2] [2] -position bitfield of bitfield of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position opaque of opaque of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position compound of compound of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 1 ] 3 0 3 -[ 1 ] 4 0 4 -4 differences found -attribute: > and > -size: [2] [2] -position enum of enum of difference ------------------------------------------------------------- -[ 0 ] RED GREEN -[ 1 ] RED GREEN -2 differences found -attribute: > and > -size: [2] [2] -position vlen of vlen of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -[ 1 ] 3 0 3 -3 differences found -attribute: > and > -size: [2] [2] -position array of array of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 0 ] 3 0 3 -[ 1 ] 4 0 4 -[ 1 ] 5 0 5 -[ 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [2] [2] -position integer of integer of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position float of float of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [3x2] [3x2] -position string2D of string2D of difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -attribute: > and > -size: [3x2] [3x2] -position VLstring2D of VLstring2D of difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -attribute: > and > -size: [3x2] [3x2] -position bitfield2D of bitfield2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position opaque2D of opaque2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position compound2D of compound2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 1 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 1 0 ] 5 0 5 -[ 1 0 ] 6 0 6 -[ 1 1 ] 7 0 7 -[ 1 1 ] 8 0 8 -[ 2 0 ] 9 0 9 -[ 2 0 ] 10 0 10 -[ 2 1 ] 11 0 11 -[ 2 1 ] 12 0 12 -12 differences found -attribute: > and > -size: [3x2] [3x2] -position enum2D of enum2D of difference ------------------------------------------------------------- -[ 0 0 ] RED GREEN -[ 0 1 ] RED GREEN -[ 1 0 ] RED GREEN -[ 1 1 ] RED GREEN -[ 2 0 ] RED GREEN -[ 2 1 ] RED GREEN -6 differences found -attribute: > and > -size: [3x2] [3x2] -position vlen2D of vlen2D of difference ------------------------------------------------------------- -[ 0 1 ] 1 0 1 -[ 1 0 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 1 1 ] 5 0 5 -[ 2 0 ] 6 0 6 -[ 2 0 ] 7 0 7 -[ 2 0 ] 8 0 8 -[ 2 1 ] 9 0 9 -[ 2 1 ] 10 0 10 -[ 2 1 ] 11 0 11 -11 differences found -attribute: > and > -size: [3x2] [3x2] -position array2D of array2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 0 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 0 1 ] 5 0 5 -[ 0 1 ] 6 0 6 -[ 1 0 ] 7 0 7 -[ 1 0 ] 8 0 8 -[ 1 0 ] 9 0 9 -[ 1 1 ] 10 0 10 -[ 1 1 ] 11 0 11 -[ 1 1 ] 12 0 12 -[ 2 0 ] 13 0 13 -[ 2 0 ] 14 0 14 -[ 2 0 ] 15 0 15 -[ 2 1 ] 16 0 16 -[ 2 1 ] 17 0 17 -[ 2 1 ] 18 0 18 -18 differences found -attribute: > and > -size: [3x2] [3x2] -position integer2D of integer2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position float2D of float2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position string3D of string3D of difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position VLstring3D of VLstring3D of difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position bitfield3D of bitfield3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position opaque3D of opaque3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position compound3D of compound3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 0 ] 2 0 2 -[ 0 0 1 ] 3 0 3 -[ 0 0 1 ] 4 0 4 -[ 0 1 0 ] 5 0 5 -[ 0 1 0 ] 6 0 6 -[ 0 1 1 ] 7 0 7 -[ 0 1 1 ] 8 0 8 -[ 0 2 0 ] 9 0 9 -[ 0 2 0 ] 10 0 10 -[ 0 2 1 ] 11 0 11 -[ 0 2 1 ] 12 0 12 -[ 1 0 0 ] 13 0 13 -[ 1 0 0 ] 14 0 14 -[ 1 0 1 ] 15 0 15 -[ 1 0 1 ] 16 0 16 -[ 1 1 0 ] 17 0 17 -[ 1 1 0 ] 18 0 18 -[ 1 1 1 ] 19 0 19 -[ 1 1 1 ] 20 0 20 -[ 1 2 0 ] 21 0 21 -[ 1 2 0 ] 22 0 22 -[ 1 2 1 ] 23 0 23 -[ 1 2 1 ] 24 0 24 -[ 2 0 0 ] 25 0 25 -[ 2 0 0 ] 26 0 26 -[ 2 0 1 ] 27 0 27 -[ 2 0 1 ] 28 0 28 -[ 2 1 0 ] 29 0 29 -[ 2 1 0 ] 30 0 30 -[ 2 1 1 ] 31 0 31 -[ 2 1 1 ] 32 0 32 -[ 2 2 0 ] 33 0 33 -[ 2 2 0 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 2 2 1 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 1 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 1 0 ] 41 0 41 -[ 3 1 0 ] 42 0 42 -[ 3 1 1 ] 43 0 43 -[ 3 1 1 ] 44 0 44 -[ 3 2 0 ] 45 0 45 -[ 3 2 0 ] 46 0 46 -[ 3 2 1 ] 47 0 47 -[ 3 2 1 ] 48 0 48 -48 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position enum3D of enum3D of difference ------------------------------------------------------------- -[ 0 0 0 ] GREEN RED -[ 0 0 1 ] GREEN RED -[ 0 1 0 ] GREEN RED -[ 0 1 1 ] GREEN RED -[ 0 2 0 ] GREEN RED -[ 0 2 1 ] GREEN RED -[ 1 0 0 ] GREEN RED -[ 1 0 1 ] GREEN RED -[ 1 1 0 ] GREEN RED -[ 1 1 1 ] GREEN RED -[ 1 2 0 ] GREEN RED -[ 1 2 1 ] GREEN RED -[ 2 0 0 ] GREEN RED -[ 2 0 1 ] GREEN RED -[ 2 1 0 ] GREEN RED -[ 2 1 1 ] GREEN RED -[ 2 2 0 ] GREEN RED -[ 2 2 1 ] GREEN RED -[ 3 0 0 ] GREEN RED -[ 3 0 1 ] GREEN RED -[ 3 1 0 ] GREEN RED -[ 3 1 1 ] GREEN RED -[ 3 2 0 ] GREEN RED -[ 3 2 1 ] GREEN RED -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position vlen3D of vlen3D of difference ------------------------------------------------------------- -[ 0 0 1 ] 1 0 1 -[ 0 1 0 ] 2 0 2 -[ 0 1 1 ] 3 0 3 -[ 0 2 0 ] 4 0 4 -[ 0 2 1 ] 5 0 5 -[ 1 0 0 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 0 1 ] 9 0 9 -[ 1 1 0 ] 10 0 10 -[ 1 1 0 ] 11 0 11 -[ 1 1 1 ] 12 0 12 -[ 1 1 1 ] 13 0 13 -[ 1 2 0 ] 14 0 14 -[ 1 2 0 ] 15 0 15 -[ 1 2 1 ] 16 0 16 -[ 1 2 1 ] 17 0 17 -[ 2 0 0 ] 18 0 18 -[ 2 0 0 ] 19 0 19 -[ 2 0 0 ] 20 0 20 -[ 2 0 1 ] 21 0 21 -[ 2 0 1 ] 22 0 22 -[ 2 0 1 ] 23 0 23 -[ 2 1 0 ] 24 0 24 -[ 2 1 0 ] 25 0 25 -[ 2 1 0 ] 26 0 26 -[ 2 1 1 ] 27 0 27 -[ 2 1 1 ] 28 0 28 -[ 2 1 1 ] 29 0 29 -[ 2 2 0 ] 30 0 30 -[ 2 2 0 ] 31 0 31 -[ 2 2 0 ] 32 0 32 -[ 2 2 1 ] 33 0 33 -[ 2 2 1 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 3 0 0 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 0 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 0 1 ] 41 0 41 -[ 3 0 1 ] 42 0 42 -[ 3 0 1 ] 43 0 43 -[ 3 1 0 ] 44 0 44 -[ 3 1 0 ] 45 0 45 -[ 3 1 0 ] 46 0 46 -[ 3 1 0 ] 47 0 47 -[ 3 1 1 ] 48 0 48 -[ 3 1 1 ] 49 0 49 -[ 3 1 1 ] 50 0 50 -[ 3 1 1 ] 51 0 51 -[ 3 2 0 ] 52 0 52 -[ 3 2 0 ] 53 0 53 -[ 3 2 0 ] 54 0 54 -[ 3 2 0 ] 55 0 55 -[ 3 2 1 ] 56 0 56 -[ 3 2 1 ] 57 0 57 -[ 3 2 1 ] 58 0 58 -[ 3 2 1 ] 59 0 59 -59 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position array3D of array3D of 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 1 0 ] 7 0 7 -[ 0 1 0 ] 8 0 8 -[ 0 1 0 ] 9 0 9 -[ 0 1 1 ] 10 0 10 -[ 0 1 1 ] 11 0 11 -[ 0 1 1 ] 12 0 12 -[ 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 -[ 1 0 0 ] 19 0 19 -[ 1 0 0 ] 20 0 20 -[ 1 0 0 ] 21 0 21 -[ 1 0 1 ] 22 0 22 -[ 1 0 1 ] 23 0 23 -[ 1 0 1 ] 24 0 24 -[ 1 1 0 ] 25 0 25 -[ 1 1 0 ] 26 0 26 -[ 1 1 0 ] 27 0 27 -[ 1 1 1 ] 28 0 28 -[ 1 1 1 ] 29 0 29 -[ 1 1 1 ] 30 0 30 -[ 1 2 0 ] 31 0 31 -[ 1 2 0 ] 32 0 32 -[ 1 2 0 ] 33 0 33 -[ 1 2 1 ] 34 0 34 -[ 1 2 1 ] 35 0 35 -[ 1 2 1 ] 36 0 36 -[ 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 1 0 ] 43 0 43 -[ 2 1 0 ] 44 0 44 -[ 2 1 0 ] 45 0 45 -[ 2 1 1 ] 46 0 46 -[ 2 1 1 ] 47 0 47 -[ 2 1 1 ] 48 0 48 -[ 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 -[ 3 0 0 ] 55 0 55 -[ 3 0 0 ] 56 0 56 -[ 3 0 0 ] 57 0 57 -[ 3 0 1 ] 58 0 58 -[ 3 0 1 ] 59 0 59 -[ 3 0 1 ] 60 0 60 -[ 3 1 0 ] 61 0 61 -[ 3 1 0 ] 62 0 62 -[ 3 1 0 ] 63 0 63 -[ 3 1 1 ] 64 0 64 -[ 3 1 1 ] 65 0 65 -[ 3 1 1 ] 66 0 66 -[ 3 2 0 ] 67 0 67 -[ 3 2 0 ] 68 0 68 -[ 3 2 0 ] 69 0 69 -[ 3 2 1 ] 70 0 70 -[ 3 2 1 ] 71 0 71 -[ 3 2 1 ] 72 0 72 -72 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position integer3D of integer3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position float3D of float3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -dataset: and - or are empty datasets -attribute: > and > -size: [2] [2] -position string of string of difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -attribute: > and > -size: [2] [2] -position VLstring of VLstring of difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -attribute: > and > -size: [2] [2] -position bitfield of bitfield of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position opaque of opaque of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position compound of compound of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 1 ] 3 0 3 -[ 1 ] 4 0 4 -4 differences found -attribute: > and > -0 differences found -attribute: > and > -size: [2] [2] -position enum of enum of difference ------------------------------------------------------------- -[ 0 ] RED GREEN -[ 1 ] RED GREEN -2 differences found -attribute: > and > -size: [2] [2] -position vlen of vlen of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -[ 1 ] 3 0 3 -3 differences found -attribute: > and > -size: [2] [2] -position array of array of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 0 ] 3 0 3 -[ 1 ] 4 0 4 -[ 1 ] 5 0 5 -[ 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [2] [2] -position integer of integer of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position float of float of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [3x2] [3x2] -position string2D of string2D of difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -attribute: > and > -size: [3x2] [3x2] -position VLstring2D of VLstring2D of difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -attribute: > and > -size: [3x2] [3x2] -position bitfield2D of bitfield2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position opaque2D of opaque2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position compound2D of compound2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 1 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 1 0 ] 5 0 5 -[ 1 0 ] 6 0 6 -[ 1 1 ] 7 0 7 -[ 1 1 ] 8 0 8 -[ 2 0 ] 9 0 9 -[ 2 0 ] 10 0 10 -[ 2 1 ] 11 0 11 -[ 2 1 ] 12 0 12 -12 differences found -attribute: > and > -0 differences found -attribute: > and > -size: [3x2] [3x2] -position enum2D of enum2D of difference ------------------------------------------------------------- -[ 0 0 ] RED GREEN -[ 0 1 ] RED GREEN -[ 1 0 ] RED GREEN -[ 1 1 ] RED GREEN -[ 2 0 ] RED GREEN -[ 2 1 ] RED GREEN -6 differences found -attribute: > and > -size: [3x2] [3x2] -position vlen2D of vlen2D of difference ------------------------------------------------------------- -[ 0 1 ] 1 0 1 -[ 1 0 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 1 1 ] 5 0 5 -[ 2 0 ] 6 0 6 -[ 2 0 ] 7 0 7 -[ 2 0 ] 8 0 8 -[ 2 1 ] 9 0 9 -[ 2 1 ] 10 0 10 -[ 2 1 ] 11 0 11 -11 differences found -attribute: > and > -size: [3x2] [3x2] -position array2D of array2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 0 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 0 1 ] 5 0 5 -[ 0 1 ] 6 0 6 -[ 1 0 ] 7 0 7 -[ 1 0 ] 8 0 8 -[ 1 0 ] 9 0 9 -[ 1 1 ] 10 0 10 -[ 1 1 ] 11 0 11 -[ 1 1 ] 12 0 12 -[ 2 0 ] 13 0 13 -[ 2 0 ] 14 0 14 -[ 2 0 ] 15 0 15 -[ 2 1 ] 16 0 16 -[ 2 1 ] 17 0 17 -[ 2 1 ] 18 0 18 -18 differences found -attribute: > and > -size: [3x2] [3x2] -position integer2D of integer2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position float2D of float2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position string3D of string3D of difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position VLstring3D of VLstring3D of difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position bitfield3D of bitfield3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position opaque3D of opaque3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position compound3D of compound3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 0 ] 2 0 2 -[ 0 0 1 ] 3 0 3 -[ 0 0 1 ] 4 0 4 -[ 0 1 0 ] 5 0 5 -[ 0 1 0 ] 6 0 6 -[ 0 1 1 ] 7 0 7 -[ 0 1 1 ] 8 0 8 -[ 0 2 0 ] 9 0 9 -[ 0 2 0 ] 10 0 10 -[ 0 2 1 ] 11 0 11 -[ 0 2 1 ] 12 0 12 -[ 1 0 0 ] 13 0 13 -[ 1 0 0 ] 14 0 14 -[ 1 0 1 ] 15 0 15 -[ 1 0 1 ] 16 0 16 -[ 1 1 0 ] 17 0 17 -[ 1 1 0 ] 18 0 18 -[ 1 1 1 ] 19 0 19 -[ 1 1 1 ] 20 0 20 -[ 1 2 0 ] 21 0 21 -[ 1 2 0 ] 22 0 22 -[ 1 2 1 ] 23 0 23 -[ 1 2 1 ] 24 0 24 -[ 2 0 0 ] 25 0 25 -[ 2 0 0 ] 26 0 26 -[ 2 0 1 ] 27 0 27 -[ 2 0 1 ] 28 0 28 -[ 2 1 0 ] 29 0 29 -[ 2 1 0 ] 30 0 30 -[ 2 1 1 ] 31 0 31 -[ 2 1 1 ] 32 0 32 -[ 2 2 0 ] 33 0 33 -[ 2 2 0 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 2 2 1 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 1 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 1 0 ] 41 0 41 -[ 3 1 0 ] 42 0 42 -[ 3 1 1 ] 43 0 43 -[ 3 1 1 ] 44 0 44 -[ 3 2 0 ] 45 0 45 -[ 3 2 0 ] 46 0 46 -[ 3 2 1 ] 47 0 47 -[ 3 2 1 ] 48 0 48 -48 differences found -attribute: > and > -0 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position enum3D of enum3D of difference ------------------------------------------------------------- -[ 0 0 0 ] GREEN RED -[ 0 0 1 ] GREEN RED -[ 0 1 0 ] GREEN RED -[ 0 1 1 ] GREEN RED -[ 0 2 0 ] GREEN RED -[ 0 2 1 ] GREEN RED -[ 1 0 0 ] GREEN RED -[ 1 0 1 ] GREEN RED -[ 1 1 0 ] GREEN RED -[ 1 1 1 ] GREEN RED -[ 1 2 0 ] GREEN RED -[ 1 2 1 ] GREEN RED -[ 2 0 0 ] GREEN RED -[ 2 0 1 ] GREEN RED -[ 2 1 0 ] GREEN RED -[ 2 1 1 ] GREEN RED -[ 2 2 0 ] GREEN RED -[ 2 2 1 ] GREEN RED -[ 3 0 0 ] GREEN RED -[ 3 0 1 ] GREEN RED -[ 3 1 0 ] GREEN RED -[ 3 1 1 ] GREEN RED -[ 3 2 0 ] GREEN RED -[ 3 2 1 ] GREEN RED -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position vlen3D of vlen3D of difference ------------------------------------------------------------- -[ 0 0 1 ] 1 0 1 -[ 0 1 0 ] 2 0 2 -[ 0 1 1 ] 3 0 3 -[ 0 2 0 ] 4 0 4 -[ 0 2 1 ] 5 0 5 -[ 1 0 0 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 0 1 ] 9 0 9 -[ 1 1 0 ] 10 0 10 -[ 1 1 0 ] 11 0 11 -[ 1 1 1 ] 12 0 12 -[ 1 1 1 ] 13 0 13 -[ 1 2 0 ] 14 0 14 -[ 1 2 0 ] 15 0 15 -[ 1 2 1 ] 16 0 16 -[ 1 2 1 ] 17 0 17 -[ 2 0 0 ] 18 0 18 -[ 2 0 0 ] 19 0 19 -[ 2 0 0 ] 20 0 20 -[ 2 0 1 ] 21 0 21 -[ 2 0 1 ] 22 0 22 -[ 2 0 1 ] 23 0 23 -[ 2 1 0 ] 24 0 24 -[ 2 1 0 ] 25 0 25 -[ 2 1 0 ] 26 0 26 -[ 2 1 1 ] 27 0 27 -[ 2 1 1 ] 28 0 28 -[ 2 1 1 ] 29 0 29 -[ 2 2 0 ] 30 0 30 -[ 2 2 0 ] 31 0 31 -[ 2 2 0 ] 32 0 32 -[ 2 2 1 ] 33 0 33 -[ 2 2 1 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 3 0 0 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 0 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 0 1 ] 41 0 41 -[ 3 0 1 ] 42 0 42 -[ 3 0 1 ] 43 0 43 -[ 3 1 0 ] 44 0 44 -[ 3 1 0 ] 45 0 45 -[ 3 1 0 ] 46 0 46 -[ 3 1 0 ] 47 0 47 -[ 3 1 1 ] 48 0 48 -[ 3 1 1 ] 49 0 49 -[ 3 1 1 ] 50 0 50 -[ 3 1 1 ] 51 0 51 -[ 3 2 0 ] 52 0 52 -[ 3 2 0 ] 53 0 53 -[ 3 2 0 ] 54 0 54 -[ 3 2 0 ] 55 0 55 -[ 3 2 1 ] 56 0 56 -[ 3 2 1 ] 57 0 57 -[ 3 2 1 ] 58 0 58 -[ 3 2 1 ] 59 0 59 -59 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position array3D of array3D of 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 1 0 ] 7 0 7 -[ 0 1 0 ] 8 0 8 -[ 0 1 0 ] 9 0 9 -[ 0 1 1 ] 10 0 10 -[ 0 1 1 ] 11 0 11 -[ 0 1 1 ] 12 0 12 -[ 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 -[ 1 0 0 ] 19 0 19 -[ 1 0 0 ] 20 0 20 -[ 1 0 0 ] 21 0 21 -[ 1 0 1 ] 22 0 22 -[ 1 0 1 ] 23 0 23 -[ 1 0 1 ] 24 0 24 -[ 1 1 0 ] 25 0 25 -[ 1 1 0 ] 26 0 26 -[ 1 1 0 ] 27 0 27 -[ 1 1 1 ] 28 0 28 -[ 1 1 1 ] 29 0 29 -[ 1 1 1 ] 30 0 30 -[ 1 2 0 ] 31 0 31 -[ 1 2 0 ] 32 0 32 -[ 1 2 0 ] 33 0 33 -[ 1 2 1 ] 34 0 34 -[ 1 2 1 ] 35 0 35 -[ 1 2 1 ] 36 0 36 -[ 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 1 0 ] 43 0 43 -[ 2 1 0 ] 44 0 44 -[ 2 1 0 ] 45 0 45 -[ 2 1 1 ] 46 0 46 -[ 2 1 1 ] 47 0 47 -[ 2 1 1 ] 48 0 48 -[ 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 -[ 3 0 0 ] 55 0 55 -[ 3 0 0 ] 56 0 56 -[ 3 0 0 ] 57 0 57 -[ 3 0 1 ] 58 0 58 -[ 3 0 1 ] 59 0 59 -[ 3 0 1 ] 60 0 60 -[ 3 1 0 ] 61 0 61 -[ 3 1 0 ] 62 0 62 -[ 3 1 0 ] 63 0 63 -[ 3 1 1 ] 64 0 64 -[ 3 1 1 ] 65 0 65 -[ 3 1 1 ] 66 0 66 -[ 3 2 0 ] 67 0 67 -[ 3 2 0 ] 68 0 68 -[ 3 2 0 ] 69 0 69 -[ 3 2 1 ] 70 0 70 -[ 3 2 1 ] 71 0 71 -[ 3 2 1 ] 72 0 72 -72 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position integer3D of integer3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position float3D of float3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -519 differences found -group : and -0 differences found -attribute: > and > -size: [2] [2] -position string of string of difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -attribute: > and > -size: [2] [2] -position VLstring of VLstring of difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -attribute: > and > -size: [2] [2] -position bitfield of bitfield of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position opaque of opaque of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position compound of compound of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 1 ] 3 0 3 -[ 1 ] 4 0 4 -4 differences found -attribute: > and > -size: [2] [2] -position enum of enum of difference ------------------------------------------------------------- -[ 0 ] RED GREEN -[ 1 ] RED GREEN -2 differences found -attribute: > and > -size: [2] [2] -position vlen of vlen of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -[ 1 ] 3 0 3 -3 differences found -attribute: > and > -size: [2] [2] -position array of array of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 0 ] 3 0 3 -[ 1 ] 4 0 4 -[ 1 ] 5 0 5 -[ 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [2] [2] -position integer of integer of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [2] [2] -position float of float of difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -attribute: > and > -size: [3x2] [3x2] -position string2D of string2D of difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -attribute: > and > -size: [3x2] [3x2] -position VLstring2D of VLstring2D of difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -attribute: > and > -size: [3x2] [3x2] -position bitfield2D of bitfield2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position opaque2D of opaque2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position compound2D of compound2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 1 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 1 0 ] 5 0 5 -[ 1 0 ] 6 0 6 -[ 1 1 ] 7 0 7 -[ 1 1 ] 8 0 8 -[ 2 0 ] 9 0 9 -[ 2 0 ] 10 0 10 -[ 2 1 ] 11 0 11 -[ 2 1 ] 12 0 12 -12 differences found -attribute: > and > -size: [3x2] [3x2] -position enum2D of enum2D of difference ------------------------------------------------------------- -[ 0 0 ] RED GREEN -[ 0 1 ] RED GREEN -[ 1 0 ] RED GREEN -[ 1 1 ] RED GREEN -[ 2 0 ] RED GREEN -[ 2 1 ] RED GREEN -6 differences found -attribute: > and > -size: [3x2] [3x2] -position vlen2D of vlen2D of difference ------------------------------------------------------------- -[ 0 1 ] 1 0 1 -[ 1 0 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 1 1 ] 5 0 5 -[ 2 0 ] 6 0 6 -[ 2 0 ] 7 0 7 -[ 2 0 ] 8 0 8 -[ 2 1 ] 9 0 9 -[ 2 1 ] 10 0 10 -[ 2 1 ] 11 0 11 -11 differences found -attribute: > and > -size: [3x2] [3x2] -position array2D of array2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 0 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 0 1 ] 5 0 5 -[ 0 1 ] 6 0 6 -[ 1 0 ] 7 0 7 -[ 1 0 ] 8 0 8 -[ 1 0 ] 9 0 9 -[ 1 1 ] 10 0 10 -[ 1 1 ] 11 0 11 -[ 1 1 ] 12 0 12 -[ 2 0 ] 13 0 13 -[ 2 0 ] 14 0 14 -[ 2 0 ] 15 0 15 -[ 2 1 ] 16 0 16 -[ 2 1 ] 17 0 17 -[ 2 1 ] 18 0 18 -18 differences found -attribute: > and > -size: [3x2] [3x2] -position integer2D of integer2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [3x2] [3x2] -position float2D of float2D of difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position string3D of string3D of difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position VLstring3D of VLstring3D of difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position bitfield3D of bitfield3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position opaque3D of opaque3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position compound3D of compound3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 0 ] 2 0 2 -[ 0 0 1 ] 3 0 3 -[ 0 0 1 ] 4 0 4 -[ 0 1 0 ] 5 0 5 -[ 0 1 0 ] 6 0 6 -[ 0 1 1 ] 7 0 7 -[ 0 1 1 ] 8 0 8 -[ 0 2 0 ] 9 0 9 -[ 0 2 0 ] 10 0 10 -[ 0 2 1 ] 11 0 11 -[ 0 2 1 ] 12 0 12 -[ 1 0 0 ] 13 0 13 -[ 1 0 0 ] 14 0 14 -[ 1 0 1 ] 15 0 15 -[ 1 0 1 ] 16 0 16 -[ 1 1 0 ] 17 0 17 -[ 1 1 0 ] 18 0 18 -[ 1 1 1 ] 19 0 19 -[ 1 1 1 ] 20 0 20 -[ 1 2 0 ] 21 0 21 -[ 1 2 0 ] 22 0 22 -[ 1 2 1 ] 23 0 23 -[ 1 2 1 ] 24 0 24 -[ 2 0 0 ] 25 0 25 -[ 2 0 0 ] 26 0 26 -[ 2 0 1 ] 27 0 27 -[ 2 0 1 ] 28 0 28 -[ 2 1 0 ] 29 0 29 -[ 2 1 0 ] 30 0 30 -[ 2 1 1 ] 31 0 31 -[ 2 1 1 ] 32 0 32 -[ 2 2 0 ] 33 0 33 -[ 2 2 0 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 2 2 1 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 1 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 1 0 ] 41 0 41 -[ 3 1 0 ] 42 0 42 -[ 3 1 1 ] 43 0 43 -[ 3 1 1 ] 44 0 44 -[ 3 2 0 ] 45 0 45 -[ 3 2 0 ] 46 0 46 -[ 3 2 1 ] 47 0 47 -[ 3 2 1 ] 48 0 48 -48 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position enum3D of enum3D of difference ------------------------------------------------------------- -[ 0 0 0 ] GREEN RED -[ 0 0 1 ] GREEN RED -[ 0 1 0 ] GREEN RED -[ 0 1 1 ] GREEN RED -[ 0 2 0 ] GREEN RED -[ 0 2 1 ] GREEN RED -[ 1 0 0 ] GREEN RED -[ 1 0 1 ] GREEN RED -[ 1 1 0 ] GREEN RED -[ 1 1 1 ] GREEN RED -[ 1 2 0 ] GREEN RED -[ 1 2 1 ] GREEN RED -[ 2 0 0 ] GREEN RED -[ 2 0 1 ] GREEN RED -[ 2 1 0 ] GREEN RED -[ 2 1 1 ] GREEN RED -[ 2 2 0 ] GREEN RED -[ 2 2 1 ] GREEN RED -[ 3 0 0 ] GREEN RED -[ 3 0 1 ] GREEN RED -[ 3 1 0 ] GREEN RED -[ 3 1 1 ] GREEN RED -[ 3 2 0 ] GREEN RED -[ 3 2 1 ] GREEN RED -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position vlen3D of vlen3D of difference ------------------------------------------------------------- -[ 0 0 1 ] 1 0 1 -[ 0 1 0 ] 2 0 2 -[ 0 1 1 ] 3 0 3 -[ 0 2 0 ] 4 0 4 -[ 0 2 1 ] 5 0 5 -[ 1 0 0 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 0 1 ] 9 0 9 -[ 1 1 0 ] 10 0 10 -[ 1 1 0 ] 11 0 11 -[ 1 1 1 ] 12 0 12 -[ 1 1 1 ] 13 0 13 -[ 1 2 0 ] 14 0 14 -[ 1 2 0 ] 15 0 15 -[ 1 2 1 ] 16 0 16 -[ 1 2 1 ] 17 0 17 -[ 2 0 0 ] 18 0 18 -[ 2 0 0 ] 19 0 19 -[ 2 0 0 ] 20 0 20 -[ 2 0 1 ] 21 0 21 -[ 2 0 1 ] 22 0 22 -[ 2 0 1 ] 23 0 23 -[ 2 1 0 ] 24 0 24 -[ 2 1 0 ] 25 0 25 -[ 2 1 0 ] 26 0 26 -[ 2 1 1 ] 27 0 27 -[ 2 1 1 ] 28 0 28 -[ 2 1 1 ] 29 0 29 -[ 2 2 0 ] 30 0 30 -[ 2 2 0 ] 31 0 31 -[ 2 2 0 ] 32 0 32 -[ 2 2 1 ] 33 0 33 -[ 2 2 1 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 3 0 0 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 0 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 0 1 ] 41 0 41 -[ 3 0 1 ] 42 0 42 -[ 3 0 1 ] 43 0 43 -[ 3 1 0 ] 44 0 44 -[ 3 1 0 ] 45 0 45 -[ 3 1 0 ] 46 0 46 -[ 3 1 0 ] 47 0 47 -[ 3 1 1 ] 48 0 48 -[ 3 1 1 ] 49 0 49 -[ 3 1 1 ] 50 0 50 -[ 3 1 1 ] 51 0 51 -[ 3 2 0 ] 52 0 52 -[ 3 2 0 ] 53 0 53 -[ 3 2 0 ] 54 0 54 -[ 3 2 0 ] 55 0 55 -[ 3 2 1 ] 56 0 56 -[ 3 2 1 ] 57 0 57 -[ 3 2 1 ] 58 0 58 -[ 3 2 1 ] 59 0 59 -59 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position array3D of array3D of 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 1 0 ] 7 0 7 -[ 0 1 0 ] 8 0 8 -[ 0 1 0 ] 9 0 9 -[ 0 1 1 ] 10 0 10 -[ 0 1 1 ] 11 0 11 -[ 0 1 1 ] 12 0 12 -[ 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 -[ 1 0 0 ] 19 0 19 -[ 1 0 0 ] 20 0 20 -[ 1 0 0 ] 21 0 21 -[ 1 0 1 ] 22 0 22 -[ 1 0 1 ] 23 0 23 -[ 1 0 1 ] 24 0 24 -[ 1 1 0 ] 25 0 25 -[ 1 1 0 ] 26 0 26 -[ 1 1 0 ] 27 0 27 -[ 1 1 1 ] 28 0 28 -[ 1 1 1 ] 29 0 29 -[ 1 1 1 ] 30 0 30 -[ 1 2 0 ] 31 0 31 -[ 1 2 0 ] 32 0 32 -[ 1 2 0 ] 33 0 33 -[ 1 2 1 ] 34 0 34 -[ 1 2 1 ] 35 0 35 -[ 1 2 1 ] 36 0 36 -[ 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 1 0 ] 43 0 43 -[ 2 1 0 ] 44 0 44 -[ 2 1 0 ] 45 0 45 -[ 2 1 1 ] 46 0 46 -[ 2 1 1 ] 47 0 47 -[ 2 1 1 ] 48 0 48 -[ 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 -[ 3 0 0 ] 55 0 55 -[ 3 0 0 ] 56 0 56 -[ 3 0 0 ] 57 0 57 -[ 3 0 1 ] 58 0 58 -[ 3 0 1 ] 59 0 59 -[ 3 0 1 ] 60 0 60 -[ 3 1 0 ] 61 0 61 -[ 3 1 0 ] 62 0 62 -[ 3 1 0 ] 63 0 63 -[ 3 1 1 ] 64 0 64 -[ 3 1 1 ] 65 0 65 -[ 3 1 1 ] 66 0 66 -[ 3 2 0 ] 67 0 67 -[ 3 2 0 ] 68 0 68 -[ 3 2 0 ] 69 0 69 -[ 3 2 1 ] 70 0 70 -[ 3 2 1 ] 71 0 71 -[ 3 2 1 ] 72 0 72 -72 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position integer3D of integer3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -attribute: > and > -size: [4x3x2] [4x3x2] -position float3D of float3D of difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt deleted file mode 100644 index 9c0bd33..0000000 --- a/tools/testfiles/h5diff_80.txt +++ /dev/null @@ -1,871 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5' -############################# - -file1 file2 ---------------------------------------- - x x / - x x /dset - x x /dsetref - x x /g1 - x x /g1/VLstring - x x /g1/VLstring2D - x x /g1/VLstring3D - x x /g1/array - x x /g1/array2D - x x /g1/array3D - x x /g1/bitfield - x x /g1/bitfield2D - x x /g1/bitfield3D - x x /g1/compound - x x /g1/compound2D - x x /g1/compound3D - x x /g1/enum - x x /g1/enum2D - x x /g1/enum3D - x x /g1/float - x x /g1/float2D - x x /g1/float3D - x x /g1/integer - x x /g1/integer2D - x x /g1/integer3D - x x /g1/opaque - x x /g1/opaque2D - x x /g1/opaque3D - x x /g1/reference - x x /g1/reference2D - x x /g1/reference3D - x x /g1/string - x x /g1/string2D - x x /g1/string3D - x x /g1/vlen - x x /g1/vlen2D - x x /g1/vlen3D - x x /refreg - -group : and -0 differences found -dataset: and -size: [2] [2] -position dset dset difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -dataset: and -0 differences found -group : and -0 differences found -dataset: and -size: [2] [2] -position VLstring VLstring difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -dataset: and -size: [3x2] [3x2] -position VLstring2D VLstring2D difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -dataset: and -size: [4x3x2] [4x3x2] -position VLstring3D VLstring3D difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -dataset: and -size: [2] [2] -position array array difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 0 ] 3 0 3 -[ 1 ] 4 0 4 -[ 1 ] 5 0 5 -[ 1 ] 6 0 6 -6 differences found -dataset: and -size: [3x2] [3x2] -position array2D array2D difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 0 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 0 1 ] 5 0 5 -[ 0 1 ] 6 0 6 -[ 1 0 ] 7 0 7 -[ 1 0 ] 8 0 8 -[ 1 0 ] 9 0 9 -[ 1 1 ] 10 0 10 -[ 1 1 ] 11 0 11 -[ 1 1 ] 12 0 12 -[ 2 0 ] 13 0 13 -[ 2 0 ] 14 0 14 -[ 2 0 ] 15 0 15 -[ 2 1 ] 16 0 16 -[ 2 1 ] 17 0 17 -[ 2 1 ] 18 0 18 -18 differences found -dataset: and -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 1 0 ] 7 0 7 -[ 0 1 0 ] 8 0 8 -[ 0 1 0 ] 9 0 9 -[ 0 1 1 ] 10 0 10 -[ 0 1 1 ] 11 0 11 -[ 0 1 1 ] 12 0 12 -[ 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 -[ 1 0 0 ] 19 0 19 -[ 1 0 0 ] 20 0 20 -[ 1 0 0 ] 21 0 21 -[ 1 0 1 ] 22 0 22 -[ 1 0 1 ] 23 0 23 -[ 1 0 1 ] 24 0 24 -[ 1 1 0 ] 25 0 25 -[ 1 1 0 ] 26 0 26 -[ 1 1 0 ] 27 0 27 -[ 1 1 1 ] 28 0 28 -[ 1 1 1 ] 29 0 29 -[ 1 1 1 ] 30 0 30 -[ 1 2 0 ] 31 0 31 -[ 1 2 0 ] 32 0 32 -[ 1 2 0 ] 33 0 33 -[ 1 2 1 ] 34 0 34 -[ 1 2 1 ] 35 0 35 -[ 1 2 1 ] 36 0 36 -[ 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 1 0 ] 43 0 43 -[ 2 1 0 ] 44 0 44 -[ 2 1 0 ] 45 0 45 -[ 2 1 1 ] 46 0 46 -[ 2 1 1 ] 47 0 47 -[ 2 1 1 ] 48 0 48 -[ 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 -[ 3 0 0 ] 55 0 55 -[ 3 0 0 ] 56 0 56 -[ 3 0 0 ] 57 0 57 -[ 3 0 1 ] 58 0 58 -[ 3 0 1 ] 59 0 59 -[ 3 0 1 ] 60 0 60 -[ 3 1 0 ] 61 0 61 -[ 3 1 0 ] 62 0 62 -[ 3 1 0 ] 63 0 63 -[ 3 1 1 ] 64 0 64 -[ 3 1 1 ] 65 0 65 -[ 3 1 1 ] 66 0 66 -[ 3 2 0 ] 67 0 67 -[ 3 2 0 ] 68 0 68 -[ 3 2 0 ] 69 0 69 -[ 3 2 1 ] 70 0 70 -[ 3 2 1 ] 71 0 71 -[ 3 2 1 ] 72 0 72 -72 differences found -dataset: and -size: [2] [2] -position bitfield bitfield difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -dataset: and -size: [3x2] [3x2] -position bitfield2D bitfield2D difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -dataset: and -size: [4x3x2] [4x3x2] -position bitfield3D bitfield3D difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -dataset: and -size: [2] [2] -position compound compound difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 0 ] 2 0 2 -[ 1 ] 3 0 3 -[ 1 ] 4 0 4 -4 differences found -dataset: and -size: [3x2] [3x2] -position compound2D compound2D difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 0 ] 2 0 2 -[ 0 1 ] 3 0 3 -[ 0 1 ] 4 0 4 -[ 1 0 ] 5 0 5 -[ 1 0 ] 6 0 6 -[ 1 1 ] 7 0 7 -[ 1 1 ] 8 0 8 -[ 2 0 ] 9 0 9 -[ 2 0 ] 10 0 10 -[ 2 1 ] 11 0 11 -[ 2 1 ] 12 0 12 -12 differences found -dataset: and -size: [4x3x2] [4x3x2] -position compound3D compound3D difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 0 ] 2 0 2 -[ 0 0 1 ] 3 0 3 -[ 0 0 1 ] 4 0 4 -[ 0 1 0 ] 5 0 5 -[ 0 1 0 ] 6 0 6 -[ 0 1 1 ] 7 0 7 -[ 0 1 1 ] 8 0 8 -[ 0 2 0 ] 9 0 9 -[ 0 2 0 ] 10 0 10 -[ 0 2 1 ] 11 0 11 -[ 0 2 1 ] 12 0 12 -[ 1 0 0 ] 13 0 13 -[ 1 0 0 ] 14 0 14 -[ 1 0 1 ] 15 0 15 -[ 1 0 1 ] 16 0 16 -[ 1 1 0 ] 17 0 17 -[ 1 1 0 ] 18 0 18 -[ 1 1 1 ] 19 0 19 -[ 1 1 1 ] 20 0 20 -[ 1 2 0 ] 21 0 21 -[ 1 2 0 ] 22 0 22 -[ 1 2 1 ] 23 0 23 -[ 1 2 1 ] 24 0 24 -[ 2 0 0 ] 25 0 25 -[ 2 0 0 ] 26 0 26 -[ 2 0 1 ] 27 0 27 -[ 2 0 1 ] 28 0 28 -[ 2 1 0 ] 29 0 29 -[ 2 1 0 ] 30 0 30 -[ 2 1 1 ] 31 0 31 -[ 2 1 1 ] 32 0 32 -[ 2 2 0 ] 33 0 33 -[ 2 2 0 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 2 2 1 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 1 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 1 0 ] 41 0 41 -[ 3 1 0 ] 42 0 42 -[ 3 1 1 ] 43 0 43 -[ 3 1 1 ] 44 0 44 -[ 3 2 0 ] 45 0 45 -[ 3 2 0 ] 46 0 46 -[ 3 2 1 ] 47 0 47 -[ 3 2 1 ] 48 0 48 -48 differences found -dataset: and -size: [2] [2] -position enum enum difference ------------------------------------------------------------- -[ 0 ] RED GREEN -1 differences found -dataset: and - or are empty datasets -0 differences found -dataset: and - or are empty datasets -0 differences found -dataset: and -size: [2] [2] -position float float difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -dataset: and -size: [3x2] [3x2] -position float2D float2D difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -dataset: and -size: [4x3x2] [4x3x2] -position float3D float3D difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -dataset: and -size: [2] [2] -position integer integer difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -dataset: and -size: [3x2] [3x2] -position integer2D integer2D difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -dataset: and -size: [4x3x2] [4x3x2] -position integer3D integer3D difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -dataset: and -size: [2] [2] -position opaque opaque difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -2 differences found -dataset: and -size: [3x2] [3x2] -position opaque2D opaque2D difference ------------------------------------------------------------- -[ 0 0 ] 1 0 1 -[ 0 1 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 2 0 ] 5 0 5 -[ 2 1 ] 6 0 6 -6 differences found -dataset: and -size: [4x3x2] [4x3x2] -position opaque3D opaque3D difference ------------------------------------------------------------- -[ 0 0 0 ] 1 0 1 -[ 0 0 1 ] 2 0 2 -[ 0 1 0 ] 3 0 3 -[ 0 1 1 ] 4 0 4 -[ 0 2 0 ] 5 0 5 -[ 0 2 1 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 1 0 ] 9 0 9 -[ 1 1 1 ] 10 0 10 -[ 1 2 0 ] 11 0 11 -[ 1 2 1 ] 12 0 12 -[ 2 0 0 ] 13 0 13 -[ 2 0 1 ] 14 0 14 -[ 2 1 0 ] 15 0 15 -[ 2 1 1 ] 16 0 16 -[ 2 2 0 ] 17 0 17 -[ 2 2 1 ] 18 0 18 -[ 3 0 0 ] 19 0 19 -[ 3 0 1 ] 20 0 20 -[ 3 1 0 ] 21 0 21 -[ 3 1 1 ] 22 0 22 -[ 3 2 0 ] 23 0 23 -[ 3 2 1 ] 24 0 24 -24 differences found -dataset: and -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -4 differences found -dataset: and -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -12 differences found -dataset: and -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -size: [2] [2] -position difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -48 differences found -dataset: and -size: [2] [2] -position string string difference ------------------------------------------------------------- -[ 0 ] a z -[ 0 ] b z -[ 1 ] d z -[ 1 ] e z -4 differences found -dataset: and -size: [3x2] [3x2] -position string2D string2D difference ------------------------------------------------------------- -[ 0 0 ] a z -[ 0 0 ] b z -[ 0 1 ] c z -[ 0 1 ] d z -[ 1 0 ] e z -[ 1 0 ] f z -[ 1 1 ] g z -[ 1 1 ] h z -[ 2 0 ] i z -[ 2 0 ] j z -[ 2 1 ] k z -[ 2 1 ] l z -12 differences found -dataset: and -size: [4x3x2] [4x3x2] -position string3D string3D difference ------------------------------------------------------------- -[ 0 0 0 ] a z -[ 0 0 0 ] b z -[ 0 0 1 ] c z -[ 0 0 1 ] d z -[ 0 1 0 ] e z -[ 0 1 0 ] f z -[ 0 1 1 ] g z -[ 0 1 1 ] h z -[ 0 2 0 ] i z -[ 0 2 0 ] j z -[ 0 2 1 ] k z -[ 0 2 1 ] l z -[ 1 0 0 ] m z -[ 1 0 0 ] n z -[ 1 0 1 ] p z -[ 1 0 1 ] q z -[ 1 1 0 ] r z -[ 1 1 0 ] s z -[ 1 1 1 ] t z -[ 1 1 1 ] u z -[ 1 2 0 ] v z -[ 1 2 0 ] w z -[ 1 2 1 ] x z -[ 2 0 0 ] A z -[ 2 0 0 ] B z -[ 2 0 1 ] C z -[ 2 0 1 ] D z -[ 2 1 0 ] E z -[ 2 1 0 ] F z -[ 2 1 1 ] G z -[ 2 1 1 ] H z -[ 2 2 0 ] I z -[ 2 2 0 ] J z -[ 2 2 1 ] K z -[ 2 2 1 ] L z -[ 3 0 0 ] M z -[ 3 0 0 ] N z -[ 3 0 1 ] P z -[ 3 0 1 ] Q z -[ 3 1 0 ] R z -[ 3 1 0 ] S z -[ 3 1 1 ] T z -[ 3 1 1 ] U z -[ 3 2 0 ] V z -[ 3 2 0 ] W z -[ 3 2 1 ] X z -[ 3 2 1 ] Z z -47 differences found -dataset: and -size: [2] [2] -position vlen vlen difference ------------------------------------------------------------- -[ 0 ] 1 0 1 -[ 1 ] 2 0 2 -[ 1 ] 3 0 3 -3 differences found -dataset: and -size: [3x2] [3x2] -position vlen2D vlen2D difference ------------------------------------------------------------- -[ 0 1 ] 1 0 1 -[ 1 0 ] 2 0 2 -[ 1 0 ] 3 0 3 -[ 1 1 ] 4 0 4 -[ 1 1 ] 5 0 5 -[ 2 0 ] 6 0 6 -[ 2 0 ] 7 0 7 -[ 2 0 ] 8 0 8 -[ 2 1 ] 9 0 9 -[ 2 1 ] 10 0 10 -[ 2 1 ] 11 0 11 -11 differences found -dataset: and -size: [4x3x2] [4x3x2] -position vlen3D vlen3D difference ------------------------------------------------------------- -[ 0 0 1 ] 1 0 1 -[ 0 1 0 ] 2 0 2 -[ 0 1 1 ] 3 0 3 -[ 0 2 0 ] 4 0 4 -[ 0 2 1 ] 5 0 5 -[ 1 0 0 ] 6 0 6 -[ 1 0 0 ] 7 0 7 -[ 1 0 1 ] 8 0 8 -[ 1 0 1 ] 9 0 9 -[ 1 1 0 ] 10 0 10 -[ 1 1 0 ] 11 0 11 -[ 1 1 1 ] 12 0 12 -[ 1 1 1 ] 13 0 13 -[ 1 2 0 ] 14 0 14 -[ 1 2 0 ] 15 0 15 -[ 1 2 1 ] 16 0 16 -[ 1 2 1 ] 17 0 17 -[ 2 0 0 ] 18 0 18 -[ 2 0 0 ] 19 0 19 -[ 2 0 0 ] 20 0 20 -[ 2 0 1 ] 21 0 21 -[ 2 0 1 ] 22 0 22 -[ 2 0 1 ] 23 0 23 -[ 2 1 0 ] 24 0 24 -[ 2 1 0 ] 25 0 25 -[ 2 1 0 ] 26 0 26 -[ 2 1 1 ] 27 0 27 -[ 2 1 1 ] 28 0 28 -[ 2 1 1 ] 29 0 29 -[ 2 2 0 ] 30 0 30 -[ 2 2 0 ] 31 0 31 -[ 2 2 0 ] 32 0 32 -[ 2 2 1 ] 33 0 33 -[ 2 2 1 ] 34 0 34 -[ 2 2 1 ] 35 0 35 -[ 3 0 0 ] 36 0 36 -[ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38 0 38 -[ 3 0 0 ] 39 0 39 -[ 3 0 1 ] 40 0 40 -[ 3 0 1 ] 41 0 41 -[ 3 0 1 ] 42 0 42 -[ 3 0 1 ] 43 0 43 -[ 3 1 0 ] 44 0 44 -[ 3 1 0 ] 45 0 45 -[ 3 1 0 ] 46 0 46 -[ 3 1 0 ] 47 0 47 -[ 3 1 1 ] 48 0 48 -[ 3 1 1 ] 49 0 49 -[ 3 1 1 ] 50 0 50 -[ 3 1 1 ] 51 0 51 -[ 3 2 0 ] 52 0 52 -[ 3 2 0 ] 53 0 53 -[ 3 2 0 ] 54 0 54 -[ 3 2 0 ] 55 0 55 -[ 3 2 1 ] 56 0 56 -[ 3 2 1 ] 57 0 57 -[ 3 2 1 ] 58 0 58 -[ 3 2 1 ] 59 0 59 -59 differences found -dataset: and -Referenced dataset 10272 10272 ------------------------------------------------------------- -Region blocks -block #0 (2,2)-(7,7) (0,0)-(2,2) -Region points -point #1 (2,2) (3,3) -point #3 (1,6) (2,5) -point #4 (2,8) (1,7) -4 differences found --------------------------------- -Some objects are not comparable --------------------------------- diff --git a/tools/testfiles/h5diff_90.txt b/tools/testfiles/h5diff_90.txt deleted file mode 100644 index 4df38c0..0000000 --- a/tools/testfiles/h5diff_90.txt +++ /dev/null @@ -1,25 +0,0 @@ -############################# -Expected output for 'h5diff -v h5diff_basic2.h5 h5diff_basic2.h5' -############################# - -file1 file2 ---------------------------------------- - x x / - x x /g1 - x x /g1/dset1 - x x /g1/dset2 - x x /g1/dset4 - x x /g2 - -group : and -0 differences found -group : and -0 differences found -dataset: and -0 differences found -dataset: and -0 differences found -dataset: and -0 differences found -group : and -0 differences found diff --git a/tools/testfiles/h5diff_attr1.h5 b/tools/testfiles/h5diff_attr1.h5 deleted file mode 100644 index c44066b..0000000 Binary files a/tools/testfiles/h5diff_attr1.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_attr2.h5 b/tools/testfiles/h5diff_attr2.h5 deleted file mode 100644 index 5de3303..0000000 Binary files a/tools/testfiles/h5diff_attr2.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_basic1.h5 b/tools/testfiles/h5diff_basic1.h5 deleted file mode 100644 index 389e2b3..0000000 Binary files a/tools/testfiles/h5diff_basic1.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_basic2.h5 b/tools/testfiles/h5diff_basic2.h5 deleted file mode 100644 index ad45cc0..0000000 Binary files a/tools/testfiles/h5diff_basic2.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_dset1.h5 b/tools/testfiles/h5diff_dset1.h5 deleted file mode 100644 index ab6b96f..0000000 Binary files a/tools/testfiles/h5diff_dset1.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_dset2.h5 b/tools/testfiles/h5diff_dset2.h5 deleted file mode 100644 index 3db0c8e..0000000 Binary files a/tools/testfiles/h5diff_dset2.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_dtypes.h5 b/tools/testfiles/h5diff_dtypes.h5 deleted file mode 100644 index 7c3cd9d..0000000 Binary files a/tools/testfiles/h5diff_dtypes.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_empty.h5 b/tools/testfiles/h5diff_empty.h5 deleted file mode 100644 index 3f0d1df..0000000 Binary files a/tools/testfiles/h5diff_empty.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_hyper1.h5 b/tools/testfiles/h5diff_hyper1.h5 deleted file mode 100644 index ceeff80..0000000 Binary files a/tools/testfiles/h5diff_hyper1.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_hyper2.h5 b/tools/testfiles/h5diff_hyper2.h5 deleted file mode 100644 index 05a2eb1..0000000 Binary files a/tools/testfiles/h5diff_hyper2.h5 and /dev/null differ diff --git a/tools/testfiles/h5diff_types.h5 b/tools/testfiles/h5diff_types.h5 deleted file mode 100644 index c835069..0000000 Binary files a/tools/testfiles/h5diff_types.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_attr.h5 b/tools/testfiles/h5repack_attr.h5 deleted file mode 100644 index 70ad02d..0000000 Binary files a/tools/testfiles/h5repack_attr.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_deflate.h5 b/tools/testfiles/h5repack_deflate.h5 deleted file mode 100644 index 3a4b86d..0000000 Binary files a/tools/testfiles/h5repack_deflate.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_early.h5 b/tools/testfiles/h5repack_early.h5 deleted file mode 100644 index 9b92890..0000000 Binary files a/tools/testfiles/h5repack_early.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_ext.bin b/tools/testfiles/h5repack_ext.bin deleted file mode 100644 index f858094..0000000 Binary files a/tools/testfiles/h5repack_ext.bin and /dev/null differ diff --git a/tools/testfiles/h5repack_ext.h5 b/tools/testfiles/h5repack_ext.h5 deleted file mode 100644 index 1fe88c9..0000000 Binary files a/tools/testfiles/h5repack_ext.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_fill.h5 b/tools/testfiles/h5repack_fill.h5 deleted file mode 100644 index 21516cb..0000000 Binary files a/tools/testfiles/h5repack_fill.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_filters.h5 b/tools/testfiles/h5repack_filters.h5 deleted file mode 100644 index 042b8db..0000000 Binary files a/tools/testfiles/h5repack_filters.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_fletcher.h5 b/tools/testfiles/h5repack_fletcher.h5 deleted file mode 100644 index 2f137b0..0000000 Binary files a/tools/testfiles/h5repack_fletcher.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_hlink.h5 b/tools/testfiles/h5repack_hlink.h5 deleted file mode 100644 index 3d22728..0000000 Binary files a/tools/testfiles/h5repack_hlink.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_layout.h5 b/tools/testfiles/h5repack_layout.h5 deleted file mode 100644 index 5772a31..0000000 Binary files a/tools/testfiles/h5repack_layout.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_nbit.h5 b/tools/testfiles/h5repack_nbit.h5 deleted file mode 100644 index 3ada112..0000000 Binary files a/tools/testfiles/h5repack_nbit.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_objs.h5 b/tools/testfiles/h5repack_objs.h5 deleted file mode 100644 index 199adc5..0000000 Binary files a/tools/testfiles/h5repack_objs.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_shuffle.h5 b/tools/testfiles/h5repack_shuffle.h5 deleted file mode 100644 index d13cca7..0000000 Binary files a/tools/testfiles/h5repack_shuffle.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_soffset.h5 b/tools/testfiles/h5repack_soffset.h5 deleted file mode 100644 index 89ee99a..0000000 Binary files a/tools/testfiles/h5repack_soffset.h5 and /dev/null differ diff --git a/tools/testfiles/h5repack_szip.h5 b/tools/testfiles/h5repack_szip.h5 deleted file mode 100644 index b16d169..0000000 Binary files a/tools/testfiles/h5repack_szip.h5 and /dev/null differ diff --git a/tools/testfiles/info.h5repack b/tools/testfiles/info.h5repack deleted file mode 100644 index 216948d..0000000 --- a/tools/testfiles/info.h5repack +++ /dev/null @@ -1 +0,0 @@ --l dset1:CHUNK=20x20 -f dset1,dset2:GZIP=1 diff --git a/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj index 8fe1005..22a4d18 100644 --- a/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj +++ b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj @@ -7,39 +7,39 @@ - + - - + + - + - - + + + - - - + + + - - - + + diff --git a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj index 72f97f5..a6082b7 100644 --- a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj +++ b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj @@ -7,39 +7,39 @@ - + - - + + - + - - + + + - - - + + + - - - + + diff --git a/windows/misc/typegen/h5match_types/h5match_types.vcproj b/windows/misc/typegen/h5match_types/h5match_types.vcproj index 0b751ca..c95b4ae 100644 --- a/windows/misc/typegen/h5match_types/h5match_types.vcproj +++ b/windows/misc/typegen/h5match_types/h5match_types.vcproj @@ -106,7 +106,7 @@ diff --git a/windows/misc/typegen/h5tinit/h5tinit.vcproj b/windows/misc/typegen/h5tinit/h5tinit.vcproj index 0075e16..de79a1c 100644 --- a/windows/misc/typegen/h5tinit/h5tinit.vcproj +++ b/windows/misc/typegen/h5tinit/h5tinit.vcproj @@ -105,7 +105,7 @@ diff --git a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj index 4fa96c2..243a9fe 100644 --- a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj +++ b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - + + - + - - - + + + - + - - + + diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat index 7b3d034..120b03a 100644 --- a/windows/tools/h5copy/testh5copy.bat +++ b/windows/tools/h5copy/testh5copy.bat @@ -45,7 +45,7 @@ set /a nerrors=0 set verbose=yes set srcfile=h5copytst.h5 -set indir=%CD%\..\testfiles +set indir=%CD%\testfiles set outdir=%CD%\..\testfiles if not exist %outdir% mkdir %outdir% diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index d3c407a..2ae5b10 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -26,16 +26,29 @@ rem ############################################################################ rem test file names rem ############################################################################ -set file1=h5diff_basic1.h5 -set file2=h5diff_basic2.h5 -set file3=h5diff_types.h5 -set file4=h5diff_dtypes.h5 -set file5=h5diff_attr1.h5 -set file6=h5diff_attr2.h5 -set file7=h5diff_dset1.h5 -set file8=h5diff_dset2.h5 -set file9=h5diff_hyper1.h5 -set file10=h5diff_hyper2.h5 +set indir=%CD%\testfiles + +set srcfile1=h5diff_basic1.h5 +set srcfile2=h5diff_basic2.h5 +set srcfile3=h5diff_types.h5 +set srcfile4=h5diff_dtypes.h5 +set srcfile5=h5diff_attr1.h5 +set srcfile6=h5diff_attr2.h5 +set srcfile7=h5diff_dset1.h5 +set srcfile8=h5diff_dset2.h5 +set srcfile9=h5diff_hyper1.h5 +set srcfile10=h5diff_hyper2.h5 + +set file1=%indir%\h5diff_basic1.h5 +set file2=%indir%\h5diff_basic2.h5 +set file3=%indir%\h5diff_types.h5 +set file4=%indir%\h5diff_dtypes.h5 +set file5=%indir%\h5diff_attr1.h5 +set file6=%indir%\h5diff_attr2.h5 +set file7=%indir%\h5diff_dset1.h5 +set file8=%indir%\h5diff_dset2.h5 +set file9=%indir%\h5diff_hyper1.h5 +set file10=%indir%\h5diff_hyper2.h5 rem The tool name @@ -48,7 +61,7 @@ set verbose=yes rem default to run h5diff tests set pmode= -if not exist ..\testfiles mkdir ..\testfiles +if not exist .\testfiles mkdir .\testfiles rem Parse options rem On Windows, we don't parse, because we only want to worry about @@ -59,21 +72,30 @@ goto main rem Print a line-line message left justified in a field of 70 characters rem beginning with the word "Testing". +rem On Windows, simply set up the test_msg variable, so it can be printed later +rem with the :results function. This is because Windows doesn't support +rem printing without a linefeed. --SJW 6/20/08 rem :testing set test_msg=Testing for %%a in (%*) do ( - if %%a neq PASSED ( - if %%a neq *FAILED* ( set test_msg=!test_msg! %%~nxa - ) ) ) set test_msg=%test_msg% - echo.%test_msg:~0,69% %1 + set test_msg=%test_msg:~0,69% exit /b +rem Print the testing results. Simply echo the contents of test_msg (set up +rem above), along with the passed parameter, generall PASSED, FAILED, or -SKIP- +:results + echo.%test_msg% %* + + exit /b + + + rem Function STDOUT_FILTER isn't technically needed on Windows, because this rem script will never run on platforms that require it. However, include empty rem interface for consistency. --SJW 8/22/07 @@ -98,9 +120,9 @@ rem `.out'. The actual output is not removed if HDF5_NOCLEANUP has a rem non-zero value. rem :tooltest - set expect=%CD%\..\testfiles\%1 - set actual=%CD%\..\testfiles\%~n1.out - set actual_err=%CD%\..\testfiles\~n1.err + set expect=%CD%\testfiles\%1 + set actual=%CD%\testfiles\%~n1.out + set actual_err=%CD%\testfiles\~n1.err set actual_sav=%actual%-sav set actual_err_sav=%actual_err%-sav @@ -121,11 +143,11 @@ rem rem Run test. ( - echo.############################# - rem Remove quotes here, because Linux 'echo' command strips them - echo.Expected output for 'h5diff %params:"=%' - echo.############################# - pushd ..\testfiles + rem echo.############################# + rem rem Remove quotes here, because Linux 'echo' command strips them + rem echo.Expected output for 'h5diff %params:"=%' + rem echo.############################# + pushd testfiles %h5diff_bin% %params% popd ) > %actual% 2> %actual_err% @@ -138,14 +160,14 @@ rem if not exist %expect% ( rem Create the expect file if it doesn't yet exist. - call :testing CREATED %h5diff% %params% + call :results CREATED copy /y %actual% %expect% > nul ) else ( fc /w %expect% %actual% > nul if !errorlevel! equ 0 ( - call :testing PASSED %h5diff% %params% + call :results PASSED ) else ( - call :testing *FAILED* %h5diff% %params% + call :results *FAILED* echo. Expected result ^(%expect%^) differs from actual result ^(%actual%^) set /a nerrors=!nerrors!+1 if "yes"=="%verbose%" fc /w %actual% %expect% @@ -169,9 +191,11 @@ rem Print a "SKIP" message :main rem ############################################################################ -rem ############################################################################ -rem # T H E T E S T S ### -rem ############################################################################ +rem The tests +rem To avoid the printing of the complete full path of the test file, that hides +rem all the other parameters for long paths, the printing of the command line +rem is done first in +rem TESTING with the name only of the test file $TOOL, not its full path $TESTFILErem ############################################################################ rem ############################################################################ rem ############################################################################ @@ -180,36 +204,47 @@ rem ############################################################################ rem 1.0 + call :testing %h5diff% -h call :tooltest h5diff_10.txt -h rem 1.1 normal mode + call :testing %h5diff% %srcfile1% %srcfile2% call :tooltest h5diff_11.txt %file1% %file2% rem 1.2 normal mode with objects + call :testing %h5diff% %srcfile1% %srcfile2% g1/dset1 g1/dset2 call :tooltest h5diff_12.txt %file1% %file2% g1/dset1 g1/dset2 rem 1.3 report mode + call :testing %h5diff% -r %srcfile1% %srcfile2% call :tooltest h5diff_13.txt -r %file1% %file2% rem 1.4 report mode with objects + call :testing %h5diff% -r %srcfile1% %srcfile2% g1/dset1 g1/dset2 call :tooltest h5diff_14.txt -r %file1% %file2% g1/dset1 g1/dset2 rem 1.5 with -d + call :testing %h5diff% --report --delta=5 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_15.txt --report --delta=5 %file1% %file2% g1/dset3 g1/dset4 rem 1.6.1 with -p (int) + call :testing %h5diff% -v -p 0.02 %srcfile1% %srcfile1% g1/dset5 g1/dset6 call :tooltest h5diff_16_1.txt -v -p 0.02 %file1% %file1% g1/dset5 g1/dset6 rem 1.6.2 with -p (unsigned long_long) + call :testing %h5diff% --verbose --relative=0.02 %srcfile1% %srcfile1% g1/dset7 g1/dset8 call :tooltest h5diff_16_2.txt --verbose --relative=0.02 %file1% %file1% g1/dset7 g1/dset8 rem 1.6.3 with -p (double) + call :testing %h5diff% -v -p 0.02 %srcfile1% %srcfile1% g1/dset9 g1/dset10 call :tooltest h5diff_16_3.txt -v -p 0.02 %file1% %file1% g1/dset9 g1/dset10 rem 1.7 verbose mode + call :testing %h5diff% -v %srcfile1% %srcfile2% call :tooltest h5diff_17.txt -v %file1% %file2% rem 1.8 quiet mode + call :testing %h5diff% -q %srcfile1% %srcfile2% call :tooltest h5diff_18.txt -q %file1% %file2% rem ############################################################################## @@ -217,12 +252,15 @@ rem ############################################################################ rem ############################################################################## rem 2.0 + call :testing %h5diff% -v %srcfile3% %srcfile3% dset g1 call :tooltest h5diff_20.txt -v %file3% %file3% dset g1 rem 2.1 + call :testing %h5diff% -v %srcfile3% %srcfile3% dset l1 call :tooltest h5diff_21.txt -v %file3% %file3% dset l1 rem 2.2 + call :testing %h5diff% -v %srcfile3% %srcfile3% dset t1 call :tooltest h5diff_22.txt -v %file3% %file3% dset t1 rem ############################################################################## @@ -230,21 +268,27 @@ rem ############################################################################ rem ############################################################################## rem 2.3 + call :testing %h5diff% -v %srcfile3% %srcfile3% g1 g1 call :tooltest h5diff_23.txt -v %file3% %file3% g1 g1 rem 2.4 + call :testing %h5diff% -v %srcfile3% %srcfile3% t1 t1 call :tooltest h5diff_24.txt -v %file3% %file3% t1 t1 rem 2.5 + call :testing %h5diff% -v %srcfile3% %srcfile3% l1 l1 call :tooltest h5diff_25.txt -v %file3% %file3% l1 l1 rem 2.6 + call :testing %h5diff% -v %srcfile3% %srcfile3% g1 g2 call :tooltest h5diff_26.txt -v %file3% %file3% g1 g2 rem 2.7 + call :testing %h5diff% -v %srcfile3% %srcfile3% t1 t2 call :tooltest h5diff_27.txt -v %file3% %file3% t1 t2 rem 2.8 + call :testing %h5diff% -v %srcfile3% %srcfile3% l1 l2 call :tooltest h5diff_28.txt -v %file3% %file3% l1 l2 @@ -254,30 +298,39 @@ rem ############################################################################ rem ############################################################################## rem 5.0 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset0a dset0b call :tooltest h5diff_50.txt -v %file4% %file4% dset0a dset0b rem 5.1 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset1a dset1b call :tooltest h5diff_51.txt -v %file4% %file4% dset1a dset1b rem 5.2 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset2a dset2b call :tooltest h5diff_52.txt -v %file4% %file4% dset2a dset2b rem 5.3 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset3a dset4b call :tooltest h5diff_53.txt -v %file4% %file4% dset3a dset4b rem 5.4 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset4a dset4b call :tooltest h5diff_54.txt -v %file4% %file4% dset4a dset4b rem 5.5 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset5a dset5b call :tooltest h5diff_55.txt -v %file4% %file4% dset5a dset5b rem 5.6 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset6a dset6b call :tooltest h5diff_56.txt -v %file4% %file4% dset6a dset6b rem 5.7 + call :testing %h5diff% -v %srcfile4% %srcfile4% dset7a dset7b call :tooltest h5diff_57.txt -v %file4% %file4% dset7a dset7b rem 5.8 (region reference) + call :testing %h5diff% -v %srcfile7% %srcfile8% refreg call :tooltest h5diff_58.txt -v %file7% %file8% refreg rem ############################################################################## @@ -286,45 +339,45 @@ rem ############################################################################ rem 6.0: Check if the command line number of arguments is less than 3 + call :testing %h5diff% %srcfile1% call :tooltest h5diff_600.txt %file1% - rem 6.1: Check for invalid options - rem Comment this test on Windows out for now. The reason is that currently no - rem expected output exists. This means that one will be created for the first - rem testrun, but then never deleted. The expected output has an absolute path - rem in it, so it will fail for subsequent tests that use a different path. - rem -- SJW 11/17/07 - rem call :tooltest h5diff_601.txt -x %file1% %file2% rem ############################################################################## rem # -d rem ############################################################################## - rem 6.2: no value - call :tooltest h5diff_602.txt -d %file1% %file2% g1/dset3 g1/dset4 rem 6.3: negative value + call :testing %h5diff% -d -4 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_603.txt -d -4 %file1% %file2% g1/dset3 g1/dset4 rem 6.4: zero + call :testing %h5diff% -d 0 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_604.txt -d 0 %file1% %file2% g1/dset3 g1/dset4 rem 6.5: non number + call :testing %h5diff% -d u %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_605.txt -d u %file1% %file2% g1/dset3 g1/dset4 rem 6.6: hexadecimal + call :testing %h5diff% -d 0x1 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_606.txt -d 0x1 %file1% %file2% g1/dset3 g1/dset4 rem 6.7: string + call :testing %h5diff% -d "1" %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_607.txt -d "1" %file1% %file2% g1/dset3 g1/dset4 rem 6.8: repeated option + call :testing %h5diff% -d 1 -d 2 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_608.txt -d 1 -d 2 %file1% %file2% g1/dset3 g1/dset4 rem 6.9: number larger than biggest difference + call :testing %h5diff% -d 200 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_609.txt -d 200 %file1% %file2% g1/dset3 g1/dset4 rem 6.10: number smaller than smallest difference + call :testing %h5diff% -d 1 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_610.txt -d 1 %file1% %file2% g1/dset3 g1/dset4 @@ -333,31 +386,37 @@ rem ############################################################################ rem ############################################################################## - rem 6.11: no value - call :tooltest h5diff_611.txt -r -p %file1% %file2% g1/dset3 g1/dset4 rem 6.12: negative value + call :testing %h5diff% -p -4 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_612.txt -p -4 %file1% %file2% g1/dset3 g1/dset4 rem 6.13: zero + call :testing %h5diff% -p 0 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_613.txt -p 0 %file1% %file2% g1/dset3 g1/dset4 rem 6.14: non number + call :testing %h5diff% -p u %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_614.txt -p u %file1% %file2% g1/dset3 g1/dset4 rem 6.15: hexadecimal + call :testing %h5diff% -p 0x1 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_615.txt -p 0x1 %file1% %file2% g1/dset3 g1/dset4 rem 6.16: string + call :testing %h5diff% -p "0.21" %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_616.txt -p "0.21" %file1% %file2% g1/dset3 g1/dset4 rem 6.17: repeated option + call :testing %h5diff% -p 0.21 -p 0.22 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_617.txt -p 0.21 -p 0.22 %file1% %file2% g1/dset3 g1/dset4 rem 6.18: number larger than biggest difference + call :testing %h5diff% -p 2 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_618.txt -p 2 %file1% %file2% g1/dset3 g1/dset4 rem 6.19: number smaller than smallest difference + call :testing %h5diff% -p 0.005 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_619.txt -p 0.005 %file1% %file2% g1/dset3 g1/dset4 @@ -367,57 +426,73 @@ rem ############################################################################ rem ############################################################################## - rem 6.20: no value - call :tooltest h5diff_620.txt -n %file1% %file2% g1/dset3 g1/dset4 rem 6.21: negative value + call :testing %h5diff% -n -4 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_621.txt -n -4 %file1% %file2% g1/dset3 g1/dset4 rem 6.22: zero + call :testing %h5diff% -n 0 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_622.txt -n 0 %file1% %file2% g1/dset3 g1/dset4 rem 6.23: non number + call :testing %h5diff% -n u %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_623.txt -n u %file1% %file2% g1/dset3 g1/dset4 rem 6.24: hexadecimal + call :testing %h5diff% -n 0x1 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_624.txt -n 0x1 %file1% %file2% g1/dset3 g1/dset4 rem 6.25: string + call :testing %h5diff% -n "2" %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_625.txt -n "2" %file1% %file2% g1/dset3 g1/dset4 rem 6.26: repeated option + call :testing %h5diff% -n 2 -n 3 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_626.txt -n 2 -n 3 %file1% %file2% g1/dset3 g1/dset4 rem 6.27: number larger than biggest difference + call :testing %h5diff% --count=200 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_627.txt --count=200 %file1% %file2% g1/dset3 g1/dset4 rem 6.28: number smaller than smallest difference + call :testing %h5diff% -n 1 %srcfile1% %srcfile2% g1/dset3 g1/dset4 call :tooltest h5diff_628.txt -n 1 %file1% %file2% g1/dset3 g1/dset4 rem 6.29 non valid files + call :testing %h5diff% file1.h6 file2.h6 call :tooltest h5diff_629.txt file1.h6 file2.h6 rem ############################################################################## rem 7. attributes rem ############################################################################## + call :testing %h5diff% -v %srcfile5% %srcfile6% call :tooltest h5diff_70.txt -v %file5% %file6% rem ############################################################################## rem 8. all dataset datatypes rem ############################################################################## + call :testing %h5diff% -v %srcfile7% %srcfile8% call :tooltest h5diff_80.txt -v %file7% %file8% rem 9. compare a file with itself + call :testing %h5diff% -v %srcfile2% %srcfile2% call :tooltest h5diff_90.txt -v %file2% %file2% rem 10. read by hyperslab, print indexes + call :testing %h5diff% -v %srcfile9% %srcfile10% call :tooltest h5diff_100.txt -v %file9% %file10% rem 11. floating point comparison rem Not tested on Windows due to difference in formatting of scientific rem notation --SJW 8/23/07 + call :testing h5diff_101.txt -v %srcfile1% %srcfile1% g1/d1 g1/d2 rem call :tooltest h5diff_101.txt -v %file1% %file1% g1/d1 g1/d2 + call :results -SKIP- + rem + call :testing %h5diff% -v %srcfile1% %srcfile1% g1/fp1 g1/fp2 rem call :tooltest h5diff_102.txt -v %file1% %file1% g1/fp1 g1/fp2 + call :results -SKIP- rem ############################################################################## rem # END diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat index 7454f7f..a91dcb9 100644 --- a/windows/tools/h5repack/h5repack.bat +++ b/windows/tools/h5repack/h5repack.bat @@ -42,13 +42,11 @@ set h5diff=..\h5diff%2\%1\h5diff%2 rem The path of the h5diff tool binary set h5diff_bin=%CD%\%h5diff% -rem The tool name set h5detectszip=testh5repack_detect_szip%2 -rem The path of the tool binary set h5detectszip_bin=%CD%\..\testfiles\%h5detectszip%\%1\%h5detectszip% -set info_file=..\testfiles\info.h5repack +set info_file=testfiles\h5repack.info set file0=h5repack_fill.h5 set file1=h5repack_objs.h5 @@ -68,7 +66,6 @@ set file13=h5repack_soffset.h5 set nerrors=0 set verbose=yes -if not exist ..\testfiles mkdir ..\testfiles goto main @@ -133,7 +130,7 @@ rem :tooltest rem Run test. - set infile=%CD%\..\testfiles\%1 + set infile=%CD%\testfiles\%1 rem Linux uses a $path variable here, but it is unneccessary, and will rem corrupt our Windows PATH if we use it. --SJW 8/28/07 rem set path=%CD% @@ -167,7 +164,7 @@ rem :tooltest0 rem Run test. - set infile=%CD%\..\testfiles\%1 + set infile=%CD%\testfiles\%1 rem Linux uses a $path variable here, but it is unneccessary, and will rem corrupt our Windows PATH if we use it. --SJW 8/28/07 rem set path=%CD% diff --git a/windows_vnet/proj/all/all.sln b/windows_vnet/proj/all/all.sln index 1666237..2996cfd 100644 --- a/windows_vnet/proj/all/all.sln +++ b/windows_vnet/proj/all/all.sln @@ -2256,9 +2256,7 @@ Global {159841AE-42DA-4931-B81F-BF9BD580DDF6}.AlphaRel.ActiveCfg = Release|Win32 {159841AE-42DA-4931-B81F-BF9BD580DDF6}.AlphaRel.Build.0 = Release|Win32 {159841AE-42DA-4931-B81F-BF9BD580DDF6}.Debug.ActiveCfg = Debug|Win32 - {159841AE-42DA-4931-B81F-BF9BD580DDF6}.Debug.Build.0 = Debug|Win32 {159841AE-42DA-4931-B81F-BF9BD580DDF6}.Release.ActiveCfg = Release|Win32 - {159841AE-42DA-4931-B81F-BF9BD580DDF6}.Release.Build.0 = Release|Win32 {20276CCF-2478-4FAA-98A9-A485038E00F6}.AlphaDbg.ActiveCfg = AlphaDbg|Win32 {20276CCF-2478-4FAA-98A9-A485038E00F6}.AlphaDbg.Build.0 = AlphaDbg|Win32 {20276CCF-2478-4FAA-98A9-A485038E00F6}.AlphaRel.ActiveCfg = AlphaRel|Win32 -- cgit v0.12