Commit Graph

77 Commits

Author SHA1 Message Date
Allen Byrne
762c111350 clang 13 format #1933 (#1941) 2022-07-28 10:05:11 -05:00
Allen Byrne
5e1eee2370 1.8 Move error-stack text to top of usage display #1564 (#1569) 2022-04-14 10:59:27 -05:00
Allen Byrne
f64b2c0f25 1 8 Remove const from the argv tools/tests main sig. #1390 (#1406) 2022-01-29 14:30:54 -06:00
Allen Byrne
916188ad69 Hdf5 1 8 merges from develop and format specifier updates (#670)
* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync

* format alignment

* initialize vars

* revert H5private change

* Merge #380 from develop

* Split format source and commit changes on repo push

* Change windows TS to use older VS.

* HDFFV-11229 merge dev changes for long double display in tools

* Committing clang-format changes

* Update unsupported types with precision

* Add "option" command for clang options

* CMake merges from develop h5cc scripts

* Updates from develop and printf formatters

* Committing clang-format changes

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
2021-05-25 09:51:50 -05:00
Allen Byrne
089a6f60ac 1 8 Merges from develop (#432)
* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync

* format alignment

* initialize vars

* revert H5private change

* Merge #380 from develop
2021-03-05 16:08:22 -06:00
Allen Byrne
df1a4af961 HDF5 1 8 merge of recent changes and tools (#353)
* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format
2021-02-21 22:05:43 -06:00
Larry Knox
20aa4bccca Update HDF5 1.8 copyright headers with updated copyright URL (#148)
* Update URL for COPYING file in copyright headers.

* Make fortran copyright headers uniformly spaced.

* Update url for Copyright file in c++/src/footer.html.
2020-12-04 08:35:26 -06:00
Allen Byrne
1ba1f2f322 Source formatted 2020-10-01 11:47:45 -05:00
Allen Byrne
2804716f64 Merge changes from other branches 2020-02-29 14:03:20 -06:00
Allen Byrne
4da93e9d6f TRILABS-81 coverity tools fixes 2018-11-09 08:13:07 -06:00
Allen Byrne
905b1456ab HDFFV-10384 merge from develop 2018-02-19 13:22:19 -06:00
Allen Byrne
f514861864 HDFFV-8745 merge h5diff attribute fix 2018-01-11 09:13:05 -06:00
Allen Byrne
6d7133bf01 HDFFV-10297 merge from develop 2017-10-19 15:15:44 -05:00
Allen Byrne
ffaa6249ea HDFFV-9774 Fix merge typo 2017-09-07 11:56:49 -05:00
Allen Byrne
a57f039a6a HDFFV-9774 Add enable-error-stack to h5diff 2017-09-06 11:00:36 -05:00
Allen Byrne
a466f16851 Tools merge from develop-1.10 2017-05-17 15:53:42 -05:00
Allen Byrne
ba2cfde1fd Merge/port changes from develop back to 1.8 for tools and cmake 2017-03-29 16:44:23 -05:00
Albert Cheng
7031b03ac8 [svn-r25082] Bug HDFFV-8625, HDFFV-8639, HDFFV-8745:
h5diff issues "unable to read attribute" error message when comparing
    two files

Description:
    h5diff did not handle attributes of variable length strings
    correctly. It created the wrong memory type if one but not both
    compared attributes are of the variable strings type. It ended in
    H5Aread() failure.

Solution:
    We decided to treat the case when one type is variable length string
    and the other is not as incomparable. That bypassed the above error.
    We still need to figure out the proper way, if possible, to compare
    variable string with non-variable string types.

Tested: h5committested plus tested in Swallow (OS X 10.8).
2014-04-22 17:30:38 -05:00
Allen Byrne
deddc7f955 [svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.
Also warning session fixes.

Tested: CMake local linux
2013-09-26 17:10:54 -05:00
Allen Byrne
68d93b7f4e [svn-r22013] HDFFV-7560:
Merge 1.8 and h5dump/tools and tests based on tools library from trunk.
Reduced warnings.

HDFFV-7949:
Remove duplicated functions in h5ls

Tested: local linux,h5committest
2012-03-02 09:21:13 -05:00
Jonathan Kim
8f8fb620d8 [svn-r21404] Purpose:
HDFFV-7693 - h5diff produces different behavior between versions: 1.8.3 and 1.8.6

Description: 
    There were two issues on this. 
    One was not displaying all the comparable objects if non-comparable 
    object/attribute exist and compared before comparables ones. This issue
    occurred after 1.8.4 release. This is the issue from user.
    The other issue was not displaying all the comparable attributes, 
    if non-comparable object/attribute exist and compared ahead. This issue 
    were exist even before 1.8.4 release. So it's possible some attribute 
    comparison may have not displayed correctly in the past, if non-comparable 
    data were exist in common object.
    Fixed h5diff to display all the comparable object and attribute regardless 
    of non-comparables. 

    Merged from HDF5 trunk r21396 and r21397.

Tested:
 jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam, Windows)
2011-09-21 10:20:20 -05:00
Allen Byrne
26f47610b1 [svn-r21337] Synchronize cmake files with tested commits from trunk, windows parallel diff 2011-08-30 11:51:32 -05:00
Jonathan Kim
a3bf96ec3c [svn-r21077] Purpose:
Work for HDFFV-7600 - GMQS: h5diff - argument options -d, -p and --use-system-epsilon should be mutually exclusive.

Description:
    Merge from HDF5 trunk r21072.
    Fixed h5diff to display instructive error message and exit with 1
    when mutually exclusive options (-d, -p and --use-system-epsilon)
    are used together.

Tested:
    jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam)
2011-07-08 10:53:10 -05:00
Jonathan Kim
28145179bd [svn-r20428] Purpose:
Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for 
    --use-system-epsilon option

Description:
    Additional check in from the previous checkin r20425.
    Updated help page again.
     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
2011-04-06 16:05:55 -05:00
Jonathan Kim
81dce5bdfe [svn-r20425] Purpose:
Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for 
    --use-system-epsilon option

Description:
    Additional check in from the previous checkin r20369.
    Updated help page.
     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
2011-04-06 14:59:21 -05:00
Jonathan Kim
d467c2ce71 [svn-r20369] Purpose:
Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for 
    --use-system-epsilon option

Description:
    Fixed h5diff for --use-system-epsilon option: the calculation changed
    from ( |a - b| / b ) to ( |a - b| ). This was decided for better 
    performance and was corrected only in HDF5 trunk, so 1.8 got updated.
    Also comments for equal_XXX() function were updated correctly. 
    Also help page and RM got updated correctly.
    Also add test cases for testing the differences w/wo the option.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE)
2011-03-29 11:20:19 -05:00
Jonathan Kim
bf558b6fbf [svn-r20350] Purpose:
Fixed CHICAGO: Bug 2121 - h5diff - incorrect and lack of output for the 
    different set of attributes (different number and names)

Description:
    Merged from HDF5 trunk r20334.
    This is related to previous checkin r20299.
    Add help page update for verbose option level feature, which displays 
    useful information about attribute difference with -v1, --verbose=1 -v2 
    or --verbose=2 option.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
2011-03-25 16:47:31 -05:00
Jonathan Kim
2aabc3f415 [svn-r20299] Purpose:
Fixed CHICAGO: Bug 2121 - h5diff - incorrect and lack of output for the 
    different set of attributes (different number and names)

Description:
    Merged from HDF5 trunk r20294
    Previously h5diff compared attributes correctly only when two objects have 
    the same number of attributes and attribute names are identical.
    Also didn't display useful information about attribute difference.
    This fix covers all other cases.
    This fixes both issues.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
2011-03-23 09:37:45 -05:00
Jonathan Kim
c88c65c130 [svn-r19492] Purpose:
Update help page for exclude-path feature.

Description:
 Merged from hdf5 trunk (r19491).
 Related to "1890:  h5diff excluding object for file comparison via command line" checkins. (r19406)

Tested:
 jam, linew
2010-09-29 10:45:11 -05:00
Jonathan Kim
6d97ffcc6c [svn-r19407] Purpose:
Add --exclude-path option

Description:
 Merged from hdf5 trunk (r19406).
 Specified path to an object will be excluded from comparing the two files or two groups. If group is specified all the member objects will be excluded.
Related to "1890:  h5diff excluding object for file comparison via command line"

Tested:
 jam, amani
2010-09-16 16:57:27 -05:00
Jonathan Kim
a9a3f22e78 [svn-r19401] Purpose:
Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object

Description:
 Merged from hdf5 trunk (r19400).
 Compare member objects and groups recursively when two files or groups are specified to be compared. Support parallel diff and handling symbolic links accordingly.

Tested:
 jam, amani
2010-09-16 13:09:59 -05:00
Quincey Koziol
525caddd9e [svn-r19254] Description:
Bring r19252 & 19253 from trunk to 1.8 branch:

   Bring Coverity changes from branch to trunk:


r19161:
Fixed the part for matching the subset info with dataset

r19189:
BZ1646: h5dump does not check number of dimensions for subsetting parameters against the dataset

Changed subset_t structure from holding hsize_t pointers to holding new subset_d pointers, which hold the original hsize_t pointer + len. this len is then checked against dataset ndims in the handle_dataset function of h5dump.

Changed all references to use new data structure.

Added tests for each subset parameter.

r19190:
Added new h5dump ddl files

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (h5committested on Coverity branch)
2010-08-19 16:16:28 -05:00
Jonathan Kim
6cd165398b [svn-r18874] Purpose:
Rename '--follow-links' to '--follow-symlinks' 

Description:
    The '--follow-links' option is to follow symbolic links (soft and external).
    Make the name more intuitive and specific to the feature.
    Merged from hdf5 trunk r18873.

Tested:
    jam
2010-05-21 15:31:03 -05:00
Allen Byrne
05d75af8b8 [svn-r18757] Enable tools lib to be built as a dll on windows. Added two get/set functions for progname and d_status.
Also add windows import/export declarations to functions.
Updated windows - H5pubconf.h for packed bits function

Tested:
   Windows, linux
2010-05-11 12:49:41 -05:00
Jonathan Kim
52d87caef3 [svn-r18279] Purpose:
Work for bugzilla 1754: h5diff: support comparing through links.

Description:
    merged from hdf5 trunk (18164, 18165, 18166, 18167, 18170, 18266, 18273)

Tested:
    h5committest (jam, amani and linew)
2010-02-18 21:39:22 -05:00
Quincey Koziol
fa1f33701d [svn-r18198] Description:
Trim trailing whitespace from source code files, with following command:

find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.f90" \) -print |xargs -n 1 sed -i "" 's/[[:blank:]]*$//'

Tested on:
    None - eyeballed only
2010-01-29 23:33:04 -05:00
Peter Cao
aeec66cf49 [svn-r17467] " Use strict equality as default
"   Use "--use-system-epsilon" for system EPSILON
"   Use "-p" or "-d" for whatever user's choice of epsilon
"   Use "-p 0" or "-d 0" for strict equality (same as default)
2009-09-11 15:15:22 -05:00
Quincey Koziol
828e7e2416 [svn-r16566] Description:
Bring r16560 back from trunk.

Tested on:
    Mac OS X/32 10.5.6 (amazon) debug & production
    (Following up with tests on more platforms)
2009-03-10 20:44:36 -05:00
Pedro Vicente Nunes
041eb636da [svn-r16437] merge from trunk
bug fix: typo in usage message
tested: linux
2009-02-05 10:31:25 -05:00
Pedro Vicente Nunes
d2dd85b598 [svn-r16351] merge 16348
#1368 (E1) h5diff: implement  "not comparable" messages. Implemented RFC. The new option is <-c, --compare           List objects that are not comparable>

added some test cases

tested: windows, linux
2009-01-26 15:39:32 -05:00
Pedro Vicente Nunes
d496a1c715 [svn-r16312] merge 16300
Added an option to avoid dealing with NaNs 
-N, --nan               Avoid NaNs detection
Note: there is no shell script run for datasets with NaN because the output is non portable (different results and NaN strings for different systems)


Tested: windows, linux
2009-01-14 11:31:52 -05:00
Pedro Vicente Nunes
3a6ad02916 [svn-r15901] undo some changes in the list of parameters of parse_command_line (forgot that this function is called both on serial and parallel)
tested: linux
2008-10-17 22:01:34 -05:00
Pedro Vicente Nunes
1e1bcb801c [svn-r15900] Make the h5copy test that renames a group to return 1 on the h5diff call and assume 1 is the correct result
Drop the -c flag for h5diff

Tested: linux
2008-10-17 18:45:32 -05:00
Pedro Vicente Nunes
6c262bfc93 [svn-r15899] Extend the -c flag for ignore graph differences to ignore different group names
This is used in the h5copy test that compares renaming of groups

Tested: linux
2008-10-17 17:26:14 -05:00
Pedro Vicente Nunes
924ba14474 [svn-r15896] Introduced a -c flag to ignore file contents differences in the return value (return 0 id -c is present)
Introduced for h5copy validation

Tested: windows, linux
2008-10-16 18:24:18 -05:00
Pedro Vicente Nunes
12e3697d79 [svn-r15889] When comparing individual objects the file graph is not currently compared, so make h5diff return 0 (no diffrences)
Tested: windows, linux
2008-10-16 11:00:37 -05:00
Pedro Vicente Nunes
b353fb8b5a [svn-r15871] Eliminate -c option and make that behavior the default and return 2 instead of -1 on error status
Tested: windows, linux
2008-10-15 11:10:15 -05:00
Quincey Koziol
b9be045596 [svn-r15629] Description:
Remove trailing whitespace from C/C++ source files, with the following
script:

   foreach f (*.[ch] *.cpp)
       sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f
   end

Tested on:
   Mac OS X/32 10.5.5 (amazon)
   No need for h5committest, just whitespace changes...
2008-09-16 11:22:16 -05:00
Pedro Vicente Nunes
e46107ca75 [svn-r15433] http://bugzilla.hdfgroup.uiuc.edu/show_bug.cgi?id=1170
Summary: when using h5diff to compare the results of h5repack (or other tools that copy one HDF5 file to another), a new option is needed to allow h5diff to make an "absolute" comparison of the 2 files. This is the "contents" mode explained in the usage below.


If this mode is present, objects in both files must match (must be exactly the same). If this does not happen, the tool returns an error code of 1 (instead of the success code of 0)


Changes to the h5repack test script: the call to h5diff was changed to include -c (maintaining the previous -q). 


tested: windows, linux
2008-08-05 14:35:46 -05:00
Pedro Vicente Nunes
8ba92cda45 [svn-r14380] Eliminate old code not used and that was replaced (command line)
tested: windows, linux
2008-01-07 15:36:32 -05:00