mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
a2f9ebb3ab
hdf5/tools/lib/h5diff_dset.c

608 lines
16 KiB
C
Raw Normal View History

[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* 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://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "h5diff.h"
[svn-r9872] Purpose: New feature. Description: Added new tool ph5diff. (Code done by Leon Arber.) Code is changed but test is not working yet. For now, it skipped all tests. Platforms tested: Tested in heping, serial and parallel modes.
2005-01-27 07:03:29 +08:00
#include "ph5diff.h"
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
#include "H5private.h"
[svn-r8229] Purpose: 1) new function for tools library 2) new test script for h5repack Description: 1) currently all the tools (h5dump, h5diff, etc) do not check if a filter is available for reading some dataset that might have a filter not available on the current configuration (the behaviour of the tools until now was to trigger a library error, saying that the dataset cannot be read due to the lack of the filter) Solution: 1) added a new function h5tools_canreadf that checks if a dataset can be read depending on the availability of filters. this function was added in calls for h5diff and h5repack. instead of triggering the library error, a message is printed, saying that the dataset cannot be read (the print is optional, it is on on verbose mode) 2) added a shell script that tests the commannd line tool behaviour of h5repack the script does a series of runs of h5repack with several options on the same file (this file test4.h5 was added to the testfiles dir). then, it runs the h5diff tool, with the input and output files , in each run. the goal of the test is also to check item 1) . the binary file was saved with filters that might not be available on other configurations Platforms tested: linux (all filters enabled) linux (some filters disabled) solaris (some filters disabled) AIX (some filters disabled) windows (all filters on and off ) Misc. update:
2004-03-03 02:12:25 +08:00
#include "h5tools.h"
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
* Function: diff_dataset
*
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
* Purpose: check for comparable datasets and read into a compatible
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
* memory type
*
* Return: Number of differences found
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
*
* Date: May 9, 2003
*
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
hsize_t diff_dataset( hid_t file1_id,
hid_t file2_id,
const char *obj1_name,
const char *obj2_name,
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
diff_opt_t *options )
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
{
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
hid_t dset1_id=-1;
hid_t dset2_id=-1;
hid_t dcpl1_id=-1;
hid_t dcpl2_id=-1;
hsize_t nfound=0;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
* open the handles
*-------------------------------------------------------------------------
*/
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
/* disable error reporting */
H5E_BEGIN_TRY {
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/* Open the datasets */
if ( (dset1_id = H5Dopen(file1_id,obj1_name)) < 0 )
{
printf("Cannot open dataset <%s>\n", obj1_name );
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
}
if ( (dset2_id = H5Dopen(file2_id,obj2_name)) < 0 )
{
printf("Cannot open dataset <%s>\n", obj2_name );
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
}
/* enable error reporting */
} H5E_END_TRY;
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if ((dcpl1_id=H5Dget_create_plist(dset1_id))<0)
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if ((dcpl2_id=H5Dget_create_plist(dset2_id))<0)
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r8229] Purpose: 1) new function for tools library 2) new test script for h5repack Description: 1) currently all the tools (h5dump, h5diff, etc) do not check if a filter is available for reading some dataset that might have a filter not available on the current configuration (the behaviour of the tools until now was to trigger a library error, saying that the dataset cannot be read due to the lack of the filter) Solution: 1) added a new function h5tools_canreadf that checks if a dataset can be read depending on the availability of filters. this function was added in calls for h5diff and h5repack. instead of triggering the library error, a message is printed, saying that the dataset cannot be read (the print is optional, it is on on verbose mode) 2) added a shell script that tests the commannd line tool behaviour of h5repack the script does a series of runs of h5repack with several options on the same file (this file test4.h5 was added to the testfiles dir). then, it runs the h5diff tool, with the input and output files , in each run. the goal of the test is also to check item 1) . the binary file was saved with filters that might not be available on other configurations Platforms tested: linux (all filters enabled) linux (some filters disabled) solaris (some filters disabled) AIX (some filters disabled) windows (all filters on and off ) Misc. update:
2004-03-03 02:12:25 +08:00
/*-------------------------------------------------------------------------
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
* check if the dataset creation property list has filters that
* are not registered in the current configuration
[svn-r8229] Purpose: 1) new function for tools library 2) new test script for h5repack Description: 1) currently all the tools (h5dump, h5diff, etc) do not check if a filter is available for reading some dataset that might have a filter not available on the current configuration (the behaviour of the tools until now was to trigger a library error, saying that the dataset cannot be read due to the lack of the filter) Solution: 1) added a new function h5tools_canreadf that checks if a dataset can be read depending on the availability of filters. this function was added in calls for h5diff and h5repack. instead of triggering the library error, a message is printed, saying that the dataset cannot be read (the print is optional, it is on on verbose mode) 2) added a shell script that tests the commannd line tool behaviour of h5repack the script does a series of runs of h5repack with several options on the same file (this file test4.h5 was added to the testfiles dir). then, it runs the h5diff tool, with the input and output files , in each run. the goal of the test is also to check item 1) . the binary file was saved with filters that might not be available on other configurations Platforms tested: linux (all filters enabled) linux (some filters disabled) solaris (some filters disabled) AIX (some filters disabled) windows (all filters on and off ) Misc. update:
2004-03-03 02:12:25 +08:00
* 1) the external filters GZIP and SZIP might not be available
* 2) the internal filters might be turned off
*-------------------------------------------------------------------------
*/
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
if ((h5tools_canreadf((options->m_verbose?obj1_name:NULL),dcpl1_id)==1) &&
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
(h5tools_canreadf((options->m_verbose?obj2_name:NULL),dcpl2_id)==1))
[svn-r8229] Purpose: 1) new function for tools library 2) new test script for h5repack Description: 1) currently all the tools (h5dump, h5diff, etc) do not check if a filter is available for reading some dataset that might have a filter not available on the current configuration (the behaviour of the tools until now was to trigger a library error, saying that the dataset cannot be read due to the lack of the filter) Solution: 1) added a new function h5tools_canreadf that checks if a dataset can be read depending on the availability of filters. this function was added in calls for h5diff and h5repack. instead of triggering the library error, a message is printed, saying that the dataset cannot be read (the print is optional, it is on on verbose mode) 2) added a shell script that tests the commannd line tool behaviour of h5repack the script does a series of runs of h5repack with several options on the same file (this file test4.h5 was added to the testfiles dir). then, it runs the h5diff tool, with the input and output files , in each run. the goal of the test is also to check item 1) . the binary file was saved with filters that might not be available on other configurations Platforms tested: linux (all filters enabled) linux (some filters disabled) solaris (some filters disabled) AIX (some filters disabled) windows (all filters on and off ) Misc. update:
2004-03-03 02:12:25 +08:00
{
nfound=diff_datasetid(dset1_id,
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
dset2_id,
obj1_name,
obj2_name,
options);
[svn-r8229] Purpose: 1) new function for tools library 2) new test script for h5repack Description: 1) currently all the tools (h5dump, h5diff, etc) do not check if a filter is available for reading some dataset that might have a filter not available on the current configuration (the behaviour of the tools until now was to trigger a library error, saying that the dataset cannot be read due to the lack of the filter) Solution: 1) added a new function h5tools_canreadf that checks if a dataset can be read depending on the availability of filters. this function was added in calls for h5diff and h5repack. instead of triggering the library error, a message is printed, saying that the dataset cannot be read (the print is optional, it is on on verbose mode) 2) added a shell script that tests the commannd line tool behaviour of h5repack the script does a series of runs of h5repack with several options on the same file (this file test4.h5 was added to the testfiles dir). then, it runs the h5diff tool, with the input and output files , in each run. the goal of the test is also to check item 1) . the binary file was saved with filters that might not be available on other configurations Platforms tested: linux (all filters enabled) linux (some filters disabled) solaris (some filters disabled) AIX (some filters disabled) windows (all filters on and off ) Misc. update:
2004-03-03 02:12:25 +08:00
}
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
/*-------------------------------------------------------------------------
* close
*-------------------------------------------------------------------------
*/
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
/* disable error reporting */
H5E_BEGIN_TRY {
H5Pclose(dcpl1_id);
H5Pclose(dcpl2_id);
H5Dclose(dset1_id);
H5Dclose(dset2_id);
/* enable error reporting */
} H5E_END_TRY;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
return nfound;
error:
options->err_stat=1;
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
/* disable error reporting */
H5E_BEGIN_TRY {
[svn-r8229] Purpose: 1) new function for tools library 2) new test script for h5repack Description: 1) currently all the tools (h5dump, h5diff, etc) do not check if a filter is available for reading some dataset that might have a filter not available on the current configuration (the behaviour of the tools until now was to trigger a library error, saying that the dataset cannot be read due to the lack of the filter) Solution: 1) added a new function h5tools_canreadf that checks if a dataset can be read depending on the availability of filters. this function was added in calls for h5diff and h5repack. instead of triggering the library error, a message is printed, saying that the dataset cannot be read (the print is optional, it is on on verbose mode) 2) added a shell script that tests the commannd line tool behaviour of h5repack the script does a series of runs of h5repack with several options on the same file (this file test4.h5 was added to the testfiles dir). then, it runs the h5diff tool, with the input and output files , in each run. the goal of the test is also to check item 1) . the binary file was saved with filters that might not be available on other configurations Platforms tested: linux (all filters enabled) linux (some filters disabled) solaris (some filters disabled) AIX (some filters disabled) windows (all filters on and off ) Misc. update:
2004-03-03 02:12:25 +08:00
H5Pclose(dcpl1_id);
H5Pclose(dcpl2_id);
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
H5Dclose(dset1_id);
H5Dclose(dset2_id);
/* enable error reporting */
} H5E_END_TRY;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
return nfound;
}
/*-------------------------------------------------------------------------
* Function: diff_datasetid
*
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
* Purpose: check for comparable datasets and read into a compatible
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
* memory type
*
* Return: Number of differences found
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
*
* Date: May 9, 2003
*
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
hsize_t diff_datasetid( hid_t dset1_id,
hid_t dset2_id,
const char *obj1_name,
const char *obj2_name,
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
diff_opt_t *options )
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
{
hid_t space1_id =-1;
hid_t space2_id =-1;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
hid_t f_type1=-1, f_type2=-1; /* file data type */
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
hid_t m_type1=-1, m_type2=-1; /* memory data type */
size_t m_size1, m_size2; /* size of type in memory */
H5T_sign_t sign1, sign2; /* sign of type */
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
int rank1, rank2;
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
void *buf1=NULL, *buf2=NULL;
hsize_t nelmts1, nelmts2;
hsize_t dims1[H5S_MAX_RANK];
hsize_t dims2[H5S_MAX_RANK];
hsize_t maxdim1[H5S_MAX_RANK];
hsize_t maxdim2[H5S_MAX_RANK];
const char *name1=NULL; /* relative names */
const char *name2=NULL;
hsize_t storage_size1;
hsize_t storage_size2;
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
hsize_t nfound=0; /* number of differences found */
int cmp=1; /* do diff or not */
[svn-r8383] Purpose: Code cleanup Description: Clean up lots of warnings based on those reported from the SGI compilers as well as gcc. Platforms tested: SGI O3900, IRIX64 6.5 (Cheryl's SGI machine) FreeBSD 4.9 (sleipnir) w/ & w/o parallel h5committest
2004-04-18 12:10:09 +08:00
int i;
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
/* Get the dataspace handle */
[svn-r8579] *** empty log message ***
2004-05-26 23:46:26 +08:00
if ( (space1_id = H5Dget_space(dset1_id)) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r8579] *** empty log message ***
2004-05-26 23:46:26 +08:00
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/* Get rank */
[svn-r8579] *** empty log message ***
2004-05-26 23:46:26 +08:00
if ( (rank1 = H5Sget_simple_extent_ndims(space1_id)) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r8579] *** empty log message ***
2004-05-26 23:46:26 +08:00
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
/* Get the dataspace handle */
if ( (space2_id = H5Dget_space(dset2_id)) < 0 )
goto error;
/* Get rank */
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
if ( (rank2 = H5Sget_simple_extent_ndims(space2_id)) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/* Get dimensions */
if ( H5Sget_simple_extent_dims(space1_id,dims1,maxdim1) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
/* Get dimensions */
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
if ( H5Sget_simple_extent_dims(space2_id,dims2,maxdim2) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
* Get the file data type
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
*-------------------------------------------------------------------------
*/
/* Get the data type */
if ( (f_type1 = H5Dget_type(dset1_id)) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/* Get the data type */
if ( (f_type2 = H5Dget_type(dset2_id)) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
[svn-r7792] Purpose: h5diff new features bug fix Description: implemented the diff for STRING and ARRAY types fixed a bug. when the datasets are empty, do not try to compare them . the check empty is made with H5Dgetstorage_size Solution: Platforms tested: linux solaris 5.7 IRIX Misc. update:
2003-10-30 22:40:01 +08:00
/*-------------------------------------------------------------------------
* check for empty datasets
*-------------------------------------------------------------------------
*/
storage_size1=H5Dget_storage_size(dset1_id);
storage_size2=H5Dget_storage_size(dset2_id);
if (storage_size1<=0 && storage_size2<=0)
[svn-r7793] Purpose: h5diff new features Description: added the diff for variable lenght, opaque, enum, and bitfield datasets Solution: Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-10-31 01:15:56 +08:00
{
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if (options->m_verbose && obj1_name && obj2_name)
[svn-r10994] Purpose: bug fix Description: when 2 objects were not comparable, the final print information for the non verbose mode printed "0 differences found" Solution: replaced instead with a Summary message that says "Some objects were not comparable" Platforms tested: linux solaris Misc. update:
2005-06-29 00:25:42 +08:00
parallel_print("<%s> and <%s> are empty datasets\n", obj1_name, obj2_name);
cmp=0;
options->not_cmp=1;
[svn-r7793] Purpose: h5diff new features Description: added the diff for variable lenght, opaque, enum, and bitfield datasets Solution: Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-10-31 01:15:56 +08:00
}
[svn-r7792] Purpose: h5diff new features bug fix Description: implemented the diff for STRING and ARRAY types fixed a bug. when the datasets are empty, do not try to compare them . the check empty is made with H5Dgetstorage_size Solution: Platforms tested: linux solaris 5.7 IRIX Misc. update:
2003-10-30 22:40:01 +08:00
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
* check for comparable TYPE and SPACE
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if (diff_can_type(f_type1,
f_type2,
rank1,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
rank2,
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
dims1,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
dims2,
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
maxdim1,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
maxdim2,
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
obj1_name,
obj2_name,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
options)!=1)
[svn-r10994] Purpose: bug fix Description: when 2 objects were not comparable, the final print information for the non verbose mode printed "0 differences found" Solution: replaced instead with a Summary message that says "Some objects were not comparable" Platforms tested: linux solaris Misc. update:
2005-06-29 00:25:42 +08:00
{
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
cmp=0;
[svn-r10994] Purpose: bug fix Description: when 2 objects were not comparable, the final print information for the non verbose mode printed "0 differences found" Solution: replaced instead with a Summary message that says "Some objects were not comparable" Platforms tested: linux solaris Misc. update:
2005-06-29 00:25:42 +08:00
options->not_cmp=1;
}
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
/*-------------------------------------------------------------------------
* only attempt to compare if possible
*-------------------------------------------------------------------------
*/
if (cmp)
{
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
* get number of elements
*-------------------------------------------------------------------------
*/
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
nelmts1 = 1;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
for (i = 0; i < rank1; i++)
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
{
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
nelmts1 *= dims1[i];
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
}
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
nelmts2 = 1;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
for (i = 0; i < rank2; i++)
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
{
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
nelmts2 *= dims2[i];
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
}
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
/* only assert if the space is the same */
assert(nelmts1==nelmts2);
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
* memory type and sizes
*-------------------------------------------------------------------------
*/
[svn-r9370] Purpose: Refactor code Description: Refactor common code for determining the native type for using in the tools into separate routine. Also, reduce diffs between the two branches and bring back some fixes from the development branch to the release branch. Platforms tested: FreeBSD 4.10 (sleipnir) too minor to require h5committest
2004-10-07 00:11:18 +08:00
if ((m_type1=h5tools_get_native_type(f_type1))<0)
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
[svn-r9370] Purpose: Refactor code Description: Refactor common code for determining the native type for using in the tools into separate routine. Also, reduce diffs between the two branches and bring back some fixes from the development branch to the release branch. Platforms tested: FreeBSD 4.10 (sleipnir) too minor to require h5committest
2004-10-07 00:11:18 +08:00
if ((m_type2=h5tools_get_native_type(f_type2))<0)
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
m_size1 = H5Tget_size( m_type1 );
m_size2 = H5Tget_size( m_type2 );
#if defined (H5DIFF_DEBUG)
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
if (obj1_name)
print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
#endif
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
* check for different signed/unsigned types
*-------------------------------------------------------------------------
*/
sign1=H5Tget_sign(m_type1);
sign2=H5Tget_sign(m_type2);
if ( sign1 != sign2 )
{
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
if (options->m_verbose && obj1_name) {
parallel_print("Comparison not supported: <%s> has sign %s ", obj1_name, get_sign(sign1));
parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
}
cmp=0;
options->not_cmp=1;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
}
/*-------------------------------------------------------------------------
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
* "upgrade" the smaller memory size
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
*-------------------------------------------------------------------------
*/
if ( m_size1 != m_size2 )
{
if ( m_size1 < m_size2 )
{
[svn-r7804] Purpose: h5diff new feature Description: added diff for the class ENUM Solution: Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-01 05:18:09 +08:00
H5Tclose(m_type1);
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
[svn-r9370] Purpose: Refactor code Description: Refactor common code for determining the native type for using in the tools into separate routine. Also, reduce diffs between the two branches and bring back some fixes from the development branch to the release branch. Platforms tested: FreeBSD 4.10 (sleipnir) too minor to require h5committest
2004-10-07 00:11:18 +08:00
if ((m_type1=h5tools_get_native_type(f_type2))<0)
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
m_size1 = H5Tget_size( m_type1 );
}
else
{
[svn-r7804] Purpose: h5diff new feature Description: added diff for the class ENUM Solution: Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-01 05:18:09 +08:00
H5Tclose(m_type2);
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
[svn-r9370] Purpose: Refactor code Description: Refactor common code for determining the native type for using in the tools into separate routine. Also, reduce diffs between the two branches and bring back some fixes from the development branch to the release branch. Platforms tested: FreeBSD 4.10 (sleipnir) too minor to require h5committest
2004-10-07 00:11:18 +08:00
if ((m_type2=h5tools_get_native_type(f_type1))<0)
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
m_size2 = H5Tget_size( m_type2 );
}
#if defined (H5DIFF_DEBUG)
printf("WARNING: Size was upgraded\n");
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
if (obj1_name)
[svn-r12124] Purpose: bug fix Description: 1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done 2) some duplicate warnings were being made Solution: eliminate the duplicate warnings, put the if compare flag on the correct place Platforms tested: linux 32, 64 solaris Misc. update:
2006-03-21 03:39:46 +08:00
print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
#endif
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
}
assert(m_size1==m_size2);
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
buf1 = (void *) HDmalloc((unsigned) (nelmts1*m_size1));
buf2 = (void *) HDmalloc((unsigned) (nelmts2*m_size2));
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
if ( buf1 == NULL || buf2 == NULL )
{
printf( "cannot read into memory\n" );
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
}
/*-------------------------------------------------------------------------
* read
*-------------------------------------------------------------------------
*/
if ( H5Dread(dset1_id,m_type1,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf1) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
if ( H5Dread(dset2_id,m_type2,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf2) < 0 )
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
goto error;
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
* array compare
*-------------------------------------------------------------------------
*/
[svn-r10915] Purpose: work around a compiler bug Description: while compiling in mir with pgcc -O2 a condition if (name ) { do_something(name); } is executed when name is NULL Solution: avoid the error by checking the NULL pointer inside do_something(name); Platforms tested: linux (mir with pgcc 6.0) Misc. update:
2005-06-14 04:06:47 +08:00
if (obj1_name) {
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
name1=diff_basename(obj1_name);
[svn-r10915] Purpose: work around a compiler bug Description: while compiling in mir with pgcc -O2 a condition if (name ) { do_something(name); } is executed when name is NULL Solution: avoid the error by checking the NULL pointer inside do_something(name); Platforms tested: linux (mir with pgcc 6.0) Misc. update:
2005-06-14 04:06:47 +08:00
}
if (obj2_name) {
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
name2=diff_basename(obj2_name);
[svn-r10915] Purpose: work around a compiler bug Description: while compiling in mir with pgcc -O2 a condition if (name ) { do_something(name); } is executed when name is NULL Solution: avoid the error by checking the NULL pointer inside do_something(name); Platforms tested: linux (mir with pgcc 6.0) Misc. update:
2005-06-14 04:06:47 +08:00
}
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
nfound = diff_array(buf1,
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
buf2,
nelmts1,
rank1,
dims1,
options,
name1,
name2,
m_type1,
dset1_id,
dset2_id);
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
/*-------------------------------------------------------------------------
* compare attributes
[svn-r7913] Purpose: code clean Description: separated the h5repack code in several modules Solution: Platforms tested: linux IRIX solaris Misc. update:
2003-12-05 03:35:33 +08:00
* the if condition refers to cases when the dataset is a referenced object
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
*-------------------------------------------------------------------------
*/
[svn-r7913] Purpose: code clean Description: separated the h5repack code in several modules Solution: Platforms tested: linux IRIX solaris Misc. update:
2003-12-05 03:35:33 +08:00
if (obj1_name)
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
diff_attr(dset1_id,dset2_id,obj1_name,obj2_name,options);
}/*cmp*/
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
/*-------------------------------------------------------------------------
* close
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
if ( buf1) HDfree(buf1);
if ( buf2) HDfree(buf2);
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
/* close */
/* disable error reporting */
H5E_BEGIN_TRY {
H5Sclose(space1_id);
H5Sclose(space2_id);
H5Tclose(f_type1);
H5Tclose(f_type2);
H5Tclose(m_type1);
H5Tclose(m_type2);
/* enable error reporting */
} H5E_END_TRY;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
return nfound;
error:
options->err_stat=1;
if ( buf1) HDfree(buf1);
if ( buf2) HDfree(buf2);
[svn-r7804] Purpose: h5diff new feature Description: added diff for the class ENUM Solution: Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-01 05:18:09 +08:00
/* close */
/* disable error reporting */
H5E_BEGIN_TRY {
H5Sclose(space1_id);
H5Sclose(space2_id);
H5Tclose(f_type1);
H5Tclose(f_type2);
H5Tclose(m_type1);
H5Tclose(m_type2);
/* enable error reporting */
} H5E_END_TRY;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7702] Purpose: h5diff maitainance Description: separated the h5diff source between several modules there is a public module with a new function "h5diff" that can be called by an application program (h5repack will use it ) added a new verbose option that can turn off all printf Platforms tested: linux solaris IRIX Misc. update:
2003-10-23 05:30:19 +08:00
return nfound;
}
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
/*-------------------------------------------------------------------------
* Function: diff_can_type
*
* Purpose: check for comparable TYPE and SPACE
*
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
* Return:
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
* 1, can compare
* 0, cannot compare
* -1, error
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
*
* Date: November 3, 2003
*
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
int diff_can_type( hid_t f_type1, /* file data type */
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
hid_t f_type2, /* file data type */
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
int rank1,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
int rank2,
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
hsize_t *dims1,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
hsize_t *dims2,
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
hsize_t *maxdim1,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
hsize_t *maxdim2,
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
const char *obj1_name,
const char *obj2_name,
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
diff_opt_t *options )
{
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
H5T_class_t tclass1;
H5T_class_t tclass2;
int maxdim_diff=0; /* maximum dimensions are different */
int dim_diff=0; /* current dimensions are different */
int i;
/*-------------------------------------------------------------------------
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
* check for the same class
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if ((tclass1=H5Tget_class(f_type1))<0)
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
return -1;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if ((tclass2=H5Tget_class(f_type2))<0)
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
return -1;
if ( tclass1 != tclass2 )
{
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
if (options->m_verbose && obj1_name) {
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
printf("Comparison not possible: <%s> is of class %s and <%s> is of class %s\n",
obj1_name, get_class(tclass1),
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
obj2_name, get_class(tclass2) );
}
return 0;
}
/*-------------------------------------------------------------------------
* check for non supported classes
*-------------------------------------------------------------------------
*/
assert(tclass1==tclass2);
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
switch (tclass1)
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
{
case H5T_INTEGER:
case H5T_FLOAT:
case H5T_COMPOUND:
case H5T_STRING:
case H5T_ARRAY:
case H5T_BITFIELD:
case H5T_OPAQUE:
case H5T_ENUM:
case H5T_VLEN:
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
case H5T_REFERENCE:
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
break;
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
default: /*H5T_TIME */
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if (options->m_verbose && obj1_name )
printf("Comparison not supported: <%s> and <%s> are of class %s\n",
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
obj1_name,obj2_name,get_class(tclass2) );
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
return 0;
}
/*-------------------------------------------------------------------------
* check for equal file datatype; warning only
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
if ( (H5Tequal(f_type1, f_type2)==0) && options->m_verbose && obj1_name)
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
{
printf("Warning: Different storage datatype\n");
printf("<%s> has file datatype ", obj1_name);
print_type(f_type1);
printf("\n");
printf("<%s> has file datatype ", obj2_name);
print_type(f_type2);
printf("\n");
}
/*-------------------------------------------------------------------------
* check for the same rank
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
if ( rank1 != rank2 )
{
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
if (options->m_verbose && obj1_name) {
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
print_dims(rank1,dims1);
printf(", max dimensions ");
print_dims(rank1,maxdim1);
printf("\n" );
printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
print_dims(rank2,dims2);
printf(", max dimensions ");
print_dims(rank2,maxdim2);
}
return 0;
}
/*-------------------------------------------------------------------------
* check for different dimensions
*-------------------------------------------------------------------------
*/
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
assert(rank1==rank2);
[svn-r11245] Purpose: Code cleanup Description: Trim trailing whitespace, which is making 'diff'ing the two branches difficult. Solution: Ran this script in each directory: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
2005-08-14 04:53:35 +08:00
for ( i=0; i<rank1; i++)
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
{
if (maxdim1 && maxdim2)
{
if ( maxdim1[i] != maxdim2[i] )
maxdim_diff=1;
}
if ( dims1[i] != dims2[i] )
dim_diff=1;
}
/*-------------------------------------------------------------------------
* current dimensions
*-------------------------------------------------------------------------
*/
if (dim_diff==1)
{
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
if (options->m_verbose && obj1_name) {
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
print_dims(rank1,dims1);
if (maxdim1 && maxdim2) {
printf(", max dimensions ");
print_dims(rank1,maxdim1);
printf("\n" );
printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
print_dims(rank2,dims2);
printf(", max dimensions ");
print_dims(rank2,maxdim2);
}
}
return 0;
}
/*-------------------------------------------------------------------------
* maximum dimensions; just give a warning
*-------------------------------------------------------------------------
*/
[svn-r7904] Purpose: h5diff new features Description: added comparison for attributes adeded comparison for all dataset datatypes added tests for the new features changed the output format Solution: Platforms tested: linux solaris 5.7 IRIX 6.5 (64) Misc. update:
2003-12-03 07:13:27 +08:00
if (maxdim1 && maxdim2 && maxdim_diff==1 && obj1_name )
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
{
[svn-r8904] Purpose: h5diff and h5repack changes Description: h5diff introduced the following four modes of output: Normal mode: print the number of differences found and where they occured Report mode: print the above plus the differences Verbose mode: print the above plus a list of objects and warnings Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found) h5repack added an extra parameter for SZIP filter (coding method) the new syntax is -f SZIP=<pixels per block,coding> (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN') Example of use: ./h5repack -i file1 -o file2 -f SZIP=8,NN -v updated usage messages, test scripts and files accordingly Solution: Platforms tested: linux AIX solaris Misc. update:
2004-07-21 03:21:03 +08:00
if (options->m_verbose) {
[svn-r7813] Purpose: h5diff new feature Description: added compare for attributes a new options flag (-a) was added to the options structure. it is 0 by default (no compare ) the output of the compare is the same that for datasets, and all the other flags also apply for attributes (the memory compare is done in the same function diff_array) all the other requirements for compare of datasets (type, space) are identical too Platforms tested: linux solaris 2.7 IRIX Misc. update:
2003-11-04 06:10:57 +08:00
printf( "Warning: Different maximum dimensions\n");
printf("<%s> has max dimensions ", obj1_name);
print_dims(rank1,maxdim1);
printf("\n");
printf("<%s> has max dimensions ", obj2_name);
print_dims(rank2,maxdim2);
printf("\n");
}
}
return 1;
}
Reference in New Issue Copy Permalink