diff options
Diffstat (limited to 'tools')
44 files changed, 413 insertions, 354 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 2f850a6..d770769 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -60,12 +60,11 @@ print_objname (diff_opt_t * options, hsize_t nfound) void do_print_objname (const char *OBJ, const char *path1, const char *path2) { - parallel_print("%s:\n<%s> and <%s> ", OBJ, path1, path2); + parallel_print("%-7s: <%s> and <%s>\n", OBJ, path1, path2); } - #ifdef H5_HAVE_PARALLEL /*------------------------------------------------------------------------- * Function: phdiff_dismiss_workers @@ -930,7 +929,7 @@ hsize_t diff (hid_t file1_id, { if (print_objname (options, (hsize_t)1)) do_print_objname ("dataset", path1, path2); - nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 1); + nfound = diff_dataset (file1_id, file2_id, path1, path2, options); /* always print the number of differences found */ print_found(nfound); } @@ -944,14 +943,14 @@ hsize_t diff (hid_t file1_id, { /* shut up temporarily */ options->m_quiet = 1; - nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 0); + nfound = diff_dataset (file1_id, file2_id, path1, path2, options); /* print again */ options->m_quiet = 0; if (nfound) { if (print_objname (options, nfound)) do_print_objname ("dataset", path1, path2); - nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 1); + nfound = diff_dataset (file1_id, file2_id, path1, path2, options); /* print the number of differences found only when found this is valid for the default mode and report mode */ print_found(nfound); @@ -964,7 +963,7 @@ hsize_t diff (hid_t file1_id, */ else { - nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 0); + nfound = diff_dataset (file1_id, file2_id, path1, path2, options); } } /*else verbose */ diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h index 95fc400..d154fc8 100644 --- a/tools/lib/h5diff.h +++ b/tools/lib/h5diff.h @@ -76,15 +76,13 @@ hsize_t diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name, const char *obj2_name, - diff_opt_t *options, - int print_dims); + diff_opt_t *options); hsize_t diff_datasetid( hid_t dset1_id, hid_t dset2_id, const char *obj1_name, const char *obj2_name, - diff_opt_t *options, - int print_dims); + diff_opt_t *options); hsize_t diff( hid_t file1_id, const char *path1, @@ -160,7 +158,7 @@ const char* diff_basename(const char *name); const char* get_type(int type); const char* get_class(H5T_class_t tclass); const char* get_sign(H5T_sign_t sign); -void print_dims( int r, hsize_t *d ); +void print_dimensions (int rank, hsize_t *dims); int print_objname(diff_opt_t *options, hsize_t nfound); void do_print_objname (const char *OBJ, const char *path1, const char *path2); diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index bf26370..3467116 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -152,6 +152,7 @@ int print_data(diff_opt_t *options) * *------------------------------------------------------------------------- */ + static void print_pos( int *ph, /* print header */ int pp, /* print percentage */ @@ -163,47 +164,53 @@ void print_pos( int *ph, /* print header */ const char *obj1, const char *obj2 ) { - int i; - - /* print header */ - if ( *ph==1 ) - { - *ph=0; - - if (pp) - { - parallel_print("%-15s %-15s %-15s %-15s %-15s\n", - "position", - (obj1!=NULL) ? obj1 : " ", - (obj2!=NULL) ? obj2 : " ", - "difference", - "relative"); - parallel_print("------------------------------------------------------------------------\n"); - } - else - { - parallel_print("%-15s %-15s %-15s %-20s\n", - "position", - (obj1!=NULL) ? obj1 : " ", - (obj2!=NULL) ? obj2 : " ", - "difference"); - parallel_print("------------------------------------------------------------\n"); - } - } - - for ( i = 0; i < rank; i++) - { - pos[i] = curr_pos/acc[i]; - curr_pos -= acc[i]*pos[i]; - } - assert( curr_pos == 0 ); + int i; + + /* print header */ + if ( *ph==1 ) + { + *ph=0; - parallel_print("[ " ); - for ( i = 0; i < rank; i++) - { - parallel_print("%"H5_PRINTF_LL_WIDTH"u ", (unsigned long_long)pos[i]); - } - parallel_print("]" ); + parallel_print("%-16s","size:"); + print_dimensions (rank,dims); + parallel_print("%-11s",""); + print_dimensions (rank,dims); + parallel_print("\n"); + + if (pp) + { + parallel_print("%-15s %-15s %-15s %-15s %-15s\n", + "position", + (obj1!=NULL) ? obj1 : " ", + (obj2!=NULL) ? obj2 : " ", + "difference", + "relative"); + parallel_print("------------------------------------------------------------------------\n"); + } + else + { + parallel_print("%-15s %-15s %-15s %-20s\n", + "position", + (obj1!=NULL) ? obj1 : " ", + (obj2!=NULL) ? obj2 : " ", + "difference"); + parallel_print("------------------------------------------------------------\n"); + } + } /* end print header */ + + for ( i = 0; i < rank; i++) + { + pos[i] = curr_pos/acc[i]; + curr_pos -= acc[i]*pos[i]; + } + assert( curr_pos == 0 ); + + parallel_print("[ " ); + for ( i = 0; i < rank; i++) + { + parallel_print("%"H5_PRINTF_LL_WIDTH"u ", (unsigned long_long)pos[i]); + } + parallel_print("]" ); } @@ -789,8 +796,7 @@ hsize_t diff_datum(void *_mem1, obj2_id, NULL, NULL, - options, - 0); + options); break; default: parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>", diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index e913e79..993a00f 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -61,8 +61,7 @@ hsize_t diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name, const char *obj2_name, - diff_opt_t *options, - int print_dims) + diff_opt_t *options) { hid_t did1=-1; hid_t did2=-1; @@ -110,8 +109,7 @@ hsize_t diff_dataset( hid_t file1_id, did2, obj1_name, obj2_name, - options, - print_dims); + options); } /*------------------------------------------------------------------------- * close @@ -160,8 +158,7 @@ hsize_t diff_datasetid( hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_name, - diff_opt_t *options, - int print_dims) + diff_opt_t *options) { hid_t sid1=-1; hid_t sid2=-1; @@ -231,14 +228,6 @@ hsize_t diff_datasetid( hid_t did1, if ( (f_tid2 = H5Dget_type(did2)) < 0 ) goto error; - - /*------------------------------------------------------------------------- - * print dimensions - *------------------------------------------------------------------------- - */ - if (print_dims) - print_size (rank1, dims1); - /*------------------------------------------------------------------------- * check for empty datasets *------------------------------------------------------------------------- @@ -726,14 +715,14 @@ int diff_can_type( hid_t f_tid1, /* file data type */ { if (options->m_verbose && obj1_name) { printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1); - print_dims(rank1,dims1); + print_dimensions(rank1,dims1); printf(", max dimensions "); - print_dims(rank1,maxdim1); + print_dimensions(rank1,maxdim1); printf("\n" ); printf("<%s> has rank %d, dimensions ", obj2_name, rank2); - print_dims(rank2,dims2); + print_dimensions(rank2,dims2); printf(", max dimensions "); - print_dims(rank2,maxdim2); + print_dimensions(rank2,maxdim2); } return 0; } @@ -764,15 +753,15 @@ int diff_can_type( hid_t f_tid1, /* file data type */ { if (options->m_verbose && obj1_name) { printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1); - print_dims(rank1,dims1); + print_dimensions(rank1,dims1); if (maxdim1 && maxdim2) { printf(", max dimensions "); - print_dims(rank1,maxdim1); + print_dimensions(rank1,maxdim1); printf("\n" ); printf("<%s> has rank %d, dimensions ", obj2_name, rank2); - print_dims(rank2,dims2); + print_dimensions(rank2,dims2); printf(", max dimensions "); - print_dims(rank2,maxdim2); + print_dimensions(rank2,maxdim2); } } return 0; @@ -787,10 +776,10 @@ int diff_can_type( hid_t f_tid1, /* file data type */ if (options->m_verbose) { printf( "Warning: different maximum dimensions\n"); printf("<%s> has max dimensions ", obj1_name); - print_dims(rank1,maxdim1); + print_dimensions(rank1,maxdim1); printf("\n"); printf("<%s> has max dimensions ", obj2_name); - print_dims(rank2,maxdim2); + print_dimensions(rank2,maxdim2); printf("\n"); } } diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c index eaaf35b..bd8207f 100644 --- a/tools/lib/h5diff_util.c +++ b/tools/lib/h5diff_util.c @@ -90,27 +90,30 @@ void parallel_print(const char* format, ...) va_end(ap); } - /*------------------------------------------------------------------------- - * Function: print_dims - * - * Purpose: print dimensions + * Function: print_dimensions * - * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu - * - * Date: May 9, 2003 + * Purpose: print dimensions * *------------------------------------------------------------------------- */ -void print_dims( int r, hsize_t *d ) +void +print_dimensions (int rank, hsize_t *dims) { - int i; - parallel_print("[ " ); - for ( i=0; i<r; i++ ) - parallel_print("%"H5_PRINTF_LL_WIDTH"u ",(unsigned long_long)d[i] ); - parallel_print("] " ); + int i; + + parallel_print("[" ); + for ( i = 0; i < rank-1; i++) + { + parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[i]); + parallel_print("x"); + } + parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]); + parallel_print("]" ); + } + /*------------------------------------------------------------------------- * Function: print_type * diff --git a/tools/testfiles/h5diff_100.txt b/tools/testfiles/h5diff_100.txt index 431b3c0..a2186a7 100644 --- a/tools/testfiles/h5diff_100.txt +++ b/tools/testfiles/h5diff_100.txt @@ -6,8 +6,8 @@ file1 file2 --------------------------------------- x x /big -dataset: -</big> and </big> [1073741824] +dataset: </big> and </big> +size: [1073741824] [1073741824] position big big difference ------------------------------------------------------------ [ 268435456 ] 31 0 31 @@ -1035,5 +1035,5 @@ position big big difference [ 268436478 ] 31 0 31 [ 268436479 ] 31 0 31 1024 differences found -group: -</> and </> 0 differences found +group : </> and </> +0 differences found diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt index a2e27c7..89a4bd2 100644 --- a/tools/testfiles/h5diff_101.txt +++ b/tools/testfiles/h5diff_101.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/d1 g1/d2 -v' ############################# -dataset: -</g1/d1> and </g1/d2> [3x2] +dataset: </g1/d1> and </g1/d2> +size: [3x2] [3x2] position d1 d2 difference ------------------------------------------------------------ [ 0 1 ] 1e-09 2e-09 1e-09 diff --git a/tools/testfiles/h5diff_102.txt b/tools/testfiles/h5diff_102.txt index f2d1e34..6d32ff3 100644 --- a/tools/testfiles/h5diff_102.txt +++ b/tools/testfiles/h5diff_102.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/fp1 g1/fp2 -v' ############################# -dataset: -</g1/fp1> and </g1/fp2> [3x2] +dataset: </g1/fp1> and </g1/fp2> +size: [3x2] [3x2] position fp1 fp2 difference ------------------------------------------------------------ [ 0 1 ] 1e-05 2e-05 1e-05 diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt index 712039a..988afe8 100644 --- a/tools/testfiles/h5diff_11.txt +++ b/tools/testfiles/h5diff_11.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5' ############################# -dataset: -</g1/dset1> and </g1/dset1> [3x2] +dataset: </g1/dset1> and </g1/dset1> 5 differences found diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt index 683e46e..666a91b 100644 --- a/tools/testfiles/h5diff_12.txt +++ b/tools/testfiles/h5diff_12.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2' ############################# -dataset: -</g1/dset1> and </g1/dset2> [3x2] +dataset: </g1/dset1> and </g1/dset2> 5 differences found diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index 3b41e8b..742b4b9 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r' ############################# -dataset: -</g1/dset1> and </g1/dset1> [3x2] +dataset: </g1/dset1> and </g1/dset1> +size: [3x2] [3x2] position dset1 dset1 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index 2a41a78..78e373a 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r g1/dset1 g1/dset2' ############################# -dataset: -</g1/dset1> and </g1/dset2> [3x2] +dataset: </g1/dset1> and </g1/dset2> +size: [3x2] [3x2] position dset1 dset2 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index 19ba649..fff7340 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -d 5 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> +size: [3x2] [3x2] position dset3 dset4 difference ------------------------------------------------------------ [ 0 1 ] 100 120 20 diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt index 06271be..d68cd47 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_16.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10 -p 0.01 -v' ############################# -dataset: -</g1/dset9> and </g1/dset10> [3x2] +dataset: </g1/dset9> and </g1/dset10> +size: [3x2] [3x2] position dset9 dset10 difference relative ------------------------------------------------------------------------ [ 0 0 ] 100 120 20 0.2 diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index 131d113..ac756c9 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -21,10 +21,10 @@ file1 file2 x /g1/fp2 x /g2 -group: -</g1> and </g1> 0 differences found -dataset: -</g1/dset1> and </g1/dset1> [3x2] +group : </g1> and </g1> +0 differences found +dataset: </g1/dset1> and </g1/dset1> +size: [3x2] [3x2] position dset1 dset1 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -33,5 +33,5 @@ position dset1 dset1 difference [ 1 1 ] 1 1.001 0.001 [ 2 1 ] 0 1 1 5 differences found -group: -</> and </> 0 differences found +group : </> and </> +0 differences found diff --git a/tools/testfiles/h5diff_191.txt b/tools/testfiles/h5diff_191.txt index 8ffacda..3fa0834 100644 --- a/tools/testfiles/h5diff_191.txt +++ b/tools/testfiles/h5diff_191.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset5 g1/dset6' ############################# -dataset: -</g1/dset5> and </g1/dset6> [3x2] +dataset: </g1/dset5> and </g1/dset6> +size: [3x2] [3x2] position dset5 dset6 difference relative ------------------------------------------------------------------------ [ 1 0 ] 100 103 3 0.030000 diff --git a/tools/testfiles/h5diff_192.txt b/tools/testfiles/h5diff_192.txt index 62b5ba4..38948a5 100644 --- a/tools/testfiles/h5diff_192.txt +++ b/tools/testfiles/h5diff_192.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset7 g1/dset8' ############################# -dataset: -</g1/dset7> and </g1/dset8> [3x2] +dataset: </g1/dset7> and </g1/dset8> +size: [3x2] [3x2] position dset7 dset8 difference relative ------------------------------------------------------------------------ [ 1 0 ] 100 103 3 0.030000 diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt index c456710..376e7c1 100644 --- a/tools/testfiles/h5diff_23.txt +++ b/tools/testfiles/h5diff_23.txt @@ -1,5 +1,5 @@ ############################# Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v g1 g1' ############################# -group: -</g1> and </g1> 0 differences found +group : </g1> and </g1> +0 differences found diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt index f50d889..3802d86 100644 --- a/tools/testfiles/h5diff_24.txt +++ b/tools/testfiles/h5diff_24.txt @@ -1,5 +1,5 @@ ############################# Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v t1 t1' ############################# -datatype: -</t1> and </t1> 0 differences found +datatype: </t1> and </t1> +0 differences found diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt index 55e1c5c..25d2669 100644 --- a/tools/testfiles/h5diff_25.txt +++ b/tools/testfiles/h5diff_25.txt @@ -1,5 +1,5 @@ ############################# Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v l1 l1' ############################# -soft link: -</l1> and </l1> 0 differences found +soft link: </l1> and </l1> +0 differences found diff --git a/tools/testfiles/h5diff_26.txt b/tools/testfiles/h5diff_26.txt index 51500da..544526b 100644 --- a/tools/testfiles/h5diff_26.txt +++ b/tools/testfiles/h5diff_26.txt @@ -1,5 +1,5 @@ ############################# Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v g1 g2' ############################# -group: -</g1> and </g2> 1 differences found +group : </g1> and </g2> +1 differences found diff --git a/tools/testfiles/h5diff_27.txt b/tools/testfiles/h5diff_27.txt index 2120c52..3ba886c 100644 --- a/tools/testfiles/h5diff_27.txt +++ b/tools/testfiles/h5diff_27.txt @@ -1,5 +1,5 @@ ############################# Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v t1 t2' ############################# -datatype: -</t1> and </t2> 1 differences found +datatype: </t1> and </t2> +1 differences found diff --git a/tools/testfiles/h5diff_28.txt b/tools/testfiles/h5diff_28.txt index 3ba1d6c..767e9fc 100644 --- a/tools/testfiles/h5diff_28.txt +++ b/tools/testfiles/h5diff_28.txt @@ -1,5 +1,5 @@ ############################# Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v l1 l2' ############################# -soft link: -</l1> and </l2> 1 differences found +soft link: </l1> and </l2> +1 differences found diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index d529d66..484fab9 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -1,11 +1,11 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset0a dset0b' ############################# -dataset: -</dset0a> and </dset0b> [3x2] +dataset: </dset0a> and </dset0b> Warning: different storage datatype </dset0a> has file datatype H5T_STD_I16LE </dset0b> has file datatype H5T_STD_I32LE +size: [3x2] [3x2] position dset0a dset0b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index 3314a85..b361bda 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset1a dset1b' ############################# -dataset: -</dset1a> and </dset1b> [3x2] +dataset: </dset1a> and </dset1b> +size: [3x2] [3x2] position dset1a dset1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index 9f3dee9..59914fe 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset2a dset2b' ############################# -dataset: -</dset2a> and </dset2b> [3x2] +dataset: </dset2a> and </dset2b> +size: [3x2] [3x2] position dset2a dset2b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index fe7bc2c..51c5c2c 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset3a dset4b' ############################# -dataset: -</dset3a> and </dset4b> [3x2] +dataset: </dset3a> and </dset4b> +size: [3x2] [3x2] position dset3a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index d9f4110..50ea51c 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset4a dset4b' ############################# -dataset: -</dset4a> and </dset4b> [3x2] +dataset: </dset4a> and </dset4b> +size: [3x2] [3x2] position dset4a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index 8a3ceb0..aaf8f21 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset5a dset5b' ############################# -dataset: -</dset5a> and </dset5b> [3x2] +dataset: </dset5a> and </dset5b> +size: [3x2] [3x2] position dset5a dset5b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index ddad5c5..e31378e 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -1,8 +1,8 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset6a dset6b' ############################# -dataset: -</dset6a> and </dset6b> [3x2] +dataset: </dset6a> and </dset6b> +size: [3x2] [3x2] position dset6a dset6b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt index b873a5b..dde8cc0 100644 --- a/tools/testfiles/h5diff_57.txt +++ b/tools/testfiles/h5diff_57.txt @@ -1,8 +1,7 @@ ############################# Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset7a dset7b' ############################# -dataset: -</dset7a> and </dset7b> [3x2] +dataset: </dset7a> and </dset7b> Warning: different storage datatype </dset7a> has file datatype H5T_STD_I8LE </dset7b> has file datatype H5T_STD_U8LE diff --git a/tools/testfiles/h5diff_58.txt b/tools/testfiles/h5diff_58.txt index f9224ae..4299ddb 100644 --- a/tools/testfiles/h5diff_58.txt +++ b/tools/testfiles/h5diff_58.txt @@ -1,8 +1,7 @@ ############################# Expected output for 'h5diff h5diff_dset1.h5 h5diff_dset2.h5 -v refreg' ############################# -dataset: -</refreg> and </refreg> [2] +dataset: </refreg> and </refreg> Referenced dataset 5904 5904 ------------------------------------------------------------ Region blocks diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt index 853801e..ee999be 100644 --- a/tools/testfiles/h5diff_607.txt +++ b/tools/testfiles/h5diff_607.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt index 8f0bb17..7d4f9c8 100644 --- a/tools/testfiles/h5diff_608.txt +++ b/tools/testfiles/h5diff_608.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 -d 2 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt index 853801e..ee999be 100644 --- a/tools/testfiles/h5diff_610.txt +++ b/tools/testfiles/h5diff_610.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt index dacba1c..104e2ad 100644 --- a/tools/testfiles/h5diff_616.txt +++ b/tools/testfiles/h5diff_616.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.21 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 2 differences found diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt index 7608383..9dd3bc7 100644 --- a/tools/testfiles/h5diff_617.txt +++ b/tools/testfiles/h5diff_617.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 2 differences found diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt index 201b828..3005978 100644 --- a/tools/testfiles/h5diff_619.txt +++ b/tools/testfiles/h5diff_619.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.005 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt index 7cb840b..4de9a83 100644 --- a/tools/testfiles/h5diff_625.txt +++ b/tools/testfiles/h5diff_625.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 2 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 2 differences found diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt index db2a825..3d481b7 100644 --- a/tools/testfiles/h5diff_626.txt +++ b/tools/testfiles/h5diff_626.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 2 -n 3 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 3 differences found diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt index 74aea46..4e422fe 100644 --- a/tools/testfiles/h5diff_627.txt +++ b/tools/testfiles/h5diff_627.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 200 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt index f3ea626..e24fb78 100644 --- a/tools/testfiles/h5diff_628.txt +++ b/tools/testfiles/h5diff_628.txt @@ -1,6 +1,5 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 1 g1/dset3 g1/dset4' ############################# -dataset: -</g1/dset3> and </g1/dset4> [3x2] +dataset: </g1/dset3> and </g1/dset4> 1 differences found diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index c673d79..d2edf7a 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -7,55 +7,61 @@ file1 file2 x x /dset x x /g1 -dataset: -</dset> and </dset> [2] +dataset: </dset> and </dset> </dset> and </dset> are empty datasets 0 differences found -group: -</g1> and </g1> 0 differences found -attribute: -<string of </g1>> and <string of </g1>> position string of </g1> string of </g1> difference +group : </g1> and </g1> +0 differences found +attribute: <string of </g1>> and <string of </g1>> +size: [2] [2] +position string of </g1> string of </g1> difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z 4 differences found -attribute: -<bitfield of </g1>> and <bitfield of </g1>> position bitfield of </g1> bitfield of </g1> difference +attribute: <bitfield of </g1>> and <bitfield of </g1>> +size: [2] [2] +position bitfield of </g1> bitfield of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<opaque of </g1>> and <opaque of </g1>> position opaque of </g1> opaque of </g1> difference +attribute: <opaque of </g1>> and <opaque of </g1>> +size: [2] [2] +position opaque of </g1> opaque of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<compound of </g1>> and <compound of </g1>> position compound of </g1> compound of </g1> difference +attribute: <compound of </g1>> and <compound of </g1>> +size: [2] [2] +position compound of </g1> compound of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 [ 1 ] 3 0 3 [ 1 ] 4 0 4 4 differences found -attribute: -<enum of </g1>> and <enum of </g1>> position enum of </g1> enum of </g1> difference +attribute: <enum of </g1>> and <enum of </g1>> +size: [2] [2] +position enum of </g1> enum of </g1> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found -attribute: -<vlen of </g1>> and <vlen of </g1>> position vlen of </g1> vlen of </g1> difference +attribute: <vlen of </g1>> and <vlen of </g1>> +size: [2] [2] +position vlen of </g1> vlen of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 3 differences found -attribute: -<array of </g1>> and <array of </g1>> position array of </g1> array of </g1> difference +attribute: <array of </g1>> and <array of </g1>> +size: [2] [2] +position array of </g1> array of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 @@ -64,20 +70,23 @@ attribute: [ 1 ] 5 0 5 [ 1 ] 6 0 6 6 differences found -attribute: -<integer of </g1>> and <integer of </g1>> position integer of </g1> integer of </g1> difference +attribute: <integer of </g1>> and <integer of </g1>> +size: [2] [2] +position integer of </g1> integer of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<float of </g1>> and <float of </g1>> position float of </g1> float of </g1> difference +attribute: <float of </g1>> and <float of </g1>> +size: [2] [2] +position float of </g1> float of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<string2D of </g1>> and <string2D of </g1>> position string2D of </g1> string2D of </g1> difference +attribute: <string2D of </g1>> and <string2D of </g1>> +size: [3x2] [3x2] +position string2D of </g1> string2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] a z [ 0 0 ] b z @@ -92,8 +101,9 @@ attribute: [ 2 1 ] k z [ 2 1 ] l z 12 differences found -attribute: -<bitfield2D of </g1>> and <bitfield2D of </g1>> position bitfield2D of </g1> bitfield2D of </g1> difference +attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>> +size: [3x2] [3x2] +position bitfield2D of </g1> bitfield2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -102,8 +112,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<opaque2D of </g1>> and <opaque2D of </g1>> position opaque2D of </g1> opaque2D of </g1> difference +attribute: <opaque2D of </g1>> and <opaque2D of </g1>> +size: [3x2] [3x2] +position opaque2D of </g1> opaque2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -112,8 +123,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<compound2D of </g1>> and <compound2D of </g1>> position compound2D of </g1> compound2D of </g1> difference +attribute: <compound2D of </g1>> and <compound2D of </g1>> +size: [3x2] [3x2] +position compound2D of </g1> compound2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -128,8 +140,9 @@ attribute: [ 2 1 ] 11 0 11 [ 2 1 ] 12 0 12 12 differences found -attribute: -<enum2D of </g1>> and <enum2D of </g1>> position enum2D of </g1> enum2D of </g1> difference +attribute: <enum2D of </g1>> and <enum2D of </g1>> +size: [3x2] [3x2] +position enum2D of </g1> enum2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN [ 0 1 ] RED GREEN @@ -138,8 +151,9 @@ attribute: [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN 6 differences found -attribute: -<vlen2D of </g1>> and <vlen2D of </g1>> position vlen2D of </g1> vlen2D of </g1> difference +attribute: <vlen2D of </g1>> and <vlen2D of </g1>> +size: [3x2] [3x2] +position vlen2D of </g1> vlen2D of </g1> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 1 0 ] 2 0 2 @@ -153,8 +167,9 @@ attribute: [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 11 differences found -attribute: -<array2D of </g1>> and <array2D of </g1>> position array2D of </g1> array2D of </g1> difference +attribute: <array2D of </g1>> and <array2D of </g1>> +size: [3x2] [3x2] +position array2D of </g1> array2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -175,8 +190,9 @@ attribute: [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 18 differences found -attribute: -<integer2D of </g1>> and <integer2D of </g1>> position integer2D of </g1> integer2D of </g1> difference +attribute: <integer2D of </g1>> and <integer2D of </g1>> +size: [3x2] [3x2] +position integer2D of </g1> integer2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -185,8 +201,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<float2D of </g1>> and <float2D of </g1>> position float2D of </g1> float2D of </g1> difference +attribute: <float2D of </g1>> and <float2D of </g1>> +size: [3x2] [3x2] +position float2D of </g1> float2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -195,8 +212,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<string3D of </g1>> and <string3D of </g1>> position string3D of </g1> string3D of </g1> difference +attribute: <string3D of </g1>> and <string3D of </g1>> +size: [4x3x2] [4x3x2] +position string3D of </g1> string3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] a z [ 0 0 0 ] b z @@ -246,8 +264,9 @@ attribute: [ 3 2 1 ] X z [ 3 2 1 ] Z z 47 differences found -attribute: -<bitfield3D of </g1>> and <bitfield3D of </g1>> position bitfield3D of </g1> bitfield3D of </g1> difference +attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>> +size: [4x3x2] [4x3x2] +position bitfield3D of </g1> bitfield3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -274,8 +293,9 @@ attribute: [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: -<opaque3D of </g1>> and <opaque3D of </g1>> position opaque3D of </g1> opaque3D of </g1> difference +attribute: <opaque3D of </g1>> and <opaque3D of </g1>> +size: [4x3x2] [4x3x2] +position opaque3D of </g1> opaque3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -302,8 +322,9 @@ attribute: [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: -<compound3D of </g1>> and <compound3D of </g1>> position compound3D of </g1> compound3D of </g1> difference +attribute: <compound3D of </g1>> and <compound3D of </g1>> +size: [4x3x2] [4x3x2] +position compound3D of </g1> compound3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -354,8 +375,9 @@ attribute: [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48 0 48 48 differences found -attribute: -<enum3D of </g1>> and <enum3D of </g1>> position enum3D of </g1> enum3D of </g1> difference +attribute: <enum3D of </g1>> and <enum3D of </g1>> +size: [4x3x2] [4x3x2] +position enum3D of </g1> enum3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED [ 0 0 1 ] GREEN RED @@ -382,8 +404,9 @@ attribute: [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED 24 differences found -attribute: -<vlen3D of </g1>> and <vlen3D of </g1>> position vlen3D of </g1> vlen3D of </g1> difference +attribute: <vlen3D of </g1>> and <vlen3D of </g1>> +size: [4x3x2] [4x3x2] +position vlen3D of </g1> vlen3D of </g1> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 [ 0 1 0 ] 2 0 2 @@ -445,8 +468,9 @@ attribute: [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 59 differences found -attribute: -<array3D of </g1>> and <array3D of </g1>> position array3D of </g1> array3D of </g1> difference +attribute: <array3D of </g1>> and <array3D of </g1>> +size: [4x3x2] [4x3x2] +position array3D of </g1> array3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -521,8 +545,9 @@ attribute: [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 72 differences found -attribute: -<integer3D of </g1>> and <integer3D of </g1>> position integer3D of </g1> integer3D of </g1> difference +attribute: <integer3D of </g1>> and <integer3D of </g1>> +size: [4x3x2] [4x3x2] +position integer3D of </g1> integer3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -549,8 +574,9 @@ attribute: [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: -<float3D of </g1>> and <float3D of </g1>> position float3D of </g1> float3D of </g1> difference +attribute: <float3D of </g1>> and <float3D of </g1>> +size: [4x3x2] [4x3x2] +position float3D of </g1> float3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -577,51 +603,58 @@ attribute: [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -group: -</> and </> 0 differences found -attribute: -<string of </>> and <string of </>> position string of </> string of </> difference +group : </> and </> +0 differences found +attribute: <string of </>> and <string of </>> +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: -<bitfield of </>> and <bitfield of </>> position bitfield of </> bitfield of </> difference +attribute: <bitfield of </>> and <bitfield of </>> +size: [2] [2] +position bitfield of </> bitfield of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<opaque of </>> and <opaque of </>> position opaque of </> opaque of </> difference +attribute: <opaque of </>> and <opaque of </>> +size: [2] [2] +position opaque of </> opaque of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<compound of </>> and <compound of </>> position compound of </> compound of </> difference +attribute: <compound of </>> and <compound of </>> +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: -<enum of </>> and <enum of </>> position enum of </> enum of </> difference +attribute: <enum of </>> and <enum of </>> +size: [2] [2] +position enum of </> enum of </> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found -attribute: -<vlen of </>> and <vlen of </>> position vlen of </> vlen of </> difference +attribute: <vlen of </>> and <vlen of </>> +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: -<array of </>> and <array of </>> position array of </> array of </> difference +attribute: <array of </>> and <array of </>> +size: [2] [2] +position array of </> array of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 @@ -630,20 +663,23 @@ attribute: [ 1 ] 5 0 5 [ 1 ] 6 0 6 6 differences found -attribute: -<integer of </>> and <integer of </>> position integer of </> integer of </> difference +attribute: <integer of </>> and <integer of </>> +size: [2] [2] +position integer of </> integer of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<float of </>> and <float of </>> position float of </> float of </> difference +attribute: <float of </>> and <float of </>> +size: [2] [2] +position float of </> float of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: -<string2D of </>> and <string2D of </>> position string2D of </> string2D of </> difference +attribute: <string2D of </>> and <string2D of </>> +size: [3x2] [3x2] +position string2D of </> string2D of </> difference ------------------------------------------------------------ [ 0 0 ] a z [ 0 0 ] b z @@ -658,8 +694,9 @@ attribute: [ 2 1 ] k z [ 2 1 ] l z 12 differences found -attribute: -<bitfield2D of </>> and <bitfield2D of </>> position bitfield2D of </> bitfield2D of </> difference +attribute: <bitfield2D of </>> and <bitfield2D of </>> +size: [3x2] [3x2] +position bitfield2D of </> bitfield2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -668,8 +705,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<opaque2D of </>> and <opaque2D of </>> position opaque2D of </> opaque2D of </> difference +attribute: <opaque2D of </>> and <opaque2D of </>> +size: [3x2] [3x2] +position opaque2D of </> opaque2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -678,8 +716,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<compound2D of </>> and <compound2D of </>> position compound2D of </> compound2D of </> difference +attribute: <compound2D of </>> and <compound2D of </>> +size: [3x2] [3x2] +position compound2D of </> compound2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -694,8 +733,9 @@ attribute: [ 2 1 ] 11 0 11 [ 2 1 ] 12 0 12 12 differences found -attribute: -<enum2D of </>> and <enum2D of </>> position enum2D of </> enum2D of </> difference +attribute: <enum2D of </>> and <enum2D of </>> +size: [3x2] [3x2] +position enum2D of </> enum2D of </> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN [ 0 1 ] RED GREEN @@ -704,8 +744,9 @@ attribute: [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN 6 differences found -attribute: -<vlen2D of </>> and <vlen2D of </>> position vlen2D of </> vlen2D of </> difference +attribute: <vlen2D of </>> and <vlen2D of </>> +size: [3x2] [3x2] +position vlen2D of </> vlen2D of </> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 1 0 ] 2 0 2 @@ -719,8 +760,9 @@ attribute: [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 11 differences found -attribute: -<array2D of </>> and <array2D of </>> position array2D of </> array2D of </> difference +attribute: <array2D of </>> and <array2D of </>> +size: [3x2] [3x2] +position array2D of </> array2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -741,8 +783,9 @@ attribute: [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 18 differences found -attribute: -<integer2D of </>> and <integer2D of </>> position integer2D of </> integer2D of </> difference +attribute: <integer2D of </>> and <integer2D of </>> +size: [3x2] [3x2] +position integer2D of </> integer2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -751,8 +794,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<float2D of </>> and <float2D of </>> position float2D of </> float2D of </> difference +attribute: <float2D of </>> and <float2D of </>> +size: [3x2] [3x2] +position float2D of </> float2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -761,8 +805,9 @@ attribute: [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: -<string3D of </>> and <string3D of </>> position string3D of </> string3D of </> difference +attribute: <string3D of </>> and <string3D of </>> +size: [4x3x2] [4x3x2] +position string3D of </> string3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] a z [ 0 0 0 ] b z @@ -812,8 +857,9 @@ attribute: [ 3 2 1 ] X z [ 3 2 1 ] Z z 47 differences found -attribute: -<bitfield3D of </>> and <bitfield3D of </>> position bitfield3D of </> bitfield3D of </> difference +attribute: <bitfield3D of </>> and <bitfield3D of </>> +size: [4x3x2] [4x3x2] +position bitfield3D of </> bitfield3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -840,8 +886,9 @@ attribute: [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: -<opaque3D of </>> and <opaque3D of </>> position opaque3D of </> opaque3D of </> difference +attribute: <opaque3D of </>> and <opaque3D of </>> +size: [4x3x2] [4x3x2] +position opaque3D of </> opaque3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -868,8 +915,9 @@ attribute: [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: -<compound3D of </>> and <compound3D of </>> position compound3D of </> compound3D of </> difference +attribute: <compound3D of </>> and <compound3D of </>> +size: [4x3x2] [4x3x2] +position compound3D of </> compound3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -920,8 +968,9 @@ attribute: [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48 0 48 48 differences found -attribute: -<enum3D of </>> and <enum3D of </>> position enum3D of </> enum3D of </> difference +attribute: <enum3D of </>> and <enum3D of </>> +size: [4x3x2] [4x3x2] +position enum3D of </> enum3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED [ 0 0 1 ] GREEN RED @@ -948,8 +997,9 @@ attribute: [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED 24 differences found -attribute: -<vlen3D of </>> and <vlen3D of </>> position vlen3D of </> vlen3D of </> difference +attribute: <vlen3D of </>> and <vlen3D of </>> +size: [4x3x2] [4x3x2] +position vlen3D of </> vlen3D of </> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 [ 0 1 0 ] 2 0 2 @@ -1011,8 +1061,9 @@ attribute: [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 59 differences found -attribute: -<array3D of </>> and <array3D of </>> position array3D of </> array3D of </> difference +attribute: <array3D of </>> and <array3D of </>> +size: [4x3x2] [4x3x2] +position array3D of </> array3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -1087,8 +1138,9 @@ attribute: [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 72 differences found -attribute: -<integer3D of </>> and <integer3D of </>> position integer3D of </> integer3D of </> difference +attribute: <integer3D of </>> and <integer3D of </>> +size: [4x3x2] [4x3x2] +position integer3D of </> integer3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -1115,8 +1167,9 @@ attribute: [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: -<float3D of </>> and <float3D of </>> position float3D of </> float3D of </> difference +attribute: <float3D of </>> and <float3D of </>> +size: [4x3x2] [4x3x2] +position float3D of </> float3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index f30cdea..063f1d0 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -39,20 +39,19 @@ file1 file2 x x /g1/vlen3D x x /refreg -dataset: -</dset> and </dset> [2] +dataset: </dset> and </dset> +size: [2] [2] position dset dset difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -dataset: -</dsetref> and </dsetref> [10x10] +dataset: </dsetref> and </dsetref> 0 differences found -group: -</g1> and </g1> 0 differences found -dataset: -</g1/array> and </g1/array> [2] +group : </g1> and </g1> +0 differences found +dataset: </g1/array> and </g1/array> +size: [2] [2] position array array difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -62,8 +61,8 @@ position array array difference [ 1 ] 5 0 5 [ 1 ] 6 0 6 6 differences found -dataset: -</g1/array2D> and </g1/array2D> [3x2] +dataset: </g1/array2D> and </g1/array2D> +size: [3x2] [3x2] position array2D array2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -85,8 +84,8 @@ position array2D array2D difference [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 18 differences found -dataset: -</g1/array3D> and </g1/array3D> [4x3x2] +dataset: </g1/array3D> and </g1/array3D> +size: [4x3x2] [4x3x2] position array3D array3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -162,15 +161,15 @@ position array3D array3D difference [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 72 differences found -dataset: -</g1/bitfield> and </g1/bitfield> [2] +dataset: </g1/bitfield> and </g1/bitfield> +size: [2] [2] position bitfield bitfield difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -dataset: -</g1/bitfield2D> and </g1/bitfield2D> [3x2] +dataset: </g1/bitfield2D> and </g1/bitfield2D> +size: [3x2] [3x2] position bitfield2D bitfield2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -180,8 +179,8 @@ position bitfield2D bitfield2D difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -dataset: -</g1/bitfield3D> and </g1/bitfield3D> [4x3x2] +dataset: </g1/bitfield3D> and </g1/bitfield3D> +size: [4x3x2] [4x3x2] position bitfield3D bitfield3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -209,8 +208,8 @@ position bitfield3D bitfield3D difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -dataset: -</g1/compound> and </g1/compound> [2] +dataset: </g1/compound> and </g1/compound> +size: [2] [2] position compound compound difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -218,8 +217,8 @@ position compound compound difference [ 1 ] 3 0 3 [ 1 ] 4 0 4 4 differences found -dataset: -</g1/compound2D> and </g1/compound2D> [3x2] +dataset: </g1/compound2D> and </g1/compound2D> +size: [3x2] [3x2] position compound2D compound2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -235,8 +234,8 @@ position compound2D compound2D difference [ 2 1 ] 11 0 11 [ 2 1 ] 12 0 12 12 differences found -dataset: -</g1/compound3D> and </g1/compound3D> [4x3x2] +dataset: </g1/compound3D> and </g1/compound3D> +size: [4x3x2] [4x3x2] position compound3D compound3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -288,29 +287,27 @@ position compound3D compound3D difference [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48 0 48 48 differences found -dataset: -</g1/enum> and </g1/enum> [2] +dataset: </g1/enum> and </g1/enum> +size: [2] [2] position enum enum difference ------------------------------------------------------------ [ 0 ] RED GREEN 1 differences found -dataset: -</g1/enum2D> and </g1/enum2D> [3x2] +dataset: </g1/enum2D> and </g1/enum2D> </g1/enum2D> and </g1/enum2D> are empty datasets 0 differences found -dataset: -</g1/enum3D> and </g1/enum3D> [4x3x2] +dataset: </g1/enum3D> and </g1/enum3D> </g1/enum3D> and </g1/enum3D> are empty datasets 0 differences found -dataset: -</g1/float> and </g1/float> [2] +dataset: </g1/float> and </g1/float> +size: [2] [2] position float float difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -dataset: -</g1/float2D> and </g1/float2D> [3x2] +dataset: </g1/float2D> and </g1/float2D> +size: [3x2] [3x2] position float2D float2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -320,8 +317,8 @@ position float2D float2D difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -dataset: -</g1/float3D> and </g1/float3D> [4x3x2] +dataset: </g1/float3D> and </g1/float3D> +size: [4x3x2] [4x3x2] position float3D float3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -349,15 +346,15 @@ position float3D float3D difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -dataset: -</g1/integer> and </g1/integer> [2] +dataset: </g1/integer> and </g1/integer> +size: [2] [2] position integer integer difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -dataset: -</g1/integer2D> and </g1/integer2D> [3x2] +dataset: </g1/integer2D> and </g1/integer2D> +size: [3x2] [3x2] position integer2D integer2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -367,8 +364,8 @@ position integer2D integer2D difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -dataset: -</g1/integer3D> and </g1/integer3D> [4x3x2] +dataset: </g1/integer3D> and </g1/integer3D> +size: [4x3x2] [4x3x2] position integer3D integer3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -396,15 +393,15 @@ position integer3D integer3D difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -dataset: -</g1/opaque> and </g1/opaque> [2] +dataset: </g1/opaque> and </g1/opaque> +size: [2] [2] position opaque opaque difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -dataset: -</g1/opaque2D> and </g1/opaque2D> [3x2] +dataset: </g1/opaque2D> and </g1/opaque2D> +size: [3x2] [3x2] position opaque2D opaque2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -414,8 +411,8 @@ position opaque2D opaque2D difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -dataset: -</g1/opaque3D> and </g1/opaque3D> [4x3x2] +dataset: </g1/opaque3D> and </g1/opaque3D> +size: [4x3x2] [4x3x2] position opaque3D opaque3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -443,145 +440,174 @@ position opaque3D opaque3D difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -dataset: -</g1/reference> and </g1/reference> [2] +dataset: </g1/reference> and </g1/reference> +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: -</g1/reference2D> and </g1/reference2D> [3x2] +dataset: </g1/reference2D> and </g1/reference2D> +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: -</g1/reference3D> and </g1/reference3D> [4x3x2] +dataset: </g1/reference3D> and </g1/reference3D> +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: -</g1/string> and </g1/string> [2] +dataset: </g1/string> and </g1/string> +size: [2] [2] position string string difference ------------------------------------------------------------ [ 0 ] a z @@ -589,8 +615,8 @@ position string string difference [ 1 ] d z [ 1 ] e z 4 differences found -dataset: -</g1/string2D> and </g1/string2D> [3x2] +dataset: </g1/string2D> and </g1/string2D> +size: [3x2] [3x2] position string2D string2D difference ------------------------------------------------------------ [ 0 0 ] a z @@ -606,8 +632,8 @@ position string2D string2D difference [ 2 1 ] k z [ 2 1 ] l z 12 differences found -dataset: -</g1/string3D> and </g1/string3D> [4x3x2] +dataset: </g1/string3D> and </g1/string3D> +size: [4x3x2] [4x3x2] position string3D string3D difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -658,16 +684,16 @@ position string3D string3D difference [ 3 2 1 ] X z [ 3 2 1 ] Z z 47 differences found -dataset: -</g1/vlen> and </g1/vlen> [2] +dataset: </g1/vlen> and </g1/vlen> +size: [2] [2] position vlen vlen difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 3 differences found -dataset: -</g1/vlen2D> and </g1/vlen2D> [3x2] +dataset: </g1/vlen2D> and </g1/vlen2D> +size: [3x2] [3x2] position vlen2D vlen2D difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -682,8 +708,8 @@ position vlen2D vlen2D difference [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 11 differences found -dataset: -</g1/vlen3D> and </g1/vlen3D> [4x3x2] +dataset: </g1/vlen3D> and </g1/vlen3D> +size: [4x3x2] [4x3x2] position vlen3D vlen3D difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -746,8 +772,7 @@ position vlen3D vlen3D difference [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 59 differences found -dataset: -</refreg> and </refreg> [2] +dataset: </refreg> and </refreg> Referenced dataset 5904 5904 ------------------------------------------------------------ Region blocks @@ -757,8 +782,8 @@ point #1 (2,2) (3,3) point #3 (1,6) (2,5) point #4 (2,8) (1,7) 4 differences found -group: -</> and </> 0 differences found +group : </> and </> +0 differences found -------------------------------- Some objects are not comparable -------------------------------- |